[Mulgara-svn] r842 - branches/mgr-61-sparql
pag at mulgara.org
pag at mulgara.org
Thu Apr 24 06:57:32 UTC 2008
Author: pag
Date: 2008-04-23 23:57:32 -0700 (Wed, 23 Apr 2008)
New Revision: 842
Modified:
branches/mgr-61-sparql/build.xml
branches/mgr-61-sparql/common.xml
Log:
Integrated SPARQL into the ant build
Modified: branches/mgr-61-sparql/build.xml
===================================================================
--- branches/mgr-61-sparql/build.xml 2008-04-24 06:56:33 UTC (rev 841)
+++ branches/mgr-61-sparql/build.xml 2008-04-24 06:57:32 UTC (rev 842)
@@ -58,6 +58,7 @@
<property file="${jar.src.dir}/krule/krule-build.properties"/>
<property file="${jar.src.dir}/rules/rules-build.properties"/>
<property file="${jar.src.dir}/sparql-protocol/sparql-protocol-build.properties"/>
+ <property file="${jar.src.dir}/sparql-interpreter/sparql-interpreter-build.properties"/>
<property file="${jar.src.dir}/store/store-build.properties"/>
<property file="${jar.src.dir}/store-xa/store-xa-build.properties"/>
<property file="${jar.src.dir}/store-nodepool/store-nodepool-build.properties"/>
@@ -129,6 +130,7 @@
<import file="${jar.src.dir}/krule/build.xml"/>
<import file="${jar.src.dir}/rules/build.xml"/>
<import file="${jar.src.dir}/sparql-protocol/build.xml"/>
+ <import file="${jar.src.dir}/sparql-interpreter/build.xml"/>
<import file="${jar.src.dir}/store/build.xml"/>
<import file="${jar.src.dir}/store-xa/build.xml"/>
<import file="${jar.src.dir}/store-nodepool/build.xml"/>
@@ -326,7 +328,7 @@
resolver-url-dist, resolver-view-dist, resolver-xsd-dist,
resolver-jar-dist, resolver-test-dist,
server-dist, server-beep-dist, server-http-dist, server-local-dist,
- server-rmi-dist, sofa-dist, krule-dist, rules-dist,
+ server-rmi-dist, sofa-dist, sparql-int-dist, krule-dist, rules-dist,
store-stringpool-dist, store-stringpool-memory-dist,
store-stringpool-xa-dist, tag-dist,
tuples-dist, tuples-hybrid-dist,
@@ -473,7 +475,8 @@
<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/${sparql-int.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},
@@ -495,7 +498,7 @@
lib/${jetty.jar}, lib/${jetty.plus.jar}, lib/${jasper.compiler.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,
lib/castor-0.9.3.9-xml.jar, lib/trove-1.0.2.jar, lib/${jrdf.jar}, lib/${saaj.jar},
lib/${jakarta-oro.jar}, lib/jta-spec1_0_1.jar, lib/${jotm.jar}, lib/${jotm.jrmp.jar}, lib/${carol.jar}, lib/${howl.jar},
- lib/connector-1_5.jar, lib/${httpclient.jar}, lib/${commons-codec.jar}"/>
+ lib/connector-1_5.jar, lib/${httpclient.jar}, lib/${commons-codec.jar}, lib/${mulgara-sparql.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraServer"/>
</manifest>
</target>
@@ -504,7 +507,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, sparql-int-jar, rules-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,
@@ -549,7 +552,7 @@
${servlet.jar}, ${jasper.runtime.jar}, ${jasper.compiler.jar},
${lucene.jar}, ${mail.jar}, ${castor.jar}, ${trove.jar},
${date-utils.jar}, ${commons-logging.jar}, ${commons-httpclient.jar},
- ${commons-codec.jar}, ${emory-util.jar},
+ ${commons-codec.jar}, ${emory-util.jar}, ${mulgara-sparql.jar}
${jotm.jar}, ${jotm.jrmp.jar}, ${carol.jar}, ${howl.jar}, ${jta.jar},
${jsr.173.api.jar}, ${jsr.173.ri.jar}, ${jca.jar}, ${saaj.jar},
${axis.jar}, ${commons-discovery.jar}, ${jaxrpc.jar}, ${wsdl4j.jar},
@@ -558,7 +561,8 @@
${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}, ${sparql-int.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},
@@ -732,7 +736,8 @@
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,
+ itql-jar, sparql-int-jar,
+ doclet.jar, jrdf-jar, store-jar,
store-xa-jar, connection-jar,
store-nodepool-jar, store-nodepool-memory-jar,
store-nodepool-xa-jar, query-jar,
@@ -742,7 +747,8 @@
resolver-url-jar, resolver-view-jar, resolver-xsd-jar,
resolver-test-jar,
server-jar, server-beep-jar, server-rmi-jar,
- sofa-jar, krule-jar, rules-jar, sparql-protocol-jar, store-stringpool-jar,
+ sofa-jar, krule-jar, rules-jar, sparql-protocol-jar,
+ store-stringpool-jar,
store-stringpool-memory-jar, store-stringpool-xa-jar,
tuples-jar, tuples-hybrid-jar, util-jar, util-xa-jar, webui-war"
unless="javadoc-uptodate"
@@ -770,6 +776,7 @@
org.mulgara.sofa.*,
org.mulgara.krule.*,
org.mulgara.rules.*,
+ org.mulgara.sparql.*,
org.mulgara.store.*,
org.mulgara.store.graph.*,
org.mulgara.store.graph.xa.*,
@@ -849,6 +856,7 @@
<sourcepath path="${server-rmi.src.dir}/java"/>
<sourcepath path="${sofa.src.dir}/java"/>
<sourcepath path="${sparql-protocol.src.dir}/java"/>
+ <sourcepath path="${sparql-int.src.dir}/java"/>
<sourcepath path="${store.src.dir}/java"/>
<sourcepath path="${store-xa.src.dir}/java"/>
<sourcepath path="${store-nodepool.src.dir}/java"/>
@@ -890,7 +898,8 @@
content-mp3-javadoc, content-n3-javadoc,
content-rdfxml-javadoc, content-rio-javadoc,
descriptor-javadoc, driver-javadoc, dtd-javadoc,
- itql-javadoc, store-javadoc, store-xa-javadoc,
+ itql-javadoc, sparql-int-javadoc,
+ store-javadoc, store-xa-javadoc,
store-nodepool-javadoc,
store-nodepool-memory-javadoc, jrdf-javadoc,
store-nodepool-xa-javadoc, query-javadoc,
@@ -903,7 +912,8 @@
resolver-test-javadoc, resolver-javadoc, resolver-relational-javadoc,
server-beep-javadoc, server-http-javadoc,
server-local-javadoc, server-rmi-javadoc, server-javadoc,
- sofa-javadoc, rules-javadoc, krule-javadoc, store-stringpool-javadoc,
+ sofa-javadoc, rules-javadoc, krule-javadoc,
+ store-stringpool-javadoc,
store-stringpool-memory-javadoc, store-stringpool-xa-javadoc,
tag-javadoc, tuples-hybrid-javadoc, tuples-javadoc,
util-xa-javadoc, util-javadoc"
@@ -1372,7 +1382,7 @@
<!-- =================================================================== -->
<target name="mulgara-war"
description="Builds the Mulgara Semantic Store (Mulgara) WAR"
- depends="driver-jar, itql-jar, query-jar, rmi-jar, server-jar,
+ depends="driver-jar, itql-jar, sparql-int-jar, query-jar, rmi-jar, server-jar,
server-beep-jar, server-rmi-jar, util-jar, config-jar, descriptor-jar, dtd-compile,
set.host.name, mulgara.war-uptodate"
unless="mulgara.war-uptodate">
@@ -1398,7 +1408,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}, ${sparql-int.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,6 +1422,7 @@
<srcfiles dir="${bin.dir}" includes="${query.jar},
${driver.jar}, ${itql.jar}, ${rules.jar}, ${rmi.jar},
+ ${sparql-int.jar},
${server.jar}, ${server-beep.jar}, ${server-rmi.jar},
${util.jar}, ${config.jar}, ${descriptor.jar}"/>
<srcfiles dir="${dist.dir}" includes="expires.txt"/>
@@ -1688,7 +1699,8 @@
depends="client-jrdf-jar, config-jar,
content-mbox-jar, content-mp3-jar, content-n3-jar,
content-rdfxml-jar, content-rio-jar,
- create-manifest, demo-jar, dtd-jar, driver-jar, dtd-jar, itql-jar,
+ create-manifest, demo-jar, dtd-jar, driver-jar, dtd-jar,
+ itql-jar, sparql-int-jar,
javadoc-dist, jrdf-jar, store-jar, store-xa-jar,
store-nodepool-jar,
store-nodepool-memory-jar, store-nodepool-xa-jar,
@@ -1739,6 +1751,7 @@
<zipfileset src="${lib.dir}/${jasper.compiler.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${lucene.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${mail.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${mulgara-sparql.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${castor.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${trove.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${date-utils.jar}" excludes="META-INF/**"/>
@@ -1767,6 +1780,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}/${sparql-int.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/**"/>
Modified: branches/mgr-61-sparql/common.xml
===================================================================
--- branches/mgr-61-sparql/common.xml 2008-04-24 06:56:33 UTC (rev 841)
+++ branches/mgr-61-sparql/common.xml 2008-04-24 06:57:32 UTC (rev 842)
@@ -152,7 +152,8 @@
jotm*.jar, commons-logging-*.jar, Quick4rt.jar,
commons-discovery-*.jar, commons-httpclient-*.jar,
commons-codec-*.jar, connector-*.jar, jaxrpc-*.jar,
- carol*.jar, howl-logger*.jar, ${date-utils.jar}"
+ carol*.jar, howl-logger*.jar, ${date-utils.jar},
+ mulgara-sparql*.jar"
excludes="jboss-j2ee.jar"/>
</path>
More information about the Mulgara-svn
mailing list