[Mulgara-svn] r494 - in branches/nw-interface: conf src/jar/itql

[pag at mulgara.org]

Author: pag
Date: 2007-10-22 22:33:36 -0500 (Mon, 22 Oct 2007)
New Revision: 494

Added:
   branches/nw-interface/conf/log4j-tql.xml
Removed:
   branches/nw-interface/conf/log4j-itql.xml
Modified:
   branches/nw-interface/src/jar/itql/build.xml
Log:
updated names from iTQL to TQL

Deleted: branches/nw-interface/conf/log4j-itql.xml
===================================================================
--- branches/nw-interface/conf/log4j-itql.xml	2007-10-22 21:27:36 UTC (rev 493)
+++ branches/nw-interface/conf/log4j-itql.xml	2007-10-23 03:33:36 UTC (rev 494)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE log4j:configuration SYSTEM "http://jakarta.apache.org/log4j/docs/api/org/apache/log4j/xml/doc-files/log4j.dtd">
-
-<!--
-Log4J configuration for the Mulgara Query Engine project.
--->
-
-<log4j:configuration>
-
-  <!-- Log to a file -->
-  <appender name="LOGFILE" class="org.apache.log4j.FileAppender">
-    <param name="File" value="itql.log"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d %-5p [%t] %C{2} - %m%n"/>
-    </layout>
-  </appender>
-
-  <!-- (Insert category elements here) -->
-
-  <!-- Default is to log messages of "info" priority -->
-  <root>
-    <priority value="WARN"/>
-    <appender-ref ref="LOGFILE"/>
-  </root>
-
-</log4j:configuration>

Copied: branches/nw-interface/conf/log4j-tql.xml (from rev 493, branches/nw-interface/conf/log4j-itql.xml)

Modified: branches/nw-interface/src/jar/itql/build.xml
===================================================================
--- branches/nw-interface/src/jar/itql/build.xml	2007-10-22 21:27:36 UTC (rev 493)
+++ branches/nw-interface/src/jar/itql/build.xml	2007-10-23 03:33:36 UTC (rev 494)
@@ -62,11 +62,11 @@
   </target>
 
   <target name="-itql-token-build-label" depends="-itql-token-build-label-uptodate" unless="itql.token.build.label.uptodate">
-    <replace file="${itql.obj.dir}/java/org/mulgara/itql/ItqlSession.java" token="@@build.label@@" value="${build.label}"/>
+    <replace file="${itql.obj.dir}/java/org/mulgara/itql/TqlSession.java" token="@@build.label@@" value="${build.label}"/>
   </target>
   <target name="-itql-token-build-label-uptodate">
-    <uptodate property="itql.token.build.label.uptodate" targetfile="${itql.obj.dir}/java/org/mulgara/itql/ItqlSession.java">
-      <srcfiles dir="${itql.src.dir}" includes="**/ItqlSession.java"/>
+    <uptodate property="itql.token.build.label.uptodate" targetfile="${itql.obj.dir}/java/org/mulgara/itql/TqlSession.java">
+      <srcfiles dir="${itql.src.dir}" includes="**/TqlSession.java"/>
     </uptodate>
   </target>
 
@@ -114,7 +114,7 @@
     <mkdir dir="${obj.dir}/META-INF"/>
 
     <manifest file="${obj.dir}/META-INF/itql-MANIFEST.MF">
-      <attribute name="Main-Class" value="org.mulgara.itql.ItqlSession"/>
+      <attribute name="Main-Class" value="org.mulgara.itql.TqlSession"/>
     </manifest>
 
     <jar jarfile="${dist.dir}/${itql.jar}"