[Mulgara-svn] r395 - in branches/nw-interface/src/jar: client-jrdf connection itql krule query
pag at mulgara.org
pag at mulgara.org
Thu Aug 30 21:08:28 UTC 2007
Author: pag
Date: 2007-08-30 16:08:27 -0500 (Thu, 30 Aug 2007)
New Revision: 395
Modified:
branches/nw-interface/src/jar/client-jrdf/build.xml
branches/nw-interface/src/jar/connection/build.xml
branches/nw-interface/src/jar/itql/build.xml
branches/nw-interface/src/jar/krule/build.xml
branches/nw-interface/src/jar/query/build.xml
Log:
Update to build paths to deal with moving packages, new packages, and new dependencies
Modified: branches/nw-interface/src/jar/client-jrdf/build.xml
===================================================================
--- branches/nw-interface/src/jar/client-jrdf/build.xml 2007-08-30 21:07:21 UTC (rev 394)
+++ branches/nw-interface/src/jar/client-jrdf/build.xml 2007-08-30 21:08:27 UTC (rev 395)
@@ -27,6 +27,7 @@
<pathelement path="${jrdf.dist.dir}/${jrdf.base.jar}"/>
<pathelement path="${server-rmi.dist.dir}/${server-rmi.jar}"/>
<pathelement path="${itql.dist.dir}/${itql.jar}"/>
+ <pathelement path="${parser.dist.dir}/${parser.jar}"/>
<pathelement path="${rules.dist.dir}/${rules.jar}"/>
<pathelement path="${lib.dir}/${jrdf.jar}"/>
</path>
@@ -60,7 +61,7 @@
</target>
<target name="client-jrdf-compile"
- depends="-client-jrdf-prepare, driver-jar, itql-jar, server-jar, jrdf-jar"
+ depends="-client-jrdf-prepare, driver-jar, itql-jar, parser-jar, server-jar, jrdf-jar"
description="Compiles all client-jrdf related files included generated
source code">
Modified: branches/nw-interface/src/jar/connection/build.xml
===================================================================
--- branches/nw-interface/src/jar/connection/build.xml 2007-08-30 21:07:21 UTC (rev 394)
+++ branches/nw-interface/src/jar/connection/build.xml 2007-08-30 21:08:27 UTC (rev 395)
@@ -19,10 +19,6 @@
<!-- =================================================================== -->
<path id="connection-classpath">
<path refid="common-classpath"/>
- <!-- FIXME: Remove iTQL JAR once the iTQL classes are moved into the iTQL package. -->
- <fileset file="${itql.dist.dir}/${itql.jar}"/>
- <fileset file="${query.dist.dir}/${query.jar}"/>
- <fileset file="${rules.dist.dir}/${rules.jar}"/>
</path>
<path id="connection-test-classpath">
<path refid="connection-classpath"/>
@@ -38,7 +34,7 @@
<delete dir="${connection.dist.dir}"/>
</target>
- <target name="connection-compile" depends="-prepare-build, server-jar" description="Compiles connection classes">
+ <target name="connection-compile" depends="-prepare-build" description="Compiles connection classes">
<mkdir dir="${connection.obj.dir}"/>
<mkdir dir="${connection.test.dir}"/>
<mkdir dir="${connection.dist.dir}"/>
Modified: branches/nw-interface/src/jar/itql/build.xml
===================================================================
--- branches/nw-interface/src/jar/itql/build.xml 2007-08-30 21:07:21 UTC (rev 394)
+++ branches/nw-interface/src/jar/itql/build.xml 2007-08-30 21:08:27 UTC (rev 395)
@@ -23,6 +23,7 @@
<fileset file="${driver.dist.dir}/${driver.jar}"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
+ <fileset file="${parser.dist.dir}/${parser.jar}"/>
</path>
<path id="itql-test-classpath">
<path refid="itql-classpath"/>
@@ -31,6 +32,7 @@
<fileset file="${bin.dir}/${rmi.jar}"/>
<fileset file="${itql.dist.dir}/${itql.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
+ <fileset file="${parser.dist.dir}/${parser.jar}"/>
</path>
<target name="itql-clean" description="Removes all compile generated files for the itql">
@@ -70,7 +72,7 @@
</uptodate>
</target>
- <target name="itql-compile" depends="-itql-prepare, gen-itql-parser, driver-jar" description="Compiles all itql related files included generated source code">
+ <target name="itql-compile" depends="-itql-prepare, gen-itql-parser, driver-jar, parser-jar" description="Compiles all itql related files included generated source code">
<copy todir="${itql.obj.dir}/java/" preservelastmodified="yes">
<fileset dir="${itql.src.dir}/java/" includes="**/*.java"/>
</copy>
@@ -87,7 +89,7 @@
</manifest>
<manifest file="${obj.dir}/META-INF/MANIFEST_ITQL_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="${query.jar}, ${driver.jar}, ${itql.jar},${util.jar}, ${server-beep.jar}, ${server-rmi.jar}, apache-soap-2.2.jar, log4j-1.2.8.jar,jargs-0.2.jar, ${jrdf.jar}, ${saaj.jar}, ${emory-util.jar}"/>
+ <attribute name="Embedded-Jar" value="${query.jar}, ${parser.jar}, ${driver.jar}, ${itql.jar},${util.jar}, ${server-beep.jar}, ${server-rmi.jar}, apache-soap-2.2.jar, log4j-1.2.8.jar,jargs-0.2.jar, ${jrdf.jar}, ${saaj.jar}, ${emory-util.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.itql.ItqlSession"/>
</manifest>
</target>
@@ -128,6 +130,7 @@
<zipfileset src="${driver.dist.dir}/${driver.jar}" excludes="META-INF/**"/>
<zipfileset src="${itql.dist.dir}/${itql.jar}" excludes="META-INF/**"/>
<zipfileset src="${query.dist.dir}/${query.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${parser.dist.dir}/${parser.jar}" excludes="META-INF/**"/>
<zipfileset src="${server-beep.dist.dir}/${server-beep.jar}" excludes="META-INF/**"/>
<zipfileset src="${server-rmi.dist.dir}/${server-rmi.jar}" excludes="META-INF/**"/>
<zipfileset src="${util.dist.dir}/${util.jar}" excludes="META-INF/**"/>
@@ -154,6 +157,7 @@
<srcfiles dir="${itql.dist.dir}" includes="${itql.jar}"/>
<srcfiles dir="${driver.dist.dir}" includes="${driver.jar}"/>
<srcfiles dir="${query.dist.dir}" includes="${query.jar}"/>
+ <srcfiles dir="${parser.dist.dir}" includes="${parser.jar}"/>
<srcfiles dir="${server-beep.dist.dir}" includes="${server-beep.jar}"/>
<srcfiles dir="${server-rmi.dist.dir}" includes="${server-rmi.jar}"/>
<srcfiles dir="${util.dist.dir}" includes="${util.jar}"/>
Modified: branches/nw-interface/src/jar/krule/build.xml
===================================================================
--- branches/nw-interface/src/jar/krule/build.xml 2007-08-30 21:07:21 UTC (rev 394)
+++ branches/nw-interface/src/jar/krule/build.xml 2007-08-30 21:08:27 UTC (rev 395)
@@ -25,6 +25,7 @@
<pathelement path="${driver.dist.dir}/${driver.jar}"/>
<pathelement path="${util.dist.dir}/${util.jar}"/>
<pathelement path="${itql.dist.dir}/${itql.jar}"/>
+ <pathelement path="${parser.dist.dir}/${parser.jar}"/>
<pathelement path="${tuples.dist.dir}/${tuples.jar}"/>
<pathelement path="${rules.dist.dir}/${rules.jar}"/>
</path>
@@ -57,7 +58,7 @@
</target>
<target name="krule-compile"
- depends="-krule-prepare, driver-jar, itql-jar, rules-jar, tuples-jar"
+ depends="-krule-prepare, driver-jar, itql-jar, parser-jar, rules-jar, tuples-jar"
description="Compiles all krule related files included generated source code">
<javac destdir="${krule.obj.dir}/classes" debug="on"
Modified: branches/nw-interface/src/jar/query/build.xml
===================================================================
--- branches/nw-interface/src/jar/query/build.xml 2007-08-30 21:07:21 UTC (rev 394)
+++ branches/nw-interface/src/jar/query/build.xml 2007-08-30 21:08:27 UTC (rev 395)
@@ -22,6 +22,7 @@
<path refid="common-classpath"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
+ <fileset file="${connection.dist.dir}/${rules.jar}"/>
</path>
<path id="query-test-classpath">
@@ -30,6 +31,7 @@
<fileset file="${query.dist.dir}/${query.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
+ <fileset file="${connection.dist.dir}/${rules.jar}"/>
</path>
<target name="query-clean"
@@ -69,7 +71,7 @@
</target>
<target name="query-compile"
- depends="-query-prepare, util-jar, rules-jar, config-jar, -query-unjar-config"
+ depends="-query-prepare, util-jar, rules-jar, connection-jar, config-jar, -query-unjar-config"
description="Compiles all query related files included generated
source code"
unless="query.classes.uptodate">
@@ -79,6 +81,7 @@
<classpath refid="query-classpath"/>
+ <src path="${driver.src.dir}/java"/>
<src path="${query.src.dir}/java"/>
</javac>
</target>
More information about the Mulgara-svn
mailing list