[Mulgara-svn] r1227 - trunk
pag at mulgara.org
pag at mulgara.org
Wed Sep 3 22:07:00 UTC 2008
Author: pag
Date: 2008-09-03 15:07:00 -0700 (Wed, 03 Sep 2008)
New Revision: 1227
Modified:
trunk/build.xml
trunk/common.xml
Log:
Removed dependency on Bootstrap
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-09-03 22:06:07 UTC (rev 1226)
+++ trunk/build.xml 2008-09-03 22:07:00 UTC (rev 1227)
@@ -463,34 +463,7 @@
<!-- generate the bootstrap manifest -->
<manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_Lite_BOOTSTRAP.MF">
- <attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="
- lib/${query.jar}, lib/${driver.jar}, lib/${querylang.jar},
- lib/${rmi.jar},
- lib/${server.jar}, lib/${server-rmi.jar},
- lib/${util.jar}, lib/${config.jar}, lib/${descriptor.jar}, lib/${server-local.jar},
- lib/${resolver.jar}, lib/${resolver-spi.jar}, lib/${resolver-filesystem.jar},
- lib${store.jar}, lib/${store-xa.jar}, lib/${rules.jar},
- lib/${store-nodepool.jar}, lib/${store-nodepool-xa.jar},
- lib/${store-nodepool-memory.jar}, lib/${store-stringpool.jar}
- lib/${store-stringpool-xa.jar},
- lib/${store-stringpool-xa11.jar},
- lib/${store-stringpool-memory.jar}, lib/${util-xa.jar}, lib/${resolver-null.jar}, lib/${resolver-file.jar},
- lib/${resolver-http.jar}, lib/${resolver-lucene.jar}, lib/${resolver-memory.jar},
- lib/${resolver-store.jar}, lib/${resolver-url.jar}, lib/${resolver-view.jar},
- lib/${tuples.jar}, lib/${tuples-hybrid.jar}, lib/${content-mp3.jar},
- lib/${content-n3.jar}, lib/${content-mbox.jar}, lib/${content-rdfxml.jar},
- lib/${resolver-nodetype.jar}, lib/${resolver-prefix.jar},
- lib/${resolver-relational.jar}, lib/${resolver-xsd.jar}, lib/${resolver-test.jar},
- lib/${resolver-distributed.jar},
- lib/${resolver-jar.jar}, lib/${dtd.jar},
- lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar, lib/antlr.jar,
- lib/${joda-time.jar}, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/${lucene.jar}, lib/mail-1.3.jar,
- lib/${jetty.jar}, lib/${jetty.plus.jar}, lib/${jasper.compiler.jar}, lib/${servlet-jsp.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,
- lib/${castor-xml.jar}, lib/${castor-codegen.jar}, lib/${castor-xml-schema.jar}, lib/trove-1.0.2.jar, lib/${saaj.jar},
- lib/${jakarta-oro.jar}, lib/jta-spec1_0_1.jar, lib/${jotm.jar}, lib/${jotm.jrmp.jar}, lib/${carol.jar}, lib/${howl.jar},
- lib/${jca.jar}, lib/${httpclient.jar}, lib/${commons-codec.jar}, lib/${sesame-model.jar}"/>
- <attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraServer"/>
+ <attribute name="Main-Class" value="org.mulgara.server.EmbeddedMulgaraServer"/>
</manifest>
</target>
@@ -533,49 +506,101 @@
manifest="${obj.dir}/META-INF/MANIFEST_Mulgara_Lite_BOOTSTRAP.MF">
<zipfileset dir="${conf.dir}" prefix="conf"
- includes="log4j-mulgara.xml, webdefault.xml, mulgara-rmi.policy,
- mulgara.policy"/>
- <zipfileset dir="${lib.dir}" prefix="lib" includes="
- ${log4j.jar}, ${icu4j.jar}, ${activation.jar},
- ${jargs.jar}, ${jetty.jar}, ${jetty.plus.jar},
- ${servlet-jsp.jar}, ${servlet.jar}, ${jasper.runtime.jar}, ${jasper.compiler.jar},
- ${lucene.jar}, ${mail.jar}, ${castor-xml.jar}, ${castor-xml-schema.jar}, ${castor-codegen.jar}, ${trove.jar},
- ${joda-time.jar}, ${commons-logging.jar}, ${commons-httpclient.jar},
- ${commons-codec.jar}, ${emory-util.jar},
- ${jotm.jar}, ${jotm.jrmp.jar}, ${carol.jar}, ${howl.jar}, ${jta.jar},
- ${jca.jar}, ${saaj.jar},
- ${axis.jar}, ${commons-discovery.jar}, ${jaxrpc.jar}, ${wsdl4j.jar},
- ${jena.jar}, ${antlr.jar}, ${jakarta-oro.jar}, {jid3.jar}, lib/${sesame-model.jar}"/>
- <zipfileset dir="${lib.dir}" prefix="lib" includes="${saaj.jar},
- ${axis.jar}, ${commons-discovery.jar},
- ${jaxrpc.jar}, ${wsdl4j.jar}"/>
- <zipfileset dir="${bin.dir}" prefix="lib" includes="
- ${query.jar}, ${driver.jar}, ${querylang.jar},
- ${rules.jar}, ${rmi.jar},
- ${server.jar}, ${server-rmi.jar},
- ${util.jar}, ${config.jar}, ${descriptor.jar}, ${server-local.jar},
- ${resolver.jar}, ${resolver-spi.jar}, ${resolver-filesystem.jar},
- ${store.jar}, ${store-xa.jar},
- ${store-nodepool.jar}, ${store-nodepool-xa.jar}, ${store-stringpool.jar},
- ${store-stringpool-xa.jar},
- ${store-stringpool-xa11.jar}, ${store-nodepool-memory.jar}, ${resolver-null.jar},
- ${store-stringpool-memory.jar}, ${util-xa.jar}, ${resolver-file.jar},
- ${resolver-http.jar}, ${resolver-lucene.jar}, ${resolver-memory.jar},
- ${resolver-store.jar}, ${resolver-url.jar}, ${resolver-view.jar},
- ${tuples.jar}, ${tuples-hybrid.jar}, ${content-mp3.jar},
- ${content-n3.jar}, ${content-mbox.jar}, ${content-rdfxml.jar},
- ${resolver-nodetype.jar}, ${resolver-prefix.jar},
- ${resolver-xsd.jar}, ${resolver-test.jar}, ${resolver-relational.jar},
- ${resolver-distributed.jar},
- ${resolver-jar.jar}, ${dtd.jar}, ${jrdf.base.jar}"/>
+ includes="log4j-mulgara.xml, webdefault.xml, mulgara-rmi.policy, mulgara.policy"/>
+ <zipfileset src="${lib.dir}/${antlr.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${axis.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${activation.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${carol.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${castor-codegen.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${castor-xml.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${castor-xml-schema.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${commons-codec.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${commons-discovery.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${commons-httpclient.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${commons-logging.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${emory-util.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${howl.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${icu4j.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jakarta-oro.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jargs.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jasper.compiler.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jasper.runtime.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jaxrpc.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jca.jar}" excludes="META-INF/**"/>
+ <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/**"/>
+ <zipfileset src="${lib.dir}/${jta.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${log4j.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${lucene.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${mail.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${saaj.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${servlet.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${servlet-jsp.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${sesame-model.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${trove.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${wsdl4j.jar}" excludes="META-INF/**"/>
+
+
+ <zipfileset src="${bin.dir}/${config.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${content-mbox.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-rdfxml.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${descriptor.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${driver.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}/${query.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${querylang.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${rules.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver-distributed.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver-file.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver-filesystem.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver-http.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver-jar.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-nodetype.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver-null.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-spi.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver-store.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${resolver-test.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}/${resolver-xsd.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${server-local.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${server-rmi.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${store.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}/${store-xa.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}/${util.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${util-xa.jar}" excludes="META-INF/**"/>
+
+
<!-- Schemas -->
- <zipfileset dir="${basedir}/data" prefix="data"
- includes="mulgara.rdfs"/>
+ <zipfileset dir="${basedir}/data" prefix="data" includes="mulgara.rdfs"/>
<zipfileset file="${obj.dir}/mulgara-x-config.xml" prefix="conf" />
- <fileset dir="${obj.dir}/jar/util/classes" includes="**/Bootstrap.class"/>
<fileset dir="${src.dir}/jar/dtd" includes="META-INF/**, DTD/**"/>
<!-- HACK!!!!! -->
@@ -1707,7 +1732,7 @@
<!-- build the executable jar file -->
<jar jarfile="${dist.dir}/${mulgara.jar}"
- manifest="${obj.dir}/META-INF/MANIFEST_Mulgara_BOOTSTRAP.MF">
+ manifest="${obj.dir}/META-INF/MANIFEST_Mulgara_FRAMEWORK.MF">
<zipfileset dir="${conf.dir}" prefix="conf"
includes="log4j-mulgara.xml, webdefault.xml, mulgara-rmi.policy,
@@ -1818,10 +1843,8 @@
<zipfileset file="${obj.dir}/mulgara-x-config.xml" prefix="conf" />
<!-- Schemas -->
- <zipfileset dir="${basedir}/data" prefix="data"
- includes="**/*.rdfs,**/*.rss,**/*.n3"/>
+ <zipfileset dir="${basedir}/data" prefix="data" includes="**/*.rdfs,**/*.rss,**/*.n3"/>
- <fileset dir="${obj.dir}/jar/util/classes" includes="**/Bootstrap.class"/>
<fileset dir="${src.dir}/jar/dtd" includes="META-INF/**, DTD/**"/> <!-- fileset dir="${obj.dir}/jar/dtd/classes"/ -->
<!-- HACK!!!!! -->
@@ -1938,10 +1961,8 @@
</manifest>
<!-- generate the bootstrap manifest -->
- <manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_BOOTSTRAP.MF">
-
- <attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraServer"/>
+ <manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_FRAMEWORK.MF">
+ <attribute name="Main-Class" value="org.mulgara.server.EmbeddedMulgaraServer"/>
</manifest>
</target>
Modified: trunk/common.xml
===================================================================
--- trunk/common.xml 2008-09-03 22:06:07 UTC (rev 1226)
+++ trunk/common.xml 2008-09-03 22:07:00 UTC (rev 1227)
@@ -569,7 +569,7 @@
<arg line="-Dorg.mulgara.test="${org.mulgara.test}""/>
<arg value="-cp"/>
<arg value="${jvm-classpath}"/>
- <arg line="org.mulgara.util.Bootstrap"/>
+ <arg line="org.mulgara.server.EmbeddedMulgaraServer"/>
<!-- <arg value="-jar"/>
<arg value="${dist.dir}/${mulgara.jar}"/> -->
@@ -589,7 +589,7 @@
<arg line="-Djava.io.tmpdir="${tmp.dir}""/>
<arg value="-cp"/>
<arg value="${jvm-classpath}"/>
- <arg line="org.mulgara.util.Bootstrap"/>
+ <arg line="org.mulgara.server.EmbeddedMulgaraServer"/>
<!-- <arg value="-jar"/>
<arg value="${dist.dir}/${mulgara.jar}"/> -->
<arg value="-a"/>
@@ -607,7 +607,7 @@
<arg line="-Djava.io.tmpdir="${tmp.dir}""/>
<arg value="-cp"/>
<arg value="${jvm-classpath}"/>
- <arg line="org.mulgara.util.Bootstrap"/>
+ <arg line="org.mulgara.server.EmbeddedMulgaraServer"/>
<!-- <arg value="-jar"/>
<arg value="${dist.dir}/${mulgara.jar}"/> -->
<arg value="-a"/>
@@ -626,7 +626,7 @@
<arg line="-Djava.io.tmpdir="${tmp.dir}""/>
<arg value="-cp"/>
<arg value="${jvm-classpath-win}"/>
- <arg line="org.mulgara.util.Bootstrap"/>
+ <arg line="org.mulgara.server.EmbeddedMulgaraServer"/>
<!-- <arg value="-jar"/>
<arg value="${dist.dir}\${mulgara.jar}"/> -->
<arg value="-a"/>
More information about the Mulgara-svn
mailing list