[Mulgara-svn] r1532 - in trunk: . lib src/jar/config src/jar/demo-mp3 src/jar/server-http
pag at mulgara.org
pag at mulgara.org
Fri Feb 20 00:10:05 UTC 2009
Author: pag
Date: 2009-02-19 16:10:04 -0800 (Thu, 19 Feb 2009)
New Revision: 1532
Added:
trunk/lib/xercesImpl-2.9.1.jar
Removed:
trunk/lib/xercesImpl.jar
Modified:
trunk/.classpath
trunk/build.properties
trunk/build.xml
trunk/common.xml
trunk/src/jar/config/build.xml
trunk/src/jar/demo-mp3/build.xml
trunk/src/jar/server-http/build.xml
Log:
Updated references to xerces to use a variable instead of a raw file path. Also changed the Xerces library from 2.6.2 up to the latest, which is 2.9.1.
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2009-02-20 00:08:06 UTC (rev 1531)
+++ trunk/.classpath 2009-02-20 00:10:04 UTC (rev 1532)
@@ -120,7 +120,7 @@
<classpathentry kind="lib" path="lib/velocity-1.5.jar"/>
<classpathentry kind="lib" path="lib/wsdl4j-1.5.1.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.0.jar"/>
- <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="lib/xmlParserAPIs.jar"/>
<classpathentry kind="lib" path="dist/ideSupport.jar" sourcepath="obj/jar/config/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2009-02-20 00:08:06 UTC (rev 1531)
+++ trunk/build.properties 2009-02-20 00:10:04 UTC (rev 1532)
@@ -139,7 +139,7 @@
swoop.jar =swoop-modified-${tks-version}.jar
trove.jar =trove-1.0.2.jar
wsdl4j.jar =wsdl4j-1.5.1.jar
-xerces.jar =xercesImpl.jar
+xerces.jar =xercesImpl-2.9.1.jar
xmlParserAPIs.jar =xmlParserAPIs.jar
xom.jar =xom-1.0d21.jar
beaver.jar =beaver-0.9.6.1.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-02-20 00:08:06 UTC (rev 1531)
+++ trunk/build.xml 2009-02-20 00:10:04 UTC (rev 1532)
@@ -480,7 +480,7 @@
<!-- This will get the ARP parser working -->
<mkdir dir="${obj.dir}/xerces"/>
- <unjar src="${lib.dir}/xercesImpl.jar" dest="${obj.dir}/xerces"/>
+ <unjar src="${lib.dir}/${xerces.jar}" dest="${obj.dir}/xerces"/>
<unjar src="${lib.dir}/xmlParserAPIs.jar" dest="${obj.dir}/xerces"/>
<!-- HACK!!!!! -->
@@ -1016,7 +1016,7 @@
includes="activation*.jar, jargs-*.jar,
icu4j.jar, jena*.jar, antlr*.jar,
${commons-logging.jar}, log4j*.jar, lucene*.jar,
- xerces*.jar, xmlParserAPIs.jar,
+ ${xerces.jar}, xmlParserAPIs.jar,
${saaj.jar}, ${sesame-model.jar}"/>
</classpath>
</java>
@@ -1331,7 +1331,7 @@
<fileset dir="${bin.dir}" includes="${dtd.jar}, ${querylang.jar}, ${rules.jar}, ${query.jar},
${driver.jar}, ${rmi.jar}, ${server-rmi.jar}"/>
- <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, jxunit*.jar, junit.jar, junitpp.jar"/>
+ <fileset dir="${lib.dir}" includes="${xerces.jar}, xmlParserAPIs.jar, jxunit*.jar, junit.jar, junitpp.jar"/>
</classpath>
</java>
@@ -1617,7 +1617,7 @@
<!-- 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}/${xerces.jar}" dest="${obj.dir}/xerces"/>
<unjar src="${lib.dir}/xmlParserAPIs.jar" dest="${obj.dir}/xerces"/>
<!-- HACK!!!!! -->
Modified: trunk/common.xml
===================================================================
--- trunk/common.xml 2009-02-20 00:08:06 UTC (rev 1531)
+++ trunk/common.xml 2009-02-20 00:10:04 UTC (rev 1532)
@@ -139,7 +139,7 @@
<pathelement path="${java.class.path}"/>
<fileset dir="${lib.dir}"
- includes="log4j-*.jar, xmlParserAPIs.jar, xercesImpl.jar,
+ includes="log4j-*.jar, xmlParserAPIs.jar, ${xerces.jar},
${jena.jar}, ${iri.jar}, ${icu4j.jar}, jxunit*.jar, castor*.jar,
mail-*.jar, activation-*.jar, apache-soap-*.jar, jline*.jar,
axis-*.jar, saaj-*.jar, emory-*.jar, trove-*.jar,
@@ -268,7 +268,7 @@
<classpath>
<path refid="${classpath.id}"/>
<fileset dir="${bin.dir}" includes="${jar}, ${dtd.jar}"/>
- <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar"/>
+ <fileset dir="${lib.dir}" includes="${xerces.jar}, xmlParserAPIs.jar"/>
</classpath>
<formatter type="xml"/>
@@ -414,7 +414,7 @@
<fileset dir="${bin.dir}" includes="${dtd.jar}, ${querylang.jar}, ${query.jar},
${driver.jar}, ${rmi.jar}, ${server-rmi.jar}"/>
- <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, jxunit*.jar, junit.jar, junitpp.jar"/>
+ <fileset dir="${lib.dir}" includes="${xerces.jar}, xmlParserAPIs.jar, jxunit*.jar, junit.jar, junitpp.jar"/>
</classpath>
</java>
@@ -475,7 +475,7 @@
${query.jar},
${driver.jar}, ${rmi.base.jar},
${server-rmi.jar}"/>
- <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar,
+ <fileset dir="${lib.dir}" includes="${xerces.jar}, xmlParserAPIs.jar,
xmlc-xerces.jar, jxunit*.jar,
jakarta-regexp*.jar, junit.jar"/>
</classpath>
Added: trunk/lib/xercesImpl-2.9.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/xercesImpl-2.9.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/xercesImpl.jar
===================================================================
(Binary files differ)
Modified: trunk/src/jar/config/build.xml
===================================================================
--- trunk/src/jar/config/build.xml 2009-02-20 00:08:06 UTC (rev 1531)
+++ trunk/src/jar/config/build.xml 2009-02-20 00:10:04 UTC (rev 1532)
@@ -42,7 +42,7 @@
<arg value="${obj.dir}/jar/config/java"/>
<classpath>
- <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar, commons-logging*.jar, velocity*.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 2009-02-20 00:08:06 UTC (rev 1531)
+++ trunk/src/jar/demo-mp3/build.xml 2009-02-20 00:10:04 UTC (rev 1532)
@@ -155,7 +155,7 @@
<arg value="${demo-mp3.obj.src.dir}/java"/>
<classpath>
<fileset dir="${lib.dir}"
- includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar, commons-logging*.jar, velocity*.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 2009-02-20 00:08:06 UTC (rev 1531)
+++ trunk/src/jar/server-http/build.xml 2009-02-20 00:10:04 UTC (rev 1532)
@@ -149,7 +149,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/${querylang.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/${jena.jar}, lib/${iri.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}, lib/${sesame-model.jar}"/>
+ <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${querylang.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/${jena.jar}, lib/${iri.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/${xerces.jar}, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}, lib/${sesame-model.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraHttpServer"/>
</manifest>
@@ -157,7 +157,7 @@
<!-- This will get the ARP parser working -->
<mkdir dir="${obj.dir}/xerces"/>
- <unjar src="${lib.dir}/xercesImpl.jar" dest="${obj.dir}/xerces"/>
+ <unjar src="${lib.dir}/${xerces.jar}" dest="${obj.dir}/xerces"/>
<unjar src="${lib.dir}/xmlParserAPIs.jar" dest="${obj.dir}/xerces"/>
<!-- HACK!!!!! -->
@@ -174,7 +174,7 @@
includes="log4j*.jar, icu4j.jar, ${jena.jar}, ${iri.jar}, antlr*.jar, ${commons-logging.jar},
activation*.jar, jargs*.jar,
${jetty.jar}, ${jetty.plus.jar}, ${servlet.jar}, ${jasper.runtime.jar},
- xerces*.jar, mail-*.jar, castor*.jar, trove-*.jar, ${jrdf.jar}, ${emory-util.jar}, ${sesame-model.jar}"/>
+ ${xerces.jar}, mail-*.jar, castor*.jar, trove-*.jar, ${jrdf.jar}, ${emory-util.jar}, ${sesame-model.jar}"/>
<zipfileset dir="${bin.dir}" prefix="lib" includes="${query.jar},
${driver.jar}, ${querylang.jar}, ${server.jar},
${util.jar}, ${config.jar}"/>
More information about the Mulgara-svn
mailing list