[Mulgara-svn] r1229 - trunk
pag at mulgara.org
pag at mulgara.org
Thu Sep 4 06:23:11 UTC 2008
Author: pag
Date: 2008-09-03 23:23:10 -0700 (Wed, 03 Sep 2008)
New Revision: 1229
Modified:
trunk/build.properties
trunk/build.xml
Log:
Added 2 new targets: raw-dist and basic-raw-dist
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2008-09-04 06:22:00 UTC (rev 1228)
+++ trunk/build.properties 2008-09-04 06:23:10 UTC (rev 1229)
@@ -73,6 +73,8 @@
driver.jar = driver-${mulgara-version}.jar
querylang.jar = querylang-${mulgara-version}.jar
mulgara.jar = mulgara-${mulgara-version}.jar
+mulgara-basic-raw.jar = mulgara-basic-raw-${mulgara-version}.jar
+mulgara-raw.jar = mulgara-raw-${mulgara-version}.jar
mulgara-core.jar = mulgara-core-${mulgara-version}.jar
mulgara-lite.jar = mulgara-lite-${mulgara-version}.jar
mulgara-http.jar = mulgara-http-${mulgara-version}.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-09-04 06:22:00 UTC (rev 1228)
+++ trunk/build.xml 2008-09-04 06:23:10 UTC (rev 1229)
@@ -332,7 +332,7 @@
<!-- Removed server-local, jrdf -->
<target name="dist"
depends="querylang-dist, driver-dist, descriptor-dist, mulgara-war,
- embedded-dist, lite-dist"
+ embedded-dist, lite-dist, raw-dist, basic-raw-dist"
description="Creates the distribution files">
<copy file="${bin.dir}/${mulgara.war}" tofile="${dist.dir}/${mulgara.war}"/>
@@ -1695,48 +1695,82 @@
</concat>
</target>
+
<!-- =================================================================== -->
<!-- Creates the distribution file for the Embedded Mulgara server -->
<!-- =================================================================== -->
<target name="embedded-dist"
- depends="client-jrdf-jar, config-jar,
- content-mbox-jar, content-mp3-jar, content-n3-jar,
+ depends="client-jrdf-jar,
+ config-jar,
+ content-mbox-jar,
+ content-mp3-jar,
+ content-n3-jar,
content-rdfxml-jar,
- create-manifest, demo-jar, dtd-jar, driver-jar, dtd-jar,
+ create-manifest,
+ demo-jar,
+ dtd-jar,
+ driver-jar,
+ dtd-jar,
querylang-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-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,
- webservices-war, webui-war, web-jar, -embedded-dist-uptodate"
+ 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,
+ webservices-war,
+ webui-war,
+ web-jar,
+ -embedded-dist-uptodate"
description="Creates the executable JAR for the Embedded Mulgara server"
- unless="embedded.dist.uptodate">
+ unless="embedded.dist.uptodate">
<!-- HACK!!!!! -->
<!-- This will get the ARP parser working -->
<!-- My theory about why this is necessary is that the Bootloader class
messes up the JAR plugin framework that both JAXP and StAX use -->
<mkdir dir="${obj.dir}/xerces"/>
-
<unjar src="${lib.dir}/xercesImpl.jar" dest="${obj.dir}/xerces"/>
<unjar src="${lib.dir}/xmlParserAPIs.jar" dest="${obj.dir}/xerces"/>
+ <!-- HACK!!!!! -->
<!-- build the executable jar file -->
- <jar jarfile="${dist.dir}/${mulgara.jar}"
- manifest="${obj.dir}/META-INF/MANIFEST_Mulgara_FRAMEWORK.MF">
+ <jar jarfile="${dist.dir}/${mulgara.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"/>
+ <zipfileset dir="${conf.dir}" prefix="conf" includes="log4j-mulgara.xml, webdefault.xml, mulgara-rmi.policy, mulgara.policy"/>
<!-- third party libraries -->
<zipfileset src="${lib.dir}/${activation.jar}" excludes="META-INF/**"/>
@@ -1762,6 +1796,7 @@
<zipfileset src="${lib.dir}/${jena.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jetty.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jetty.plus.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jid3.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${joda-time.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jotm.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jotm.jrmp.jar}" excludes="META-INF/**"/>
@@ -1826,7 +1861,6 @@
<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="${lib.dir}/${jid3.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/**"/>
@@ -1849,15 +1883,257 @@
<!-- HACK!!!!! -->
<!-- This will get the ARP parser working -->
- <!-- Ignore the xerces DocumentBuilderFactory -->
- <fileset dir="${obj.dir}/xerces" excludes="META_INF/**,META-INF/services/javax.xml.parsers.DocumentBuilderFactory"/>
-
+ <!-- If we ignore the xerces DocumentBuilderFactory then WSDL won't set up -->
+ <!--fileset dir="${obj.dir}/xerces" excludes="META_INF/**,META-INF/services/javax.xml.parsers.DocumentBuilderFactory"/-->
<fileset dir="${obj.dir}/xerces" excludes="META_INF/**"/>
<!-- HACK!!!!! -->
</jar>
</target>
+
+ <!-- ======================================================================================== -->
+ <!-- Creates the distribution file for the Embedded Mulgara server with no external libs -->
+ <!-- ======================================================================================== -->
+ <target name="raw-dist"
+ depends="client-jrdf-jar,
+ config-jar,
+ content-mbox-jar,
+ content-mp3-jar,
+ content-n3-jar,
+ content-rdfxml-jar,
+ create-manifest,
+ demo-jar,
+ dtd-jar,
+ driver-jar,
+ dtd-jar,
+ querylang-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-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,
+ webservices-war,
+ webui-war,
+ web-jar,
+ -embedded-dist-uptodate"
+ description="Creates a JAR for the Embedded Mulgara server with none of the external libs"
+ unless="embedded.dist.uptodate">
+
+ <!-- build the executable jar file -->
+ <jar jarfile="${dist.dir}/${mulgara-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"/>
+
+ <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}/${descriptor.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/**"/>
+
+
+ <!-- include pre-bundled webapps -->
+ <zipfileset dir="${bin.dir}" prefix="webapps" includes="${webui.war}"/>
+ <zipfileset dir="${obj.dir}/war" prefix="webapps" includes="webservices.war"/>
+ <zipfileset file="${obj.dir}/mulgara-x-config.xml" prefix="conf" />
+
+ <!-- Schemas -->
+ <zipfileset dir="${basedir}/data" prefix="data" includes="**/*.rdfs,**/*.rss,**/*.n3"/>
+ <fileset dir="${src.dir}/jar/dtd" includes="META-INF/**, DTD/**"/>
+
+ </jar>
+ </target>
+
+ <!-- ========================================================================================== -->
+ <!-- Creates a cut down distribution file for the Embedded Mulgara server with no external libs -->
+ <!-- ========================================================================================== -->
+ <target name="basic-raw-dist"
+ depends="client-jrdf-jar,
+ config-jar,
+ content-n3-jar,
+ content-rdfxml-jar,
+ create-manifest,
+ demo-jar,
+ dtd-jar,
+ driver-jar,
+ dtd-jar,
+ querylang-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-null-jar,
+ resolver-file-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-relational-jar,
+ resolver-distributed-jar,
+ resolver-xsd-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,
+ -embedded-dist-uptodate"
+ description="Creates a JAR for the Embedded Mulgara server with minimal classes (no web apps) and none of the external 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"/>
+
+ <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}/${descriptor.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}/${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-n3.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}/${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 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,
More information about the Mulgara-svn
mailing list