[Mulgara-svn] r1232 - trunk

pag at mulgara.org pag at mulgara.org
Thu Sep 4 19:10:34 UTC 2008


Author: pag
Date: 2008-09-04 12:10:32 -0700 (Thu, 04 Sep 2008)
New Revision: 1232

Modified:
   trunk/build.xml
Log:
Updated the core-dist target to take on the role of basic-raw-dist

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-09-04 07:35:40 UTC (rev 1231)
+++ trunk/build.xml	2008-09-04 19:10:32 UTC (rev 1232)
@@ -319,7 +319,7 @@
   <!-- Removed server-local, jrdf -->
   <target name="dist"
           depends="querylang-dist, driver-dist, descriptor-dist, mulgara-war,
-                   embedded-dist, lite-dist, raw-dist, basic-raw-dist"
+                   embedded-dist, lite-dist, raw-dist, core-dist"
           description="Creates the distribution files">
 
     <copy file="${bin.dir}/${mulgara.war}" tofile="${dist.dir}/${mulgara.war}"/>
@@ -1873,7 +1873,7 @@
   <!-- ========================================================================================== -->
   <!-- Creates a cut down distribution file for the Embedded Mulgara server with no external libs -->
   <!-- ========================================================================================== -->
-  <target name="basic-raw-dist"
+  <target name="core-dist"
     depends="client-jrdf-jar,
              config-jar,
              content-n3-jar,
@@ -1921,14 +1921,12 @@
              util-jar,
              util-xa-jar,
              -embedded-dist-uptodate"
-          description="Creates a JAR for the Embedded Mulgara server with minimal classes (no web apps) and none of the external libs"
+          description="Creates a JAR for embedded apps server with minimal classes (no web apps) and no 3rd party libs"
           unless="embedded.dist.uptodate">
 
     <!-- build the executable jar file -->
-    <jar jarfile="${dist.dir}/${mulgara-basic-raw.jar}" manifest="${obj.dir}/META-INF/MANIFEST_Mulgara_FRAMEWORK.MF">
-
-      <zipfileset dir="${conf.dir}" prefix="conf" includes="log4j-mulgara.xml, webdefault.xml, mulgara-rmi.policy, mulgara.policy"/>
-
+    <jar jarfile="${dist.dir}/${mulgara-core.jar}">
+      <zipfileset dir="${conf.dir}" prefix="conf" includes="log4j-mulgara.xml, mulgara-rmi.policy, mulgara.policy"/>
       <zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**"/>
       <zipfileset src="${bin.dir}/${driver.jar}" excludes="META-INF/**"/>
       <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**"/>
@@ -1973,93 +1971,12 @@
       <zipfileset src="${bin.dir}/${rules.jar}" excludes="META-INF/**"/>
       <zipfileset src="${bin.dir}/${krule.jar}" excludes="META-INF/**"/>
 
-
       <zipfileset file="${obj.dir}/mulgara-x-config.xml" prefix="conf" />
-
       <!-- Schemas -->
       <fileset dir="${src.dir}/jar/dtd" includes="META-INF/**, DTD/**"/>
-
     </jar>
   </target>
 
-  <target name="core-dist"
-          depends="client-jrdf-jar, config-jar,
-             content-mbox-jar, content-mp3-jar, content-n3-jar,
-             content-rdfxml-jar,
-             demo-jar, driver-jar, dtd-jar,
-             querylang-jar,
-             jrdf-jar, store-jar, store-xa-jar,
-             store-nodepool-jar,
-             store-nodepool-memory-jar, store-nodepool-xa-jar,
-             query-jar, resolver-jar, resolver-null-jar, resolver-file-jar, resolver-filesystem-jar,
-             resolver-http-jar, resolver-memory-jar, resolver-spi-jar,
-             resolver-store-jar, resolver-url-jar, resolver-lucene-jar,
-             resolver-view-jar, resolver-nodetype-jar, resolver-prefix-jar, resolver-jar-jar,
-             resolver-relational-jar, resolver-distributed-jar,
-             resolver-xsd-jar, resolver-test-jar, rmi-jar,
-             server-jar, server-rmi-jar,
-             rules-jar, krule-jar, store-stringpool-jar, store-stringpool-memory-jar,
-             store-stringpool-xa-jar, store-stringpool-xa11-jar, tuples-jar,
-             tuples-hybrid-jar, util-jar, util-xa-jar, web-jar,
-             -embedded-dist-uptodate"
-          description="core dist for embedded apps, without 3rd party libs"
-                unless="embedded.dist.uptodate">
-
-    <!-- build the executable jar file -->
-    <jar jarfile="${dist.dir}/${mulgara-core.jar}">
-      <!-- core libraries -->
-      <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}/${querylang.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-rmi.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${util.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${config.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${server-local.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-spi.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-filesystem.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-xa.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-nodepool.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-nodepool-memory.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-nodepool-xa.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-stringpool.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-stringpool-memory.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-stringpool-xa.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${store-stringpool-xa11.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${util-xa.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-null.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-file.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-http.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-lucene.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-memory.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-store.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-url.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-view.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${tuples.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${tuples-hybrid.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${content-mp3.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${content-n3.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${content-mbox.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${content-rdfxml.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-nodetype.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-prefix.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-relational.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-distributed.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-xsd.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-test.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${resolver-jar.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${dtd.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${jrdf.base.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${rules.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${krule.jar}" excludes="META-INF/**"/>
-      <zipfileset src="${bin.dir}/${web.jar}" excludes="META-INF/**"/>
-    </jar>
-  </target>
-
   <!-- do a check for any changes made to the mulgara build -->
   <!-- potentially not the most efficient checking performed -->
   <target name="-embedded-dist-uptodate">




More information about the Mulgara-svn mailing list