[Mulgara-svn] r1539 - in trunk: . lib src/jar/config src/jar/demo-mp3 src/jar/server-http
pag at mulgara.org
pag at mulgara.org
Tue Feb 24 22:25:12 UTC 2009
Author: pag
Date: 2009-02-24 14:25:11 -0800 (Tue, 24 Feb 2009)
New Revision: 1539
Added:
trunk/lib/xml-apis-2.9.1.jar
Removed:
trunk/lib/xmlParserAPIs.jar
Modified:
trunk/LEGAL.txt
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 the XML parser API jar, and gave it a name based on the jar file from the xerces distribution. Also updated the LEGAL reference to the file
Modified: trunk/LEGAL.txt
===================================================================
--- trunk/LEGAL.txt 2009-02-24 20:29:03 UTC (rev 1538)
+++ trunk/LEGAL.txt 2009-02-24 22:25:11 UTC (rev 1539)
@@ -292,8 +292,8 @@
http://oss.software.ibm.com/developerworks/opensource/CPLv1.0.htm
Xerces
- JARs: xercesImpl.jar
- xmlParserAPIs.jar
+ JARs: xercesImpl-2.9.1.jar
+ xml-apis-2.9.1.jar
URL: http://xml.apache.org/xerces-j/index.html
LICENSE: Apache Software License, v2.0
http://www.apache.org/licenses/LICENSE-2.0
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2009-02-24 20:29:03 UTC (rev 1538)
+++ trunk/build.properties 2009-02-24 22:25:11 UTC (rev 1539)
@@ -140,7 +140,7 @@
trove.jar =trove-1.0.2.jar
wsdl4j.jar =wsdl4j-1.5.1.jar
xerces.jar =xercesImpl-2.9.1.jar
-xmlParserAPIs.jar =xmlParserAPIs.jar
+xmlParserAPIs.jar =xml-apis-2.9.1.jar
xom.jar =xom-1.0d21.jar
beaver.jar =beaver-0.9.6.1.jar
mulgara-sparql.jar =mulgara-sparql-0.0.2.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-02-24 20:29:03 UTC (rev 1538)
+++ trunk/build.xml 2009-02-24 22:25:11 UTC (rev 1539)
@@ -481,7 +481,7 @@
<mkdir dir="${obj.dir}/xerces"/>
<unjar src="${lib.dir}/${xerces.jar}" dest="${obj.dir}/xerces"/>
- <unjar src="${lib.dir}/xmlParserAPIs.jar" dest="${obj.dir}/xerces"/>
+ <unjar src="${lib.dir}/${xmlParserAPIs.jar}" dest="${obj.dir}/xerces"/>
<!-- HACK!!!!! -->
<!-- build the executable jar file -->
@@ -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>
@@ -1618,7 +1618,7 @@
messes up the JAR plugin framework that both JAXP and StAX use -->
<mkdir dir="${obj.dir}/xerces"/>
<unjar src="${lib.dir}/${xerces.jar}" dest="${obj.dir}/xerces"/>
- <unjar src="${lib.dir}/xmlParserAPIs.jar" dest="${obj.dir}/xerces"/>
+ <unjar src="${lib.dir}/${xmlParserAPIs.jar}" dest="${obj.dir}/xerces"/>
<!-- HACK!!!!! -->
<!-- build the executable jar file -->
Modified: trunk/common.xml
===================================================================
--- trunk/common.xml 2009-02-24 20:29:03 UTC (rev 1538)
+++ trunk/common.xml 2009-02-24 22:25:11 UTC (rev 1539)
@@ -139,7 +139,7 @@
<pathelement path="${java.class.path}"/>
<fileset dir="${lib.dir}"
- includes="log4j-*.jar, xmlParserAPIs.jar, ${xerces.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>
Copied: trunk/lib/xml-apis-2.9.1.jar (from rev 1538, trunk/lib/xmlParserAPIs.jar)
===================================================================
(Binary files differ)
Property changes on: trunk/lib/xml-apis-2.9.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:mergeinfo
+
Deleted: trunk/lib/xmlParserAPIs.jar
===================================================================
(Binary files differ)
Modified: trunk/src/jar/config/build.xml
===================================================================
--- trunk/src/jar/config/build.xml 2009-02-24 20:29:03 UTC (rev 1538)
+++ trunk/src/jar/config/build.xml 2009-02-24 22:25:11 UTC (rev 1539)
@@ -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-24 20:29:03 UTC (rev 1538)
+++ trunk/src/jar/demo-mp3/build.xml 2009-02-24 22:25:11 UTC (rev 1539)
@@ -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-24 20:29:03 UTC (rev 1538)
+++ trunk/src/jar/server-http/build.xml 2009-02-24 22:25:11 UTC (rev 1539)
@@ -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/${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-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>
@@ -158,7 +158,7 @@
<mkdir dir="${obj.dir}/xerces"/>
<unjar src="${lib.dir}/${xerces.jar}" dest="${obj.dir}/xerces"/>
- <unjar src="${lib.dir}/xmlParserAPIs.jar" dest="${obj.dir}/xerces"/>
+ <unjar src="${lib.dir}/${xmlParserAPIs.jar}" dest="${obj.dir}/xerces"/>
<!-- HACK!!!!! -->
<!-- build the executable jar file -->
More information about the Mulgara-svn
mailing list