Move latest endorsed libraries down into the Xalan tool bundle.

InCommon · Aug 14, 2009 · 41192df · 41192df
1 parent 9e212d2
commit 41192df
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/build.xml b/build.xml
@@ -37,13 +37,9 @@
 		Location of externally supplied tool bundles.
 	-->
 	<property name="tools.dir" value="tools"/>
-	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
+	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
+	<property name="tools.xalan" value="${tools.dir}/xalan"/>
 
-	<!--
-		Endorsed libraries for everything except metadatatool.
-	-->
-	<property name="endorsed.dir" value="endorsed"/>
-
 	<!--
 		Additional ANT task definitions.
 	-->
@@ -548,7 +544,7 @@
 				<pathelement location="${lib.dir}/joda-time-1.6.jar"/>
 				<pathelement path="${bin.dir}"/>
 			</classpath>
-			<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}"/>
+			<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
 			<arg value="-IN"/>
 			<arg value="${entities.dir}/import.xml"/>
 			<arg value="-OUT"/>
@@ -588,7 +584,7 @@
 					<pathelement location="${lib.dir}/joda-time-1.6.jar"/>
 					<pathelement path="${bin.dir}"/>
 				</classpath>
-				<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}"/>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
 				<arg value="@{i}"/>
 				<arg value="${build.dir}/@{s}"/>
 			</java>

diff --git a/build/import.pl b/build/import.pl
@@ -11,4 +11,4 @@
 #		./check_entity 123
 #
 
-system("java -cp ../bin:../lib/joda-time-1.6.jar -Djava.endorsed.dirs=../endorsed org.apache.xalan.xslt.Process -IN ../entities/import.xml -OUT ../entities/imported.xml -XSL import.xsl");
+system("java -cp ../bin:../lib/joda-time-1.6.jar -Djava.endorsed.dirs=../tools/xalan/endorsed org.apache.xalan.xslt.Process -IN ../entities/import.xml -OUT ../entities/imported.xml -XSL import.xsl");
diff --git a/tools/xalan/endorsed/resolver-2.9.1.jar b/tools/xalan/endorsed/resolver-2.9.1.jar
diff --git a/tools/xalan/endorsed/serializer-2.9.1.jar b/tools/xalan/endorsed/serializer-2.9.1.jar
diff --git a/tools/xalan/endorsed/xalan-2.7.1.jar b/tools/xalan/endorsed/xalan-2.7.1.jar
diff --git a/tools/xalan/endorsed/xercesImpl-2.9.1.jar b/tools/xalan/endorsed/xercesImpl-2.9.1.jar
diff --git a/tools/xalan/endorsed/xml-apis-2.9.1.jar b/tools/xalan/endorsed/xml-apis-2.9.1.jar