[Mulgara-svn] r776 - in trunk: . conf lib src/jar/config src/jar/demo-mp3 src/jar/server-http
pag at mulgara.org
pag at mulgara.org
Sat Apr 12 02:08:11 UTC 2008
Author: pag
Date: 2008-04-11 19:08:08 -0700 (Fri, 11 Apr 2008)
New Revision: 776
Added:
trunk/lib/castor-1.2-codegen.jar
trunk/lib/castor-1.2-xml-schema.jar
trunk/lib/castor-1.2-xml.jar
trunk/lib/velocity-1.5.jar
Removed:
trunk/lib/castor-0.9.3.9-xml.jar
Modified:
trunk/LEGAL.txt
trunk/build.properties
trunk/build.xml
trunk/conf/mulgara-config.xml
trunk/conf/mulgara-embedded.xsd
trunk/src/jar/config/build.xml
trunk/src/jar/demo-mp3/build.xml
trunk/src/jar/server-http/build.xml
Log:
Updated the Castor library to remove some of the warnings received in Java 1.5 and above.
Castor is now in several parts, which required updates to classpaths for code generation tasks,
and a new entry point is being called as well.
The configuration is now using XSD and not DTD. This needed some updates, as it has a strict
ordering requirement on the configuration file in conf.
Also, "class" properties were being converted to "type", so that Database and DatabaseFactory
could call getType on the configuration objects. However, this does not happen in the latest
Castor, meaning that "class" peroperties lead to a name clash on the getClass method. To avoid
this, the configuration has now been changed to use a property of "type". This lets the source
code stay unchanged, though now classes are identified by type="package.ClassName" instead of
class="package.ClassName" in the conf/mulgara-config.xml file.
Modified: trunk/LEGAL.txt
===================================================================
--- trunk/LEGAL.txt 2008-04-11 19:40:04 UTC (rev 775)
+++ trunk/LEGAL.txt 2008-04-12 02:08:08 UTC (rev 776)
@@ -95,10 +95,12 @@
http://opensource.org/licenses/bsd-license.php
Castor
- JARs: castor-0.9.3.9-xml.jar
- URL: http://castor.org
- LICENSE: The Intalio License (BSD-style)
- http://www.castor.org/license.html
+ JARs: castor-1.2-codegen.jar
+ castor-1.2-xml.jar
+ castor-1.2-schema.jar
+ URL: http://castor.org/
+ LICENSE: Apache License Version 2.0
+ http://castor.org/new-license.txt
Commons Discovery
JARs: commons-discovery-1.2.jar
@@ -288,6 +290,12 @@
License GNU LGPL
http://www.opensource.org/licenses/lgpl-license.php
+ Velocity
+ JARs: velocity-1.5.jar
+ URL: http://velocity.apache.org/
+ License Apache License Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+
WSDL4J
JARs: wsdl4j-1.5.1.jar
URL: http://sourceforge.net/projects/wsdl4j
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2008-04-11 19:40:04 UTC (rev 775)
+++ trunk/build.properties 2008-04-12 02:08:08 UTC (rev 776)
@@ -101,7 +101,10 @@
barracuda.jar =barracuda-1.2.6.jar
beep.jar =beepcore-0.9.08.jar
bsh.jar =bsh-2.0b1.jar
-castor.jar =castor-0.9.3.9-xml.jar
+castor-xml.jar =castor-1.2-xml.jar
+castor-xml-schema.jar =castor-1.2-xml-schema.jar
+castor-codegen.jar =castor-1.2-codegen.jar
+velocity.jar =velocity-1.5.jar
commons-collections.jar =commons-collections-3.1.jar
commons-discovery.jar =commons-discovery-1.2.jar
commons-httpclient.jar =commons-httpclient-3.0.1.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-04-11 19:40:04 UTC (rev 775)
+++ trunk/build.xml 2008-04-12 02:08:08 UTC (rev 776)
@@ -489,7 +489,7 @@
lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar, lib/antlr.jar,
lib/${date-utils.jar}, lib/${commons-logging.jar}, lib/beepcore-0.9.08.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.jar}, lib/jargs-0.2.jar,
- lib/castor-0.9.3.9-xml.jar, lib/trove-1.0.2.jar, lib/${jrdf.jar}, lib/${saaj.jar},
+ lib/${castor-xml.jar}, lib/${castor-codegen.jar}, lib/${castor-xml-schema.jar}, lib/trove-1.0.2.jar, lib/${jrdf.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/${httpclient.jar}, lib/${commons-codec.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraServer"/>
@@ -543,7 +543,7 @@
${log4j.jar}, ${icu4j.jar}, ${activation.jar}, ${beep.jar},
${jargs.jar}, ${jrdf.jar}, ${jetty.jar}, ${jetty.plus.jar},
${servlet.jar}, ${jasper.runtime.jar}, ${jasper.compiler.jar},
- ${lucene.jar}, ${mail.jar}, ${castor.jar}, ${trove.jar},
+ ${lucene.jar}, ${mail.jar}, ${castor-xml.jar}, ${castor-xml-schema.jar}, ${castor-codegen.jar}, ${trove.jar},
${date-utils.jar}, ${commons-logging.jar}, ${commons-httpclient.jar},
${commons-codec.jar}, ${emory-util.jar},
${jotm.jar}, ${jotm.jrmp.jar}, ${carol.jar}, ${howl.jar}, ${jta.jar},
@@ -1736,7 +1736,9 @@
<zipfileset src="${lib.dir}/${jasper.compiler.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}/${castor.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}/${castor-codegen.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${trove.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${date-utils.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${commons-logging.jar}" excludes="META-INF/**"/>
@@ -1872,26 +1874,6 @@
<manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
-<!--
-<attribute name="Embedded-Jar" value="lib/${client-jrdf.jar}, lib/${client-jena.jar}, lib/${config.jar},
-lib/${content-n3.jar}, lib/${content-rdfxml.jar}, lib/${content-rio.jar}, lib/${descriptor.jar},lib/${driver.jar},
-lib/${itql.jar}, lib/${jrdf.base.jar}, lib${store-nodepool.jar},
-lib/${store-nodepool-memory.jar}, lib/${store-nodepool-xa.jar},lib/${query.jar}, lib/${resolver.jar},
-lib/${resolver-file.jar}, lib/${resolver-filesystem.jar}, lib/${resolver-http.jar}, lib/${resolver-memory.jar},
-lib/${resolver-nodetype.jar}, lib/${resolver-prefix.jar}, lib/${resolver-spi.jar}, lib/${resolver-store.jar}, lib/${resolver-jar.jar},
-lib/${resolver-view.jar}, lib/${resolver-xsd.jar}, lib/${resolver-test.jar}, lib/${resolver-url.jar}, lib/${resolver-lucene.jar}, lib/${content-mp3.jar},
-lib/${content-mbox.jar}, lib/${rmi.jar}, lib/${server.jar}, lib/${server-beep.jar},
-lib/${server-rmi.jar}, lib/${sofa.base.jar}, lib/${rules.base.jar}, lib/${krule.base.jar}, lib/${store.jar},
-lib/${store-stringpool.jar}
-lib/${store-stringpool-memory.jar}, lib/${store-stringpool-xa.jar}, lib/${tuples.jar},lib/${tuples-hybrid.jar},
-lib/${util.jar}, lib/${util-xa.jar}, lib/activation-1.0.2.jar,lib/icu4j.jar, lib/jena-2.1.jar, lib/${jid3.jar},
-lib/antlr.jar, lib/${date-utils.jar}, lib/${commons-logging.jar}, lib/beepcore-0.9.08.jar,
-lib/${jotm.jar}, lib/${jotm_carol.jar}, lib/${jotm_iiop_stubs.jar},lib/jta-spec1_0_1.jar, lib/log4j-1.2.15.jar, lib/${lucene.jar},
-lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${jasper.compiler.jar},
-lib/${servlet.jar},lib/jargs-0.2.jar, lib/castor-0.9.3.9-xml.jar, lib/xercesImpl.jar, lib/xmlParserAPIs.jar,
-lib/trove-1.0.2.jar,lib/${jrdf.jar}, lib/${sofa.jar}, lib/${rules.jar}, lib/${krule.jar}, lib/${saaj.jar}, lib/${axis.jar}, lib/${commons-discovery.jar},
-lib/${jaxrpc.jar},lib/${wsdl4j.jar}, lib/${emory-util.jar}, lib/${httpclient.jar}"/>
--->
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraServer"/>
</manifest>
</target>
Modified: trunk/conf/mulgara-config.xml
===================================================================
--- trunk/conf/mulgara-config.xml 2008-04-11 19:40:04 UTC (rev 775)
+++ trunk/conf/mulgara-config.xml 2008-04-12 02:08:08 UTC (rev 776)
@@ -70,7 +70,7 @@
org.mulgara.resolver.RelatedHandler.
-->
<RelatedQueryHandler
- class="org.mulgara.resolver.RelatedQueryHandlerImpl"/>
+ type="org.mulgara.resolver.RelatedQueryHandlerImpl"/>
<!--
Security adapter implementation. If this element is omitted, the only
@@ -86,44 +86,44 @@
and resolvers. The persistent resolver is used to manipulate the system
model.
-->
- <PersistentNodePoolFactory class="org.mulgara.store.nodepool.xa.XANodePoolFactory" dir="xaNodePool"/>
- <TemporaryNodePoolFactory class="org.mulgara.store.nodepool.memory.MemoryNodePoolFactory"/>
- <PersistentStringPoolFactory class="org.mulgara.store.stringpool.xa.XAStringPoolFactory" dir="xaStringPool"/>
- <TemporaryStringPoolFactory class="org.mulgara.store.stringpool.memory.MemoryStringPoolFactory"/>
- <PersistentResolverFactory class="org.mulgara.resolver.store.StatementStoreResolverFactory" dir="xaStatementStore"/>
- <TemporaryResolverFactory class="org.mulgara.resolver.memory.MemoryResolverFactory" dir="tempStatementStore"/>
+ <PersistentNodePoolFactory type="org.mulgara.store.nodepool.xa.XANodePoolFactory" dir="xaNodePool"/>
+ <TemporaryNodePoolFactory type="org.mulgara.store.nodepool.memory.MemoryNodePoolFactory"/>
+ <PersistentStringPoolFactory type="org.mulgara.store.stringpool.xa.XAStringPoolFactory" dir="xaStringPool"/>
+ <TemporaryStringPoolFactory type="org.mulgara.store.stringpool.memory.MemoryStringPoolFactory"/>
+ <PersistentResolverFactory type="org.mulgara.resolver.store.StatementStoreResolverFactory" dir="xaStatementStore"/>
+ <TemporaryResolverFactory type="org.mulgara.resolver.memory.MemoryResolverFactory" dir="tempStatementStore"/>
<!--
Implementations of a rule engine.
-->
- <RuleLoader class="org.mulgara.krule.KruleLoader"/>
+ <RuleLoader type="org.mulgara.krule.KruleLoader"/>
<!--
Implementations of the ContentHandler interface to use for resolving MIME
types.
-->
- <DefaultContentHandler class="org.mulgara.content.rdfxml.RDFXMLContentHandler"/>
+ <DefaultContentHandler type="org.mulgara.content.rdfxml.RDFXMLContentHandler"/>
<!--
- <DefaultContentHandler class="org.mulgara.content.rio.RDFXMLContentHandler"/>
+ <DefaultContentHandler type="org.mulgara.content.rio.RDFXMLContentHandler"/>
-->
- <ContentHandler class="org.mulgara.content.mp3.MP3ContentHandler"/>
- <ContentHandler class="org.mulgara.content.mbox.MBoxContentHandler"/>
- <ContentHandler class="org.mulgara.content.n3.N3ContentHandler"/>
+ <ContentHandler type="org.mulgara.content.mp3.MP3ContentHandler"/>
+ <ContentHandler type="org.mulgara.content.mbox.MBoxContentHandler"/>
+ <ContentHandler type="org.mulgara.content.n3.N3ContentHandler"/>
<!--
Additional resolvers
-->
- <ResolverFactory class="org.mulgara.resolver.file.FileResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.lucene.LuceneResolverFactory" dir="lucene"/>
- <ResolverFactory class="org.mulgara.resolver.xsd.XSDResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.http.HttpResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.nodetype.NodeTypeResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.jar.JarResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.view.ViewResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.filesystem.FileSystemResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.prefix.PrefixResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.relational.RelationalResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.distributed.DistributedResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.file.FileResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.lucene.LuceneResolverFactory" dir="lucene"/>
+ <ResolverFactory type="org.mulgara.resolver.xsd.XSDResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.http.HttpResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.nodetype.NodeTypeResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.jar.JarResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.view.ViewResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.filesystem.FileSystemResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.prefix.PrefixResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.relational.RelationalResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.distributed.DistributedResolverFactory"/>
<!-- iTQL script to run on startup -->
<StartupScript>foo.itql</StartupScript>
Modified: trunk/conf/mulgara-embedded.xsd
===================================================================
--- trunk/conf/mulgara-embedded.xsd 2008-04-11 19:40:04 UTC (rev 775)
+++ trunk/conf/mulgara-embedded.xsd 2008-04-12 02:08:08 UTC (rev 776)
@@ -42,69 +42,69 @@
<xs:element name="Smtp" type="xs:string"/>
<xs:element name="RelatedQueryHandler">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="SecurityAdapterFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="PersistentNodePoolFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="PersistentStringPoolFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="PersistentResolverFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="TemporaryNodePoolFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="TemporaryStringPoolFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="TemporaryResolverFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="RuleLoader">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="TransactionTimeout" type="xs:int"/>
<xs:element name="DefaultContentHandler">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="ContentHandler">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="ResolverFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
@@ -122,17 +122,17 @@
<xs:element ref="RelatedQueryHandler"/>
<xs:element ref="SecurityAdapterFactory" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="PersistentNodePoolFactory"/>
+ <xs:element ref="TemporaryNodePoolFactory"/>
<xs:element ref="PersistentStringPoolFactory"/>
+ <xs:element ref="TemporaryStringPoolFactory"/>
<xs:element ref="PersistentResolverFactory"/>
- <xs:element ref="TemporaryNodePoolFactory"/>
- <xs:element ref="TemporaryStringPoolFactory"/>
<xs:element ref="TemporaryResolverFactory"/>
- <xs:element ref="ResolverFactory" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="RuleLoader"/>
<xs:element ref="DefaultContentHandler" minOccurs="1"/>
<xs:element ref="ContentHandler" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="ResolverFactory" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="StartupScript" minOccurs="0"/>
<xs:element ref="Smtp"/>
- <xs:element ref="RuleLoader"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Deleted: trunk/lib/castor-0.9.3.9-xml.jar
===================================================================
(Binary files differ)
Added: trunk/lib/castor-1.2-codegen.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/castor-1.2-codegen.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/castor-1.2-xml-schema.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/castor-1.2-xml-schema.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/castor-1.2-xml.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/castor-1.2-xml.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/velocity-1.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/velocity-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/jar/config/build.xml
===================================================================
--- trunk/src/jar/config/build.xml 2008-04-11 19:40:04 UTC (rev 775)
+++ trunk/src/jar/config/build.xml 2008-04-12 02:08:08 UTC (rev 776)
@@ -28,7 +28,7 @@
<mkdir dir="${obj.dir}/jar/config/java"/>
- <java fork="true" jvm="${java.home}/bin/java" classname="org.exolab.castor.builder.SourceGenerator" failonerror="yes">
+ <java fork="true" jvm="${java.home}/bin/java" classname="org.exolab.castor.builder.SourceGeneratorMain" failonerror="yes">
<jvmarg value="${arch.bits}"/>
@@ -42,7 +42,7 @@
<arg value="${obj.dir}/jar/config/java"/>
<classpath>
- <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar"/>
+ <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar, commons-logging*.jar, velocity*.jar"/>
</classpath>
</java>
</target>
Modified: trunk/src/jar/demo-mp3/build.xml
===================================================================
--- trunk/src/jar/demo-mp3/build.xml 2008-04-11 19:40:04 UTC (rev 775)
+++ trunk/src/jar/demo-mp3/build.xml 2008-04-12 02:08:08 UTC (rev 776)
@@ -69,7 +69,8 @@
<fileset file="${demo-mp3.conf.dir}/${demo-mp3.conf.default}"/>
<fileset file="${demo-mp3.conf.dir}/${demo-mp3.schema.default}"/>
<zipfileset src="${lib.dir}/${jlayer.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${castor.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}/${xerces.jar}" excludes="META-INF/**"/>
</jar>
</target>
@@ -143,7 +144,7 @@
<delete dir="${demo-mp3.obj.src.dir}/java"/>
<mkdir dir="${demo-mp3.obj.src.dir}/java"/>
<java fork="true" jvm="${java.home}/bin/java"
- classname="org.exolab.castor.builder.SourceGenerator" failonerror="yes">
+ classname="org.exolab.castor.builder.SourceGeneratorMain" failonerror="yes">
<jvmarg value="${arch.bits}"/>
<sysproperty key="java.io.tmpdir" value="${tmp.dir}"/>
<arg value="-i"/>
@@ -154,7 +155,7 @@
<arg value="${demo-mp3.obj.src.dir}/java"/>
<classpath>
<fileset dir="${lib.dir}"
- includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar"/>
+ includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar, commons-logging*.jar, velocity*.jar"/>
</classpath>
</java>
</target>
Modified: trunk/src/jar/server-http/build.xml
===================================================================
--- trunk/src/jar/server-http/build.xml 2008-04-11 19:40:04 UTC (rev 775)
+++ trunk/src/jar/server-http/build.xml 2008-04-12 02:08:08 UTC (rev 776)
@@ -150,7 +150,7 @@
<manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_HTTP_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${itql.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar,lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/castor-0.9.3.9-xml.jar, lib/xercesImpl.jar, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}"/>
+ <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${itql.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar,lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/${castor-xml.jar}, lib/${castor-xml-schema.jar}, lib/xercesImpl.jar, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraHttpServer"/>
</manifest>
More information about the Mulgara-svn
mailing list