[Mulgara-svn] r701 - branches/mgr-61-sparql

[pag at mulgara.org]

Author: pag
Date: 2008-03-24 15:06:06 -0700 (Mon, 24 Mar 2008)
New Revision: 701

Modified:
   branches/mgr-61-sparql/.classpath
   branches/mgr-61-sparql/build.xml
Log:
Fixed up build and source paths for different implementation structure

Modified: branches/mgr-61-sparql/.classpath
===================================================================
--- branches/mgr-61-sparql/.classpath	2008-03-20 11:55:33 UTC (rev 700)
+++ branches/mgr-61-sparql/.classpath	2008-03-24 22:06:06 UTC (rev 701)
@@ -16,7 +16,6 @@
 	<classpathentry kind="src" path="src/jar/demo-mp3/java"/>
 	<classpathentry kind="src" path="src/jar/driver/java"/>
 	<classpathentry kind="src" path="src/jar/dtd/java"/>
-	<classpathentry kind="src" path="src/jar/sparql/java"/>
 	<classpathentry kind="src" path="src/jar/itql/java"/>
 	<classpathentry kind="src" path="src/jar/itql/sablecc"/>
 	<classpathentry kind="src" path="src/jar/jrdf/java"/>

Modified: branches/mgr-61-sparql/build.xml
===================================================================
--- branches/mgr-61-sparql/build.xml	2008-03-20 11:55:33 UTC (rev 700)
+++ branches/mgr-61-sparql/build.xml	2008-03-24 22:06:06 UTC (rev 701)
@@ -28,7 +28,6 @@
   <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}/sparql/sparql-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"/-->
@@ -100,7 +99,6 @@
   <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}/sparql/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"/-->
@@ -315,7 +313,7 @@
           depends="ant-task-dist,
                    client-jrdf-dist, connector-dist, connection-dist, content-mbox-dist,
                    content-mp3-dist, content-rdfxml-dist, content-rio-dist,
-                   descriptor-dist, driver-dist, dtd-dist, itql-dist, sparql-dist, jrdf-dist,
+                   descriptor-dist, driver-dist, dtd-dist, itql-dist, jrdf-dist,
                    store-dist, store-xa-dist, store-nodepool-dist,
                    store-nodepool-memory-dist,
                    store-nodepool-xa-dist, query-dist,
@@ -732,7 +730,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, sparql-jar, jrdf-jar, store-jar,
+             doclet.jar, itql-jar, jrdf-jar, store-jar,
              store-xa-jar, connection-jar,
              store-nodepool-jar, store-nodepool-memory-jar,
              store-nodepool-xa-jar, query-jar,
@@ -760,7 +758,6 @@
                       org.mulgara.driver.*,
                       org.mulgara.extractor.tag,
                       org.mulgara.itql,
-                      org.mulgara.sparql,
                       org.mulgara.jrdf,
                       org.mulgara.local.*,
                       org.mulgara.query.*,
@@ -771,7 +768,6 @@
                       org.mulgara.sofa.*,
                       org.mulgara.krule.*,
                       org.mulgara.rules.*,
-                      org.mulgara.sparql.*,
                       org.mulgara.store.*,
                       org.mulgara.store.graph.*,
                       org.mulgara.store.graph.xa.*,
@@ -892,7 +888,7 @@
                    content-mp3-javadoc, content-n3-javadoc,
                    content-rdfxml-javadoc, content-rio-javadoc,
                    descriptor-javadoc, driver-javadoc, dtd-javadoc,
-                   itql-javadoc, sparql-javadoc, store-javadoc, store-xa-javadoc,
+                   itql-javadoc, store-javadoc, store-xa-javadoc,
                    store-nodepool-javadoc,
                    store-nodepool-memory-javadoc, jrdf-javadoc,
                    store-nodepool-xa-javadoc, query-javadoc,
@@ -1710,7 +1706,7 @@
              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,
-             sparql-jar, javadoc-dist, jrdf-jar, store-jar, store-xa-jar,
+             javadoc-dist, jrdf-jar, store-jar, store-xa-jar,
              store-nodepool-jar,
              store-nodepool-memory-jar, store-nodepool-xa-jar,
              query-jar, resolver-jar, resolver-file-jar, resolver-filesystem-jar,
@@ -1787,7 +1783,6 @@
       <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.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/**"/>
@@ -1962,7 +1957,6 @@
       <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/sparql/classes" includes="org/mulgara/sparql/**"/>
       <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/**"/>