[Mulgara-svn] r1202 - in branches/mgr-143: . src/jar/client-jrdf src/jar/descriptor src/jar/driver src/jar/krule src/jar/querylang src/jar/server-beep src/jar/server-http src/jar/server-local src/jar/sofa src/jar/sparql-protocol src/jar/web
pag at mulgara.org
pag at mulgara.org
Sat Aug 30 01:30:06 UTC 2008
Author: pag
Date: 2008-08-29 18:30:05 -0700 (Fri, 29 Aug 2008)
New Revision: 1202
Added:
branches/mgr-143/src/jar/querylang/querylang-build.properties
Removed:
branches/mgr-143/src/jar/querylang/itql-build.properties
Modified:
branches/mgr-143/.classpath
branches/mgr-143/build.properties
branches/mgr-143/build.xml
branches/mgr-143/common.xml
branches/mgr-143/src/jar/client-jrdf/build.xml
branches/mgr-143/src/jar/descriptor/build.xml
branches/mgr-143/src/jar/driver/build.xml
branches/mgr-143/src/jar/krule/build.xml
branches/mgr-143/src/jar/querylang/build.xml
branches/mgr-143/src/jar/server-beep/build.xml
branches/mgr-143/src/jar/server-http/build.xml
branches/mgr-143/src/jar/server-local/build.xml
branches/mgr-143/src/jar/sofa/build.xml
branches/mgr-143/src/jar/sparql-protocol/build.xml
branches/mgr-143/src/jar/web/build.xml
Log:
updated all references to the itql module to the new name of 'querylang'.
Modified: branches/mgr-143/.classpath
===================================================================
--- branches/mgr-143/.classpath 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/.classpath 2008-08-30 01:30:05 UTC (rev 1202)
@@ -10,11 +10,11 @@
<classpathentry kind="src" path="src/jar/descriptor/src/java"/>
<classpathentry kind="src" path="src/jar/driver/java"/>
<classpathentry kind="src" path="src/jar/dtd/java"/>
- <classpathentry kind="src" path="src/jar/itql/java"/>
- <classpathentry kind="src" path="src/jar/itql/sablecc"/>
<classpathentry kind="src" path="src/jar/krule/java"/>
<classpathentry kind="src" path="src/jar/jrdf/java"/>
<classpathentry kind="src" path="src/jar/query/java"/>
+ <classpathentry kind="src" path="src/jar/querylang/java"/>
+ <classpathentry kind="src" path="src/jar/querylang/sablecc"/>
<classpathentry kind="src" path="src/jar/resolver/java"/>
<classpathentry kind="src" path="src/jar/resolver-distributed/java"/>
<classpathentry kind="src" path="src/jar/resolver-file/java"/>
Modified: branches/mgr-143/build.properties
===================================================================
--- branches/mgr-143/build.properties 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/build.properties 2008-08-30 01:30:05 UTC (rev 1202)
@@ -74,7 +74,7 @@
# Executable JARs for distribution
driver.jar = driver-${mulgara-version}.jar
-itql.jar = itql-${mulgara-version}.jar
+querylang.jar = querylang-${mulgara-version}.jar
mulgara.jar = mulgara-${mulgara-version}.jar
mulgara-core.jar = mulgara-core-${mulgara-version}.jar
mulgara-lite.jar = mulgara-lite-${mulgara-version}.jar
@@ -84,10 +84,10 @@
ant-task.jar = mulgara-ant-task-${mulgara-version}.jar
junit.results = ${test.dir}/All-Tests.xml
-itql.results = ${test.dir}/iTQL-Tests.xml
+querylang.results = ${test.dir}/QueryLanguage-Tests.xml
mulgara.results = ${test.dir}/Mulgara-Tests.xml
junit.results.tmpdir = ${test.dir}/alltest
-itql.results.tmpdir = ${test.dir}/itqltest
+querylang.results.tmpdir = ${test.dir}/querylangtest
mulgara.results.tmpdir = ${test.dir}/mulgaratest
loadtest.results = ${test.dir}/All-LoadTests.xml
loadtest.results.tmpdir = ${test.dir}/loadtest
Modified: branches/mgr-143/build.xml
===================================================================
--- branches/mgr-143/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -24,10 +24,9 @@
<property file="${jar.src.dir}/descriptor/descriptor-build.properties"/>
<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}/jrdf/jrdf-build.properties"/>
<property file="${jar.src.dir}/query/query-build.properties"/>
- <!--property file="${jar.src.dir}/rdql/rdql-build.properties"/-->
+ <property file="${jar.src.dir}/querylang/querylang-build.properties"/>
<property file="${jar.src.dir}/resolver/resolver-build.properties"/>
<property file="${jar.src.dir}/resolver-null/resolver-null-build.properties"/>
<property file="${jar.src.dir}/resolver-file/resolver-file-build.properties"/>
@@ -96,10 +95,9 @@
<import file="${jar.src.dir}/descriptor/build.xml"/>
<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}/jrdf/build.xml"/>
<import file="${jar.src.dir}/query/build.xml"/>
- <!--import file="${jar.src.dir}/rdql/build.xml"/-->
+ <import file="${jar.src.dir}/querylang/build.xml"/>
<import file="${jar.src.dir}/resolver/build.xml"/>
<import file="${jar.src.dir}/resolver-null/build.xml"/>
<import file="${jar.src.dir}/resolver-file/build.xml"/>
@@ -218,22 +216,8 @@
<tstamp/>
- <delete>
- <fileset dir="${obj.dir}" defaultexcludes="false">
- <exclude name="jar/itql/**/*"/>
- </fileset>
- <dirset dir="${obj.dir}" defaultexcludes="false">
- <exclude name="jar/itql/*"/>
- </dirset>
- </delete>
- <delete dir="${test.dir}"/>
- <delete dir="${bin.dir}"/>
- <delete>
- <fileset dir="${dist.dir}" defaultexcludes="false">
- <exclude name="ideSupport.jar"/>
- </fileset>
- <dirset dir="${dist.dir}" defaultexcludes="false"/>
- </delete>
+ <delete dir="${obj.dir}"/>
+ <delete dir="${dist.dir}"/>
<delete dir="${tmp.dir}"/>
<delete dir="${javadoc.dir}"/>
<delete dir="${jxtest.dir}"/>
@@ -274,7 +258,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, querylang-jar, query-jar, util-jar, log4j-conf.xml"
description="runs regression tests on the triple store">
<!-- Set timestamp for CruiseControl's benefit -->
@@ -302,7 +286,7 @@
<classpath path="${activation.jar}"/>
<classpath path="${bin.dir}/${query.jar}"/>
<classpath path="${bin.dir}/${driver.jar}"/>
- <classpath path="${bin.dir}/${itql.jar}"/>
+ <classpath path="${bin.dir}/${querylang.jar}"/>
<classpath path="${bin.dir}/${rules.jar}"/>
<classpath path="${bin.dir}/${server.jar}"/>
<classpath path="${bin.dir}/${util.jar}"/>
@@ -315,7 +299,7 @@
excludes="**/*LoadTest.java"/>
<fileset dir="${src.dir}/jar/driver/java" includes="**/*Test.java"
excludes="**/*LoadTest.java"/>
- <fileset dir="${src.dir}/jar/itql/java" includes="**/*Test.java"
+ <fileset dir="${src.dir}/jar/querylang/java" includes="**/*Test.java"
excludes="**/*LoadTest.java"/>
<fileset dir="${src.dir}/jar/server/java" includes="**/*Test.java"
excludes="**/*LoadTest.java"/>
@@ -336,7 +320,7 @@
depends="ant-task-dist,
client-jrdf-dist, content-mbox-dist,
content-mp3-dist, content-rdfxml-dist,
- descriptor-dist, driver-dist, dtd-dist, itql-dist, jrdf-dist,
+ descriptor-dist, driver-dist, dtd-dist, querylang-dist, jrdf-dist,
store-dist, store-xa-dist, store-nodepool-dist,
store-nodepool-memory-dist,
store-nodepool-xa-dist, query-dist,
@@ -361,7 +345,7 @@
<!-- =================================================================== -->
<!-- Removed server-local, jrdf -->
<target name="dist"
- depends="itql-dist, driver-dist, descriptor-dist, mulgara-war,
+ depends="querylang-dist, driver-dist, descriptor-dist, mulgara-war,
embedded-dist, lite-dist"
description="Creates the distribution files">
@@ -495,7 +479,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/${sparql-int.jar},
+ lib/${query.jar}, lib/${driver.jar}, lib/${querylang.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},
@@ -528,7 +512,7 @@
<!-- Creates the lite distribution file for the Embedded Mulgara server -->
<!-- =================================================================== -->
<target name="lite-dist"
- depends="driver-jar, itql-jar, sparql-int-jar, rules-jar, query-jar, rmi-jar,
+ depends="driver-jar, querylang-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,
@@ -582,7 +566,7 @@
${axis.jar}, ${commons-discovery.jar},
${jaxrpc.jar}, ${wsdl4j.jar}"/>
<zipfileset dir="${bin.dir}" prefix="lib" includes="
- ${query.jar}, ${driver.jar}, ${itql.jar}, ${sparql-int.jar},
+ ${query.jar}, ${driver.jar}, ${querylang.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},
@@ -755,7 +739,7 @@
ant-task-jar, client-jrdf-jar, config-jar,
content-mbox-jar, content-mp3-jar,
content-n3-jar, content-rdfxml-jar,
- itql-jar, sparql-int-jar,
+ querylang-jar, sparql-int-jar,
doclet.jar, jrdf-jar, store-jar,
store-xa-jar,
store-nodepool-jar, store-nodepool-memory-jar,
@@ -851,7 +835,7 @@
<sourcepath path="${content-rdfxml.src.dir}/java"/>
<sourcepath path="${driver.src.dir}/java"/>
<sourcepath path="${dtd.src.dir}/java"/>
- <sourcepath path="${itql.src.dir}/java"/>
+ <sourcepath path="${querylang.src.dir}/java"/>
<sourcepath path="${jrdf.src.dir}/java"/>
<sourcepath path="${krule.src.dir}/java"/>
<sourcepath path="${rules.src.dir}/java"/>
@@ -893,7 +877,7 @@
<sourcepath path="${webui.src.dir}/java"/>
<sourcepath path="${web.src.dir}/java"/>
<sourcepath path="${obj.dir}/jar/config/java"/>
- <sourcepath path="${obj.dir}/jar/itql/java"/>
+ <sourcepath path="${obj.dir}/jar/querylang/java"/>
<sourcepath path="${obj.dir}/jar/query/java"/>
<!--sourcepath path="${obj.dir}/jar/rdql/java"/-->
<sourcepath path="${obj.dir}/jar/util/java"/>
@@ -920,7 +904,7 @@
content-mp3-javadoc, content-n3-javadoc,
content-rdfxml-javadoc,
descriptor-javadoc, driver-javadoc, dtd-javadoc,
- itql-javadoc, sparql-int-javadoc,
+ querylang-javadoc, sparql-int-javadoc,
store-javadoc, store-xa-javadoc,
store-nodepool-javadoc,
store-nodepool-memory-javadoc, jrdf-javadoc,
@@ -1024,7 +1008,7 @@
<!-- =================================================================== -->
<!-- Starts the iTQL command line tool -->
<!-- =================================================================== -->
- <target name="run-itql" depends="itql-dist, uri">
+ <target name="run-itql" depends="querylang-dist, uri">
<java classname="org.mulgara.itql.ItqlSession"
failonerror="yes">
@@ -1039,7 +1023,7 @@
<pathelement path="${bin.dir}/${query.jar}"/>
<pathelement path="${bin.dir}/${driver.jar}"/>
- <pathelement path="${bin.dir}/${itql.jar}"/>
+ <pathelement path="${bin.dir}/${querylang.jar}"/>
<pathelement path="${bin.dir}/${rules.jar}"/>
<pathelement path="${bin.dir}/${server.jar}"/>
<pathelement path="${bin.dir}/${server-http.jar}"/>
@@ -1338,7 +1322,7 @@
<!-- =================================================================== -->
<target name="stress-test"
- depends="itql-jar, uri"
+ depends="querylang-jar, uri"
description="run stress tests the ItqlInterpreterBean">
<java classname="org.mulgara.itql.ItqlInterpreterStressTest" fork="yes" failonerror="no"
@@ -1365,7 +1349,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}, ${querylang.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>
@@ -1380,7 +1364,7 @@
depends="-prepare-build, log4j-conf.xml, dist"
description="Runs regression tests on a Mulgara server">
- <echo message="mulgara-test has not been implemented, run itql-test or dbms-test instead."/-->
+ <echo message="mulgara-test has not been implemented, run querylang-test or dbms-test instead."/-->
<!-- Set timestamp for CruiseControl's benefit -->
<!--tstamp/>
@@ -1405,7 +1389,7 @@
<!-- =================================================================== -->
<target name="mulgara-war"
description="Builds the Mulgara Semantic Store (Mulgara) WAR"
- depends="driver-jar, itql-jar, sparql-int-jar, query-jar, rmi-jar, server-jar,
+ depends="driver-jar, querylang-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">
@@ -1431,7 +1415,7 @@
<lib dir="${lib.dir}" includes="log4j-core-*.jar, icu4j.jar, jena-*.jar, antlr*.jar, beepcore-*.jar,
lucene*.jar, apache-soap-*.jar, ${joda-time.jar}, ${commons-logging.jar}, ${sesame-model.jar}"/>
<lib dir="${bin.dir}" includes="${query.jar},
- ${driver.jar}, ${itql.jar}, ${sparql-int.jar}, ${rules.jar}, ${rmi.jar},
+ ${driver.jar}, ${querylang.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"/>
@@ -1444,7 +1428,7 @@
targetfile="${bin.dir}/${mulgara.war}">
<srcfiles dir="${bin.dir}" includes="${query.jar},
- ${driver.jar}, ${itql.jar}, ${rules.jar}, ${rmi.jar},
+ ${driver.jar}, ${querylang.jar}, ${rules.jar}, ${rmi.jar},
${sparql-int.jar},
${server.jar}, ${server-beep.jar}, ${server-rmi.jar},
${util.jar}, ${config.jar}, ${descriptor.jar}"/>
@@ -1722,7 +1706,7 @@
content-mbox-jar, content-mp3-jar, content-n3-jar,
content-rdfxml-jar,
create-manifest, demo-jar, dtd-jar, driver-jar, dtd-jar,
- itql-jar, sparql-int-jar,
+ querylang-jar, sparql-int-jar,
javadoc-dist, jrdf-jar, store-jar, store-xa-jar,
store-nodepool-jar,
store-nodepool-memory-jar, store-nodepool-xa-jar,
@@ -1809,7 +1793,7 @@
<!-- core libraries -->
<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}/${querylang.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/**"/>
@@ -1892,7 +1876,7 @@
content-mbox-jar, content-mp3-jar, content-n3-jar,
content-rdfxml-jar,
demo-jar, driver-jar, dtd-jar,
- itql-jar, sparql-int-jar,
+ querylang-jar, sparql-int-jar,
jrdf-jar, store-jar, store-xa-jar,
store-nodepool-jar,
store-nodepool-memory-jar, store-nodepool-xa-jar,
@@ -1916,7 +1900,7 @@
<zipfileset src="${bin.dir}/${client-jrdf.jar}" excludes="META-INF/**"/>
<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}/${querylang.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/**"/>
@@ -2022,7 +2006,7 @@
<target name="client-test"
depends="client-jrdf-test,
- demo-mp3-test, driver-test, itql-test, query-test,
+ demo-mp3-test, driver-test, querylang-test, query-test,
descriptor-test"
description="Runs client side tests">
</target>
@@ -2069,9 +2053,9 @@
description="Builds necessary libraries for using the Eclipse IDE.">
<jar jarfile="${dist.dir}/ideSupport.jar">
- <zipfileset dir="${obj.dir}/jar/itql/classes" includes="org/mulgara/itql/**"/>
- <zipfileset dir="${obj.dir}/jar/itql/java" includes="org/mulgara/itql/lexer/lexer.dat"/>
- <zipfileset dir="${obj.dir}/jar/itql/java" includes="org/mulgara/itql/parser/parser.dat"/>
+ <zipfileset dir="${obj.dir}/jar/querylang/classes" includes="org/mulgara/itql/**"/>
+ <zipfileset dir="${obj.dir}/jar/querylang/java" includes="org/mulgara/itql/lexer/lexer.dat"/>
+ <zipfileset dir="${obj.dir}/jar/querylang/java" includes="org/mulgara/itql/parser/parser.dat"/>
<zipfileset dir="${obj.dir}/jar/config/classes" includes="org/mulgara/config/**"/>
<zipfileset dir="${obj.dir}/jar/util/classes" includes="org/mulgara/util/conversion/**"/>
<zipfileset dir="${obj.dir}/jar/server-rmi/classes" includes="org/mulgara/server/rmi/**"/>
Modified: branches/mgr-143/common.xml
===================================================================
--- branches/mgr-143/common.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/common.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -251,7 +251,7 @@
<sysproperty key="java.io.tmpdir" value="${tmp.dir}"/>
<sysproperty key="test.dir" value="${test.dir}"/>
<sysproperty key="admin" value=""/>
- <sysproperty key="itql.command.log" value="${tmp.dir}/itql.log"/>
+ <sysproperty key="itql.command.log" value="${tmp.dir}/querylang.log"/>
<sysproperty key="org.mulgara.xml.ResourceDocumentBuilderFactory"
value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
<sysproperty key="java.naming.factory.initial"
@@ -315,7 +315,7 @@
<sysproperty key="java.io.tmpdir" value="${tmp.dir}"/>
<sysproperty key="test.dir" value="${test.dir}"/>
<sysproperty key="admin" value=""/>
- <sysproperty key="itql.command.log" value="${tmp.dir}/itql.log"/>
+ <sysproperty key="itql.command.log" value="${tmp.dir}/querylang.log"/>
<sysproperty key="org.mulgara.xml.ResourceDocumentBuilderFactory"
value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
<sysproperty key="java.naming.factory.initial"
@@ -391,7 +391,7 @@
<!-- =================================================================== -->
<target name="stress-test"
- depends="itql-jar, uri"
+ depends="querylang-jar, uri"
description="run stress tests the ItqlInterpreterBean">
<java classname="org.mulgara.itql.ItqlInterpreterStressTest" fork="yes" failonerror="no"
@@ -418,7 +418,7 @@
<path refid="query-classpath"/>
- <fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar}, ${query.jar},
+ <fileset dir="${bin.dir}" includes="${dtd.jar}, ${querylang.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>
@@ -470,14 +470,14 @@
<sysproperty key="file.encoding" value="UTF8"/>
<sysproperty key="cvs.root" value="${basedir}"/>
<sysproperty key="log4j.configuration" value="${baseuri}/log4j-conf.xml"/>
- <sysproperty key="itql.command.log" value="${tmp.dir}/itql.log"/>
+ <sysproperty key="itql.command.log" value="${tmp.dir}/querylang.log"/>
<sysproperty key="org.mulgara.test" value="${org.mulgara.test}"/>
<classpath>
<path refid="query-classpath"/>
- <fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar},
+ <fileset dir="${bin.dir}" includes="${dtd.jar}, ${querylang.jar},
${query.jar},
${driver.jar}, ${rmi.base.jar},
${server-rmi.jar}"/>
Modified: branches/mgr-143/src/jar/client-jrdf/build.xml
===================================================================
--- branches/mgr-143/src/jar/client-jrdf/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/client-jrdf/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -26,7 +26,7 @@
<pathelement path="${util.dist.dir}/${util.jar}"/>
<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="${querylang.dist.dir}/${querylang.jar}"/>
<pathelement path="${rules.dist.dir}/${rules.jar}"/>
<pathelement path="${lib.dir}/${jrdf.jar}"/>
<pathelement path="${lib.dir}/${sesame-model.jar}"/>
@@ -61,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, querylang-jar, server-jar, jrdf-jar"
description="Compiles all client-jrdf related files included generated
source code">
Modified: branches/mgr-143/src/jar/descriptor/build.xml
===================================================================
--- branches/mgr-143/src/jar/descriptor/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/descriptor/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -24,7 +24,7 @@
<fileset dir="${lib.dir}" includes="**/**"/>
<fileset dir="${driver.dist.dir}" includes="${driver.jar}" />
- <fileset dir="${itql.dist.dir}" includes="${itql.jar}" />
+ <fileset dir="${querylang.dist.dir}" includes="${querylang.jar}" />
<fileset dir="${rules.dist.dir}" includes="${rules.jar}" />
<fileset dir="${query.dist.dir}" includes="${query.jar}" />
<fileset dir="${server.dist.dir}" includes="${server.jar}" />
@@ -45,7 +45,7 @@
<pathelement location="${lib.dir}/${jetty.jar}"/>
<pathelement location="${dist.dir}/${driver.jar}"/>
- <pathelement location="${dist.dir}/${itql.jar}"/>
+ <pathelement location="${dist.dir}/${querylang.jar}"/>
<pathelement location="${dist.dir}/${util.jar}"/>
<pathelement location="${server.dist.dir}/${server.jar}"/>
@@ -89,7 +89,7 @@
</target>
<target name="descriptor-jsp-compile"
- depends="-descriptor-prepare, driver-jar, itql-jar, server-jar"
+ depends="-descriptor-prepare, driver-jar, querylang-jar, server-jar"
description="Pre-compiles JSPs">
<!-- Replace basedir -->
Modified: branches/mgr-143/src/jar/driver/build.xml
===================================================================
--- branches/mgr-143/src/jar/driver/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/driver/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -93,7 +93,7 @@
</target>
<target name="driver-dist"
- depends="driver-jar, driver-jar, itql-jar, query-jar,
+ depends="driver-jar, driver-jar, querylang-jar, query-jar,
server-jar, server-beep-jar, server-rmi-jar, util-jar, driver-uptodate"
unless="driver.uptodate"
description="Performs all tasks related to finalising this driver
@@ -102,7 +102,7 @@
<jar jarfile="${dist.dir}/${driver.jar}">
<zipfileset src="${driver.dist.dir}/${driver.jar}" excludes="META-INF/**"/>
- <zipfileset src="${itql.dist.dir}/${itql.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${querylang.dist.dir}/${querylang.jar}" excludes="META-INF/**"/>
<zipfileset src="${rules.dist.dir}/${rules.jar}" excludes="META-INF/**"/>
<zipfileset src="${query.dist.dir}/${query.jar}" excludes="META-INF/**"/>
<zipfileset src="${server.dist.dir}/${server.jar}" excludes="META-INF/**"/>
@@ -125,7 +125,7 @@
targetfile="${dist.dir}/${driver.jar}">
<srcfiles dir="${driver.dist.dir}" includes="${driver.jar}"/>
- <srcfiles dir="${itql.dist.dir}" includes="${itql.jar}"/>
+ <srcfiles dir="${querylang.dist.dir}" includes="${querylang.jar}"/>
<srcfiles dir="${rules.dist.dir}" includes="${rules.jar}"/>
<srcfiles dir="${query.dist.dir}" includes="${query.jar}"/>
<srcfiles dir="${server.dist.dir}" includes="${server.jar}"/>
Modified: branches/mgr-143/src/jar/krule/build.xml
===================================================================
--- branches/mgr-143/src/jar/krule/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/krule/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -24,7 +24,7 @@
<pathelement path="${query.dist.dir}/${query.jar}"/>
<pathelement path="${driver.dist.dir}/${driver.jar}"/>
<pathelement path="${util.dist.dir}/${util.jar}"/>
- <pathelement path="${itql.dist.dir}/${itql.jar}"/>
+ <pathelement path="${querylang.dist.dir}/${querylang.jar}"/>
<pathelement path="${tuples.dist.dir}/${tuples.jar}"/>
<pathelement path="${rules.dist.dir}/${rules.jar}"/>
<pathelement path="${resolver.dist.dir}/${resolver.jar}"/>
@@ -58,7 +58,7 @@
</target>
<target name="krule-compile"
- depends="-krule-prepare, driver-jar, itql-jar, rules-jar, tuples-jar, resolver-jar"
+ depends="-krule-prepare, driver-jar, querylang-jar, rules-jar, tuples-jar, resolver-jar"
description="Compiles all krule related files included generated source code">
<javac destdir="${krule.obj.dir}/classes" debug="on"
Modified: branches/mgr-143/src/jar/querylang/build.xml
===================================================================
--- branches/mgr-143/src/jar/querylang/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/querylang/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -4,7 +4,7 @@
<!-- =================================================================== -->
<!-- Project definition -->
<!-- =================================================================== -->
-<project name="itql" default="itql-jar" basedir="../../..">
+<project name="querylang" default="querylang-jar" basedir="../../..">
<!-- =================================================================== -->
<!-- Property Definitions -->
@@ -17,115 +17,118 @@
<!-- =================================================================== -->
<!-- Path Definitions -->
<!-- =================================================================== -->
- <path id="itql-classpath">
+ <path id="querylang-classpath">
<path refid="common-classpath"/>
<fileset file="${query.dist.dir}/${query.jar}"/>
<fileset file="${driver.dist.dir}/${driver.jar}"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
</path>
- <path id="itql-test-classpath">
- <path refid="itql-classpath"/>
+ <path id="querylang-test-classpath">
+ <path refid="querylang-classpath"/>
<path refid="driver-classpath"/>
<fileset file="${lib.dir}/commons-discovery-1.2.jar"/>
<fileset file="${bin.dir}/${rmi.jar}"/>
- <fileset file="${itql.dist.dir}/${itql.jar}"/>
+ <fileset file="${querylang.dist.dir}/${querylang.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
</path>
- <target name="itql-clean" description="Removes all compile generated files for the itql">
+ <target name="querylang-clean" description="Removes all compile generated files for the querylang">
<tstamp/>
- <delete dir="${itql.obj.dir}"/>
- <delete dir="${itql.test.dir}"/>
- <delete dir="${itql.dist.dir}"/>
+ <delete dir="${querylang.obj.dir}"/>
+ <delete dir="${querylang.test.dir}"/>
+ <delete dir="${querylang.dist.dir}"/>
</target>
- <target name="-itql-prepare" description="Creates all directories associated with the itql's compilation"
+ <target name="-querylang-prepare" description="Creates all directories associated with the querylang's compilation"
depends="-prepare-build">
- <mkdir dir="${itql.obj.dir}"/>
- <mkdir dir="${itql.test.dir}"/>
- <mkdir dir="${itql.dist.dir}"/>
- <mkdir dir="${itql.obj.dir}/classes"/>
- <mkdir dir="${itql.obj.dir}/java"/>
+ <mkdir dir="${querylang.obj.dir}"/>
+ <mkdir dir="${querylang.test.dir}"/>
+ <mkdir dir="${querylang.dist.dir}"/>
+ <mkdir dir="${querylang.obj.dir}/classes"/>
+ <mkdir dir="${querylang.obj.dir}/java"/>
</target>
- <target name="gen-itql-parser" depends="-itql-prepare, itql-parser-uptodate, sablecc" unless="itql-parser-uptodate">
- <sablecc src="${itql.src.dir}/sablecc" outputdirectory="${itql.obj.dir}/java">
+ <target name="gen-querylang-parser" depends="-querylang-prepare, querylang-parser-uptodate, sablecc" unless="querylang-parser-uptodate">
+ <sablecc src="${querylang.src.dir}/sablecc" outputdirectory="${querylang.obj.dir}/java">
<include name="itql.grammar"/>
</sablecc>
+ <!-- TODO: Add in JavaCC generation -->
</target>
- <target name="itql-parser-uptodate" depends="-prepare-build">
- <uptodate property="itql-parser-uptodate"
- targetfile="${obj.dir}/jar/itql/java/org/mulgara/itql/analysis/DepthFirstAdapter.java">
- <srcfiles dir="${itql.src.dir}/sablecc" includes="itql.grammar"/>
+
+ <target name="querylang-parser-uptodate" depends="-prepare-build">
+ <uptodate property="querylang-parser-uptodate"
+ targetfile="${obj.dir}/jar/querylang/java/org/mulgara/itql/analysis/DepthFirstAdapter.java">
+ <srcfiles dir="${querylang.src.dir}/sablecc" includes="itql.grammar"/>
</uptodate>
</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/TqlSession.java" token="@@build.label@@" value="${build.label}"/>
+ <target name="-querylang-token-build-label" depends="-querylang-token-build-label-uptodate" unless="querylang.token.build.label.uptodate">
+ <replace file="${querylang.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/TqlSession.java">
- <srcfiles dir="${itql.src.dir}" includes="**/TqlSession.java"/>
+ <target name="-querylang-token-build-label-uptodate">
+ <uptodate property="querylang.token.build.label.uptodate" targetfile="${querylang.obj.dir}/java/org/mulgara/itql/TqlSession.java">
+ <srcfiles dir="${querylang.src.dir}" includes="**/TqlSession.java"/>
</uptodate>
</target>
- <target name="itql-compile" depends="-itql-prepare, gen-itql-parser, driver-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"/>
+ <target name="querylang-compile" depends="-querylang-prepare, gen-querylang-parser, driver-jar" description="Compiles all query language related files included generated source code">
+ <copy todir="${querylang.obj.dir}/java/" preservelastmodified="yes">
+ <fileset dir="${querylang.src.dir}/java/" includes="**/*.java"/>
</copy>
- <antcall target="-itql-token-build-label"/>
- <javac destdir="${itql.obj.dir}/classes" debug="on" deprecation="on" source="1.5" classpathref="itql-classpath">
- <src path="${itql.obj.dir}/java"/>
+ <antcall target="-querylang-token-build-label"/>
+ <javac destdir="${querylang.obj.dir}/classes" debug="on" deprecation="on" source="1.5" classpathref="querylang-classpath">
+ <src path="${querylang.obj.dir}/java"/>
</javac>
</target>
- <target name="-itql-create-manifest">
+ <!-- This is the manifest for the system that starts the ITQL interpreter by default -->
+ <target name="-querylang-create-manifest">
<mkdir dir="${obj.dir}/META-INF"/>
- <manifest file="${obj.dir}/META-INF/MANIFEST_ITQL_BASE.MF">
+ <manifest file="${obj.dir}/META-INF/MANIFEST_QUERYLANG_BASE.MF">
<attribute name="Main-Class" value="org.mulgara.itql.TqlSession"/>
</manifest>
- <manifest file="${obj.dir}/META-INF/MANIFEST_ITQL_BOOTSTRAP.MF">
+ <manifest file="${obj.dir}/META-INF/MANIFEST_QUERYLANG_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.15.jar,jargs-0.2.jar, ${saaj.jar}, ${emory-util.jar}, ${sesame-model.jar}"/>
+ <attribute name="Embedded-Jar" value="${query.jar}, ${driver.jar}, ${querylang.jar},${util.jar}, ${server-beep.jar}, ${server-rmi.jar}, apache-soap-2.2.jar, log4j-1.2.15.jar,jargs-0.2.jar, ${saaj.jar}, ${emory-util.jar}, ${sesame-model.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.itql.TqlSession"/>
</manifest>
</target>
- <target name="itql-jar" depends="itql-compile, -itql-create-manifest, -itql-jar-uptodate" unless="itql.jar.uptodate" description="Creates the itql's jar/s">
- <jar jarfile="${itql.dist.dir}/${itql.jar}"
- manifest="${obj.dir}/META-INF/MANIFEST_ITQL_BASE.MF">
- <fileset dir="${itql.obj.dir}/classes" excludes="**/*.java"/>
- <fileset dir="${itql.obj.dir}/java" includes="**/*.dat"/>
+ <target name="querylang-jar" depends="querylang-compile, -querylang-create-manifest, -querylang-jar-uptodate" unless="querylang.jar.uptodate" description="Creates the querylang's jar/s">
+ <jar jarfile="${querylang.dist.dir}/${querylang.jar}"
+ manifest="${obj.dir}/META-INF/MANIFEST_QUERYLANG_BASE.MF">
+ <fileset dir="${querylang.obj.dir}/classes" excludes="**/*.java"/>
+ <fileset dir="${querylang.obj.dir}/java" includes="**/*.dat"/>
</jar>
</target>
- <target name="-itql-jar-uptodate">
- <uptodate property="itql.jar.uptodate" targetfile="${itql.dist.dir}/${itql.jar}">
- <srcfiles dir="${itql.obj.dir}/classes" includes="**/*"/>
+ <target name="-querylang-jar-uptodate">
+ <uptodate property="querylang.jar.uptodate" targetfile="${querylang.dist.dir}/${querylang.jar}">
+ <srcfiles dir="${querylang.obj.dir}/classes" includes="**/*"/>
</uptodate>
</target>
- <target name="itql-dist"
- depends="itql-uptodate, itql-jar, server-beep-jar, server-rmi-jar, sparql-int-jar"
- unless="itql.uptodate"
- description="Performs all tasks related to finalising this itql and readying it for distribution">
+ <target name="querylang-dist"
+ depends="querylang-uptodate, querylang-jar, server-beep-jar, server-rmi-jar, sparql-int-jar"
+ unless="querylang.uptodate"
+ description="Performs all tasks related to finalising this querylang and readying it for distribution">
<mkdir dir="${obj.dir}/META-INF"/>
- <manifest file="${obj.dir}/META-INF/itql-MANIFEST.MF">
+ <manifest file="${obj.dir}/META-INF/querylang-MANIFEST.MF">
<attribute name="Main-Class" value="org.mulgara.itql.TqlSession"/>
</manifest>
- <jar jarfile="${dist.dir}/${itql.jar}"
- manifest="${obj.dir}/META-INF/itql-MANIFEST.MF">
+ <jar jarfile="${dist.dir}/${querylang.jar}"
+ manifest="${obj.dir}/META-INF/querylang-MANIFEST.MF">
<fileset dir="${conf.dir}" includes="log4j-tql.xml"/>
- <fileset dir="${itql.src.dir}/itql"
+ <fileset dir="${querylang.src.dir}/itql"
includes="default-pre.itql, default-post.itql"/>
<zipfileset src="${driver.dist.dir}/${driver.jar}" excludes="META-INF/**"/>
- <zipfileset src="${itql.dist.dir}/${itql.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${querylang.dist.dir}/${querylang.jar}" excludes="META-INF/**"/>
<zipfileset src="${query.dist.dir}/${query.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/**"/>
@@ -148,12 +151,12 @@
</jar>
</target>
- <target name="itql-uptodate">
+ <target name="querylang-uptodate">
- <uptodate property="itql.uptodate"
- targetfile="${dist.dir}/${itql.jar}">
+ <uptodate property="querylang.uptodate"
+ targetfile="${dist.dir}/${querylang.jar}">
- <srcfiles dir="${itql.dist.dir}" includes="${itql.jar}"/>
+ <srcfiles dir="${querylang.dist.dir}" includes="${querylang.jar}"/>
<srcfiles dir="${driver.dist.dir}" includes="${driver.jar}"/>
<srcfiles dir="${query.dist.dir}" includes="${query.jar}"/>
<srcfiles dir="${sparql-int.dist.dir}" includes="${query.jar}"/>
@@ -163,44 +166,44 @@
</uptodate>
</target>
- <target name="itql-test"
- depends="itql-jar, test-data"
- description="Carries out unit testing for this itql">
+ <target name="querylang-test"
+ depends="querylang-jar, test-data"
+ description="Carries out unit testing for this querylang">
<!-- start the Mulgara server -->
<antcall target="start"/>
<antcall target="component-test">
- <param name="classpath.id" value="itql-test-classpath"/>
- <param name="dir" value="${itql.src.dir}"/>
- <param name="jar" value="${itql.jar}"/>
+ <param name="classpath.id" value="querylang-test-classpath"/>
+ <param name="dir" value="${querylang.src.dir}"/>
+ <param name="jar" value="${querylang.jar}"/>
</antcall>
<!-- stop the Mulgara server -->
<antcall target="stop"/>
</target>
- <target name="itql-javadoc"
- depends="itql-jar"
- description="Creates the javadoc for this itql">
+ <target name="querylang-javadoc"
+ depends="querylang-jar"
+ description="Creates the javadoc for this querylang">
<antcall target="javadoc">
<param name="javadoc.package" value="org.mulgara.itql.*,
org.mulgara.store.*"/>
- <param name="javadoc.classpath" value="itql-classpath"/>
- <param name="javadoc.sourcepath" value="${itql.src.dir}/java"/>
+ <param name="javadoc.classpath" value="querylang-classpath"/>
+ <param name="javadoc.sourcepath" value="${querylang.src.dir}/java"/>
</antcall>
</target>
- <target name="itql-help"
- description="Displays the help information for this itql">
+ <target name="querylang-help"
+ description="Displays the help information for this querylang">
<!-- This is similar to the main project's help except the information
- is specific to this itql -->
+ is specific to this querylang -->
- <echo message="Welcome to the build script for ${itql.name}."/>
+ <echo message="Welcome to the build script for ${querylang.name}."/>
<echo message=""/>
<echo message="These targets can be invoked as follows:"/>
<echo message=" ./build.sh <target>"/>
@@ -211,7 +214,7 @@
<jvmarg value="${arch.bits}"/>
- <arg line="-buildfile ${itql.src.dir}/build.xml -projecthelp"/>
+ <arg line="-buildfile ${querylang.src.dir}/build.xml -projecthelp"/>
</java>
</target>
Deleted: branches/mgr-143/src/jar/querylang/itql-build.properties
===================================================================
--- branches/mgr-143/src/jar/querylang/itql-build.properties 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/querylang/itql-build.properties 2008-08-30 01:30:05 UTC (rev 1202)
@@ -1,17 +0,0 @@
-#
-# Properties used by the ITQL module
-#
-# $Id: itql-build.properties,v 1.9 2005/04/03 02:26:09 tomadams Exp $
-#
-
-# Module Name
-itql.name = ITQL
-
-# General module properties
-itql.conf.dir = ${conf.dir}
-itql.src.dir = ${jar.src.dir}/itql
-itql.obj.dir = ${jar.obj.dir}/itql
-itql.dist.dir = ${bin.dir}
-itql.test.dir = ${test.dir}/itql
-itql.jxtest.dir = ${jxtest.dir}/itql
-itql.jar = itql-base-${mulgara-version}.jar
Copied: branches/mgr-143/src/jar/querylang/querylang-build.properties (from rev 1201, branches/mgr-143/src/jar/querylang/itql-build.properties)
===================================================================
--- branches/mgr-143/src/jar/querylang/querylang-build.properties (rev 0)
+++ branches/mgr-143/src/jar/querylang/querylang-build.properties 2008-08-30 01:30:05 UTC (rev 1202)
@@ -0,0 +1,15 @@
+#
+# Properties used by the QueryLang module
+#
+
+# Module Name
+querylang.name = QueryLanguage
+
+# General module properties
+querylang.conf.dir = ${conf.dir}
+querylang.src.dir = ${jar.src.dir}/querylang
+querylang.obj.dir = ${jar.obj.dir}/querylang
+querylang.dist.dir = ${bin.dir}
+querylang.test.dir = ${test.dir}/querylang
+querylang.jxtest.dir = ${jxtest.dir}/querylang
+querylang.jar = querylang-base-${mulgara-version}.jar
Modified: branches/mgr-143/src/jar/server-beep/build.xml
===================================================================
--- branches/mgr-143/src/jar/server-beep/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/server-beep/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -24,7 +24,7 @@
<fileset file="${query.dist.dir}/${query.jar}"/>
<fileset file="${server.dist.dir}/${server.jar}"/>
<fileset file="${sparql-protocol.dist.dir}/${sparql-protocol.jar}"/>
- <fileset file="${itql.dist.dir}/${itql.jar}"/>
+ <fileset file="${querylang.dist.dir}/${querylang.jar}"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
@@ -60,7 +60,7 @@
</target>
<target name="server-beep-compile"
- depends="-server-beep-prepare, itql-jar, query-jar, server-jar, rules-jar,
+ depends="-server-beep-prepare, querylang-jar, query-jar, server-jar, rules-jar,
sparql-protocol-jar"
description="Compiles all server-beep related files included generated
source code">
Modified: branches/mgr-143/src/jar/server-http/build.xml
===================================================================
--- branches/mgr-143/src/jar/server-http/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/server-http/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -23,7 +23,7 @@
<fileset file="${query.dist.dir}/${query.jar}"/>
<fileset file="${server.dist.dir}/${server.jar}"/>
- <fileset file="${itql.dist.dir}/${itql.jar}"/>
+ <fileset file="${querylang.dist.dir}/${querylang.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
<fileset file="${lib.dir}/javax.servlet-2.3.jar"/>
</path>
@@ -59,7 +59,7 @@
</target>
<target name="server-http-compile"
- depends="-server-http-prepare, itql-jar, server-jar"
+ depends="-server-http-prepare, querylang-jar, server-jar"
description="Compiles all server-http related files included generated
source code">
@@ -91,7 +91,7 @@
</target>
<target name="server-http-war-compile"
- depends="-server-http-prepare, query-jar, itql-jar, server-jar,
+ depends="-server-http-prepare, query-jar, querylang-jar, server-jar,
util-jar"
description="Compiles all server-http war related files including
generated source code">
@@ -118,7 +118,7 @@
<classes dir="${server-http.war.obj.dir}/classes"/>
<lib dir="${server-http.war.dist.dir}" includes="${query.jar},
- ${itql.jar},
+ ${querylang.jar},
${util.jar},
${rules.jar}"/>
</war>
@@ -133,7 +133,7 @@
</target>
<target name="server-http-dist"
- depends="query-jar, driver-jar, itql-jar, util-jar, config-jar,
+ depends="query-jar, driver-jar, querylang-jar, util-jar, config-jar,
dtd-compile, server-jar, server-http-war, javadoc-dist,
webui-war"
description="Performs all tasks related to finalising this server-http
@@ -150,7 +150,7 @@
<manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_HTTP_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${itql.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar,lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/${castor-xml.jar}, lib/${castor-xml-schema.jar}, lib/xercesImpl.jar, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}, lib/${sesame-model.jar}"/>
+ <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${querylang.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar,lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/${castor-xml.jar}, lib/${castor-xml-schema.jar}, lib/xercesImpl.jar, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}, lib/${sesame-model.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraHttpServer"/>
</manifest>
@@ -177,7 +177,7 @@
${jetty.jar}, ${jetty.plus.jar}, ${servlet.jar}, ${jasper.runtime.jar},
xerces*.jar, mail-*.jar, castor*.jar, trove-*.jar, ${jrdf.jar}, ${emory-util.jar}, ${sesame-model.jar}"/>
<zipfileset dir="${bin.dir}" prefix="lib" includes="${query.jar},
- ${driver.jar}, ${itql.jar}, ${server.jar},
+ ${driver.jar}, ${querylang.jar}, ${server.jar},
${util.jar}, ${config.jar}"/>
<zipfileset dir="${basedir}/data" prefix="data" includes="**/*.rdfs"/>
@@ -209,7 +209,7 @@
<srcfiles dir="${bin.dir}" includes="${server-http.jar}"/>
<srcfiles dir="${bin.dir}" includes="${driver.jar}"/>
<srcfiles dir="${bin.dir}" includes="${query.jar}"/>
- <srcfiles dir="${bin.dir}" includes="${itql.jar}"/>
+ <srcfiles dir="${bin.dir}" includes="${querylang.jar}"/>
<srcfiles dir="${bin.dir}" includes="${server.jar}"/>
<srcfiles dir="${bin.dir}" includes="${util.jar}"/>
<srcfiles dir="${bin.dir}" includes="${config.jar}"/>
Modified: branches/mgr-143/src/jar/server-local/build.xml
===================================================================
--- branches/mgr-143/src/jar/server-local/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/server-local/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -23,7 +23,7 @@
<fileset file="${driver.dist.dir}/${driver.jar}"/>
<fileset file="${query.dist.dir}/${query.jar}"/>
- <fileset file="${itql.dist.dir}/${itql.jar}"/>
+ <fileset file="${querylang.dist.dir}/${querylang.jar}"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
</path>
@@ -58,7 +58,7 @@
</target>
<target name="server-local-compile"
- depends="-server-local-prepare, itql-jar, server-jar"
+ depends="-server-local-prepare, querylang-jar, server-jar"
description="Compiles all server-local related files included
generated source code"
unless="server-local.classes.uptodate">
Modified: branches/mgr-143/src/jar/sofa/build.xml
===================================================================
--- branches/mgr-143/src/jar/sofa/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/sofa/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -28,7 +28,7 @@
<pathelement path="${client-jrdf.dist.dir}/${client-jrdf.jar}"/>
<pathelement path="${server-rmi.dist.dir}/${server-rmi.jar}"/>
<pathelement path="${resolver-spi.dist.dir}/${resolver-spi.jar}"/>
- <pathelement path="${itql.dist.dir}/${itql.jar}"/>
+ <pathelement path="${querylang.dist.dir}/${querylang.jar}"/>
<pathelement path="${lib.dir}/${jrdf.jar}"/>
<pathelement path="${lib.dir}/${sesame-model.jar}"/>
<pathelement path="${lib.dir}/${sofa.jar}"/>
@@ -66,7 +66,7 @@
</target>
<target name="sofa-compile"
- depends="-sofa-prepare, driver-jar, itql-jar, server-jar, jrdf-jar,
+ depends="-sofa-prepare, driver-jar, querylang-jar, server-jar, jrdf-jar,
client-jrdf-jar, resolver-spi-jar"
description="Compiles all sofa related files included generated
source code">
Modified: branches/mgr-143/src/jar/sparql-protocol/build.xml
===================================================================
--- branches/mgr-143/src/jar/sparql-protocol/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/sparql-protocol/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -23,7 +23,7 @@
<fileset file="${query.dist.dir}/${query.jar}"/>
<fileset file="${server.dist.dir}/${server.jar}"/>
- <fileset file="${itql.dist.dir}/${itql.jar}"/>
+ <fileset file="${querylang.dist.dir}/${querylang.jar}"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset dir="${lib.dir}" includes="jsr173_07_api.jar, jsr173_07_ri.jar"/>
@@ -58,7 +58,7 @@
</target>
<target name="sparql-protocol-compile"
- depends="-sparql-protocol-prepare, server-jar, itql-jar"
+ depends="-sparql-protocol-prepare, server-jar, querylang-jar"
description="Compiles all sparql-protocol related files included generated
source code">
Modified: branches/mgr-143/src/jar/web/build.xml
===================================================================
--- branches/mgr-143/src/jar/web/build.xml 2008-08-29 05:40:06 UTC (rev 1201)
+++ branches/mgr-143/src/jar/web/build.xml 2008-08-30 01:30:05 UTC (rev 1202)
@@ -21,7 +21,7 @@
<path refid="common-classpath"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${query.dist.dir}/${query.jar}"/>
- <fileset file="${itql.dist.dir}/${itql.jar}"/>
+ <fileset file="${querylang.dist.dir}/${querylang.jar}"/>
<fileset file="${server.dist.dir}/${server.jar}"/>
<fileset file="${lib.dir}/${jetty.jar}"/>
<fileset file="${lib.dir}/${jetty-plus.jar}"/>
@@ -63,7 +63,7 @@
</target>
<target name="web-compile"
- depends="-web-prepare, util-jar, config-jar, itql-jar, query-jar, -web-unjar-config"
+ depends="-web-prepare, util-jar, config-jar, querylang-jar, query-jar, -web-unjar-config"
description="Compiles all web related files included generated
source code"
unless="web.classes.uptodate">
More information about the Mulgara-svn
mailing list