[Mulgara-svn] r397 - branches/nw-interface
pag at mulgara.org
pag at mulgara.org
Thu Aug 30 21:10:24 UTC 2007
Author: pag
Date: 2007-08-30 16:10:24 -0500 (Thu, 30 Aug 2007)
New Revision: 397
Modified:
branches/nw-interface/build.properties
branches/nw-interface/build.xml
branches/nw-interface/common.xml
Log:
New parser package, and some path updates
Modified: branches/nw-interface/build.properties
===================================================================
--- branches/nw-interface/build.properties 2007-08-30 21:09:42 UTC (rev 396)
+++ branches/nw-interface/build.properties 2007-08-30 21:10:24 UTC (rev 397)
@@ -74,6 +74,7 @@
# Executable JARs for distribution
driver.jar = driver-${mulgara-version}.jar
itql.jar = itql-${mulgara-version}.jar
+parser.jar = parser-${mulgara-version}.jar
mulgara.jar = mulgara-${mulgara-version}.jar
mulgara-lite.jar = mulgara-lite-${mulgara-version}.jar
mulgara-http.jar = mulgara-http-${mulgara-version}.jar
Modified: branches/nw-interface/build.xml
===================================================================
--- branches/nw-interface/build.xml 2007-08-30 21:09:42 UTC (rev 396)
+++ branches/nw-interface/build.xml 2007-08-30 21:10:24 UTC (rev 397)
@@ -28,6 +28,7 @@
<property file="${jar.src.dir}/driver/driver-build.properties"/>
<property file="${jar.src.dir}/dtd/dtd-build.properties"/>
<property file="${jar.src.dir}/itql/itql-build.properties"/>
+ <property file="${jar.src.dir}/parser/parser-build.properties"/>
<property file="${jar.src.dir}/jrdf/jrdf-build.properties"/>
<property file="${jar.src.dir}/query/query-build.properties"/>
<!--property file="${jar.src.dir}/rdql/rdql-build.properties"/-->
@@ -99,6 +100,7 @@
<import file="${jar.src.dir}/driver/build.xml"/>
<import file="${jar.src.dir}/dtd/build.xml"/>
<import file="${jar.src.dir}/itql/build.xml"/>
+ <import file="${jar.src.dir}/parser/build.xml"/>
<import file="${jar.src.dir}/jrdf/build.xml"/>
<import file="${jar.src.dir}/query/build.xml"/>
<!--import file="${jar.src.dir}/rdql/build.xml"/-->
@@ -251,7 +253,7 @@
<!-- Run JUnit regression (non-load) tests on dbms.jar -->
<!-- =================================================================== -->
<target name="dbms-test" depends="-prepare-build, uri,
- driver-jar, itql-jar, query-jar, util-jar, log4j-conf.xml"
+ driver-jar, itql-jar, parser-jar, query-jar, util-jar, log4j-conf.xml"
description="runs regression tests on the triple store">
<!-- Set timestamp for CruiseControl's benefit -->
@@ -280,6 +282,7 @@
<classpath path="${bin.dir}/${query.jar}"/>
<classpath path="${bin.dir}/${driver.jar}"/>
<classpath path="${bin.dir}/${itql.jar}"/>
+ <classpath path="${bin.dir}/${parser.jar}"/>
<classpath path="${bin.dir}/${rules.jar}"/>
<classpath path="${bin.dir}/${server.jar}"/>
<classpath path="${bin.dir}/${util.jar}"/>
@@ -471,7 +474,7 @@
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
<attribute name="Embedded-Jar" value="
- lib/${query.jar}, lib/${driver.jar}, lib/${itql.jar}, lib/${rmi.jar},
+ lib/${query.jar}, lib/${driver.jar}, lib/${itql.jar}, lib/${parser.jar}, lib/${rmi.jar},
lib/${server.jar}, lib/${server-beep.jar}, lib/${server-rmi.jar},
lib/${util.jar}, lib/${config.jar}, lib/${descriptor.jar}, lib/${server-local.jar},
lib/${resolver.jar}, lib/${resolver-spi.jar}, lib/${resolver-filesystem.jar},
@@ -502,7 +505,7 @@
<!-- Creates the lite distribution file for the Embedded Mulgara server -->
<!-- =================================================================== -->
<target name="lite-dist"
- depends="driver-jar, itql-jar, query-jar, rmi-jar,
+ depends="driver-jar, itql-jar, parser-jar, query-jar, rmi-jar,
server-jar, server-local-jar, server-beep-jar,
server-rmi-jar, util-jar, config-jar, dtd-jar, jrdf-jar, ant-task-jar,
store-dist, store-xa-dist, store-nodepool-dist,
@@ -556,7 +559,7 @@
${axis.jar}, ${commons-discovery.jar},
${jaxrpc.jar}, ${wsdl4j.jar}"/>
<zipfileset dir="${bin.dir}" prefix="lib" includes="
- ${query.jar}, ${driver.jar}, ${itql.jar}, ${rules.jar}, ${rmi.jar},
+ ${query.jar}, ${driver.jar}, ${itql.jar}, ${parser.jar}, ${rules.jar}, ${rmi.jar},
${server.jar}, ${server-beep.jar}, ${server-rmi.jar},
${util.jar}, ${config.jar}, ${descriptor.jar}, ${server-local.jar},
${resolver.jar}, ${resolver-spi.jar}, ${resolver-filesystem.jar},
@@ -730,7 +733,7 @@
ant-task-jar, client-jrdf-jar, config-jar,
connection-jar, content-mbox-jar, content-mp3-jar,
content-n3-jar, content-rdfxml-jar, content-rio-jar,
- doclet.jar, itql-jar, jrdf-jar, store-jar,
+ doclet.jar, itql-jar, parser-jar, jrdf-jar, store-jar,
store-xa-jar, connection-jar,
store-nodepool-jar, store-nodepool-memory-jar,
store-nodepool-xa-jar, query-jar,
@@ -1008,6 +1011,7 @@
<pathelement path="${bin.dir}/${query.jar}"/>
<pathelement path="${bin.dir}/${driver.jar}"/>
<pathelement path="${bin.dir}/${itql.jar}"/>
+ <pathelement path="${bin.dir}/${parser.jar}"/>
<pathelement path="${bin.dir}/${rules.jar}"/>
<pathelement path="${bin.dir}/${server.jar}"/>
<pathelement path="${bin.dir}/${server-http.jar}"/>
@@ -1333,7 +1337,7 @@
<path refid="query-classpath"/>
- <fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar}, ${rules.jar}, ${query.jar},
+ <fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar}, ${parser.jar}, ${rules.jar}, ${query.jar},
${driver.jar}, ${rmi.jar}, ${server-rmi.jar}"/>
<fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, jxunit*.jar, junit.jar, junitpp.jar"/>
</classpath>
@@ -1399,7 +1403,7 @@
<lib dir="${lib.dir}" includes="log4j-core-*.jar, icu4j.jar, jena-*.jar, antlr*.jar, beepcore-*.jar,
lucene*.jar, apache-soap-*.jar, ${jrdf.jar}, ${date-utils.jar}, ${commons-logging.jar}"/>
<lib dir="${bin.dir}" includes="${query.jar},
- ${driver.jar}, ${itql.jar}, ${rules.jar}, ${rmi.jar},
+ ${driver.jar}, ${itql.jar}, ${parser.jar}, ${rules.jar}, ${rmi.jar},
${server.jar}, ${server-beep.jar}, ${server-rmi.jar},
${util.jar}, ${config.jar}"/>
<lib dir="${dist.dir}" includes="expires.txt"/>
@@ -1412,7 +1416,7 @@
targetfile="${bin.dir}/${mulgara.war}">
<srcfiles dir="${bin.dir}" includes="${query.jar},
- ${driver.jar}, ${itql.jar}, ${rules.jar}, ${rmi.jar},
+ ${driver.jar}, ${itql.jar}, ${parser.jar}, ${rules.jar}, ${rmi.jar},
${server.jar}, ${server-beep.jar}, ${server-rmi.jar},
${util.jar}, ${config.jar}, ${descriptor.jar}"/>
<srcfiles dir="${dist.dir}" includes="expires.txt"/>
@@ -1786,6 +1790,7 @@
<zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${driver.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${itql.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${parser.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${server-beep.jar}" excludes="META-INF/**"/>
@@ -1897,7 +1902,7 @@
<!--
<attribute name="Embedded-Jar" value="lib/${client-jrdf.jar}, lib/${client-jena.jar}, lib/${config.jar},
lib/${content-n3.jar}, lib/${content-rdfxml.jar}, lib/${content-rio.jar}, lib/${descriptor.jar},lib/${driver.jar},
-lib/${itql.jar}, lib/${jrdf.base.jar}, lib${store-nodepool.jar},
+lib/${itql.jar}, lib/${parser.jar}, lib/${jrdf.base.jar}, lib${store-nodepool.jar},
lib/${store-nodepool-memory.jar}, lib/${store-nodepool-xa.jar},lib/${query.jar}, lib/${resolver.jar},
lib/${resolver-file.jar}, lib/${resolver-filesystem.jar}, lib/${resolver-http.jar}, lib/${resolver-memory.jar},
lib/${resolver-nodetype.jar}, lib/${resolver-prefix.jar}, lib/${resolver-spi.jar}, lib/${resolver-store.jar}, lib/${resolver-jar.jar},
Modified: branches/nw-interface/common.xml
===================================================================
--- branches/nw-interface/common.xml 2007-08-30 21:09:42 UTC (rev 396)
+++ branches/nw-interface/common.xml 2007-08-30 21:10:24 UTC (rev 397)
@@ -352,7 +352,7 @@
<path refid="query-classpath"/>
- <fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar}, ${query.jar},
+ <fileset dir="${bin.dir}" includes="${dtd.jar}, ${parser.jar}, ${itql.jar}, ${query.jar},
${driver.jar}, ${rmi.jar}, ${server-rmi.jar}"/>
<fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, jxunit*.jar, junit.jar, junitpp.jar"/>
</classpath>
@@ -412,7 +412,7 @@
<path refid="query-classpath"/>
<fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar},
- ${query.jar},
+ ${query.jar}, ${parser.jar},
${driver.jar}, ${rmi.base.jar},
${server-rmi.jar}"/>
<fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar,
More information about the Mulgara-svn
mailing list