[Mulgara-svn] r2073 - trunk

pag at mulgara.org pag at mulgara.org
Tue Nov 29 19:02:28 UTC 2011 

Author: pag
Date: 2011-11-29 19:02:28 +0000 (Tue, 29 Nov 2011)
New Revision: 2073

Modified:
   trunk/build.xml
Log:
Removed redundant references to jars that are already encapsulated by tuples.jar. Also stripped out more packages from minimal-server-dist

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2011-11-29 19:02:15 UTC (rev 2072)
+++ trunk/build.xml	2011-11-29 19:02:28 UTC (rev 2073)
@@ -562,7 +562,6 @@
       <zipfileset src="${bin.dir}/${jrdf.base.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-distributed.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-file.jar}" excludes="META-INF/**, **/*Test*"/>
@@ -575,7 +574,6 @@
       <zipfileset src="${bin.dir}/${resolver-null.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-prefix.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-relational.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-store.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-test.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-url.jar}" excludes="META-INF/**, **/*Test*"/>
@@ -584,15 +582,11 @@
       <zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-local.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${tuples.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${tuples-hybrid.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${util.jar}" excludes="META-INF/**, **/*Test*"/>
@@ -1744,7 +1738,6 @@
       <zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${driver.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${util.jar}" excludes="META-INF/**, **/*Test*"/>
@@ -1752,14 +1745,9 @@
       <zipfileset src="${bin.dir}/${descriptor.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-local.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-filesystem.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="META-INF/**, **/*Test*"/>
@@ -1886,7 +1874,6 @@
       <zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${driver.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${util.jar}" excludes="META-INF/**, **/*Test*"/>
@@ -1894,14 +1881,9 @@
       <zipfileset src="${bin.dir}/${descriptor.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-local.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-filesystem.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="META-INF/**, **/*Test*"/>
@@ -2015,20 +1997,14 @@
       <zipfileset src="${bin.dir}/${query.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${driver.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${querylang.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${rmi.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${util.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${config.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-local.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="**/*.xml, META-INF/**, **/*Test*"/>
@@ -2194,32 +2170,26 @@
       <zipfileset src="${bin.dir}/${driver.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${dtd.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${jrdf.base.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**, conf/mulgara-x-config.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**, **/*.xml, **/*Test*, org/mulgara/protocol/**, org/mulgara/store/jxunit/**"/>
-      <zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**, **/*.xml, conf/mulgara-x-config.xml, **/*Test*"/>
+      <zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**, conf/mulgara-x-config.xml, org/mulgara/jena/**, **/*Test*"/>
+      <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**, **/*.xml, **/*Test*, org/mulgara/protocol/**, org/mulgara/itql/**, org/mulgara/sparql/**, org/mulgara/store/jxunit/**"/>
       <zipfileset src="${bin.dir}/${resolver.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-memory.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-nodetype.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-null.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-prefix.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-store.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-view.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-xsd.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-local.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${tuples.jar}" excludes="META-INF/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${tuples-hybrid.jar}" excludes="META-INF/**, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${util.jar}" excludes="META-INF/**, **/*Test*"/>
+      <zipfileset src="${bin.dir}/${util.jar}" excludes="META-INF/**, java/sql/**, **/*Test*"/>
       <zipfileset src="${bin.dir}/${util-xa.jar}" excludes="META-INF/**, **/*Test*"/>
 
 
@@ -2364,7 +2334,6 @@
       <zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${driver.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${util.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
@@ -2372,14 +2341,9 @@
       <zipfileset src="${bin.dir}/${descriptor.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${server-local.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${resolver-filesystem.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
-      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>
       <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="META-INF/**, **/*.xml, **/*Test*"/>

More information about the Mulgara-svn mailing list