Move the joda-time library down into the Xalan tool bundle. Centralis…

…e and generalise classpath generation for access to Xalan, particularly for Perl scripts.
InCommon · Aug 18, 2009 · 68c97a0 · 68c97a0
1 parent 9b87fb6
commit 68c97a0
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 11 deletions.
diff --git a/.classpath b/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry kind="src" output="test-bin" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="lib" path="lib/joda-time-1.6.jar"/>
+	<classpathentry kind="lib" path="tools/xalan/lib/joda-time-1.6.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.xml b/build.xml
@@ -299,7 +299,9 @@
 		<sequential>
 			<java fork="true" maxmemory="384m" failonerror="true" classname="org.apache.xalan.xslt.Process">
 				<classpath>
-					<pathelement location="${lib.dir}/joda-time-1.6.jar"/>
+					<fileset dir="${tools.xalan}/lib">
+						<include name="**/*.jar"/>
+					</fileset>
 					<pathelement path="${bin.dir}"/>
 				</classpath>
 				<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
@@ -541,7 +543,9 @@
 		<echo>Importing metadata from ${entities.dir}/import.xml</echo>
 		<java fork="true" maxmemory="384m" failonerror="true" classname="org.apache.xalan.xslt.Process">
 			<classpath>
-				<pathelement location="${lib.dir}/joda-time-1.6.jar"/>
+				<fileset dir="${tools.xalan}/lib">
+					<include name="**/*.jar"/>
+				</fileset>
 				<pathelement path="${bin.dir}"/>
 			</classpath>
 			<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
@@ -581,7 +585,9 @@
 			<java classname="uk.org.ukfederation.apps.mdcheck.MetadataCheck"
 				fork="true" failonerror="true" maxmemory="384m">
 				<classpath>
-					<pathelement location="${lib.dir}/joda-time-1.6.jar"/>
+					<fileset dir="${tools.xalan}/lib">
+						<include name="**/*.jar"/>
+					</fileset>
 					<pathelement path="${bin.dir}"/>
 				</classpath>
 				<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>

diff --git a/build/Xalan.pm b/build/Xalan.pm
@@ -0,0 +1,38 @@
+#!/usr/bin/perl -w
+
+#
+# Simplified access to the Xalan XSLT processor.
+#
+
+#
+# xalanCall
+#
+# Provides the stem of a "system" call string to access Xalan with the
+# required extensions.
+#
+sub xalanCall
+{
+	my $xalanRoot = "../tools/xalan";
+
+	my $res = "java";
+
+	# Endorsed Xalan and Xerces
+	$res .= " -Djava.endorsed.dirs=$xalanRoot/endorsed";
+
+	# Classpath
+	my $classpath = '../bin';
+	while (glob "$xalanRoot/lib/*") {
+		$classpath .= ':' unless $classpath eq '';
+		$classpath .= $_;
+	}
+
+	$res .= " -cp $classpath";
+
+	# Class to invoke
+	$res .= " org.apache.xalan.xslt.Process";
+	$res;
+}
+
+#print ">>>" . xalanCall . "<<<\n";
+
+1;
diff --git a/build/addresses.pl b/build/addresses.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+use Xalan;
+
 #
 # Load list addresses.
 #
@@ -27,7 +29,7 @@
 #
 # UK addresses
 #
-open(XML,"java -Djava.endorsed.dirs=../tools/xalan/endorsed org.apache.xalan.xslt.Process -IN ../xml/ukfederation-metadata-master.xml -XSL extract_addresses.xsl|") || die "could not open input file";
+open(XML, xalanCall . " -IN ../xml/ukfederation-metadata-master.xml -XSL extract_addresses.xsl|") || die "could not open input file";
 while (<XML>) {
 	if (/<EmailAddress>(mailto:)?(.*)<\/EmailAddress>/) {
 		$metadata{$2} = 1;

diff --git a/build/check_entity.pl b/build/check_entity.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+use Xalan;
 use File::Temp qw(tempfile);
 use Date::Parse;
 use Digest::SHA1 qw(sha1 sha1_hex sha1_base64);
@@ -29,7 +30,7 @@
 		unlink($temp) if -e $temp;
 
 		# extract embedded certificates
-		open(EXTRACT, "java -Djava.endorsed.dirs=../tools/xalan/endorsed org.apache.xalan.xslt.Process -IN $fn -OUT $temp -XSL extract_embedded.xsl|")
+		open(EXTRACT, xalanCall . " -IN $fn -OUT $temp -XSL extract_embedded.xsl|")
 		 	|| die "could not open certificate extract process";
 		while (<EXTRACT>) {
 			print $_;

diff --git a/build/count_scopes.pl b/build/count_scopes.pl
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 
-open(XML,"java -Djava.endorsed.dirs=../tools/xalan/endorsed org.apache.xalan.xslt.Process -IN ../xml/ukfederation-metadata-unsigned.xml -XSL extract_scopes.xsl|") || die "could not open input file";
+use Xalan;
+
+open(XML, xalanCall . " -IN ../xml/ukfederation-metadata-unsigned.xml -XSL extract_scopes.xsl|") || die "could not open input file";
 while (<XML>) {
 	# print $_;
 	chop;

diff --git a/build/extract_locs.pl b/build/extract_locs.pl
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 
-open(XML,"java -Djava.endorsed.dirs=../tools/xalan/endorsed org.apache.xalan.xslt.Process -IN ../xml/ukfederation-metadata-unsigned.xml -XSL extract_locs.xsl|") || die "could not open input file";
+use Xalan;
+
+open(XML, xalanCall . " -IN ../xml/ukfederation-metadata-unsigned.xml -XSL extract_locs.xsl|") || die "could not open input file";
 while (<XML>) {
 	chop;
 	if (/^https:\/\/([^\/:]+(:\d+)?)(\/|$)/) {

diff --git a/build/import.pl b/build/import.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+use Xalan;
+
 #
 # Import an entity metadata fragment file.
 #
@@ -10,4 +12,4 @@
 # in entities/imported.xml.
 #
 
-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");
+system(xalanCall . " -IN ../entities/import.xml -OUT ../entities/imported.xml -XSL import.xsl");
diff --git a/build/probe_certs.pl b/build/probe_certs.pl
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 
-open(XML,"java -Djava.endorsed.dirs=../tools/xalan/endorsed org.apache.xalan.xslt.Process -IN ../xml/ukfederation-metadata.xml -XSL extract_cert_locs.xsl|") || die "could not open input file";
+use Xalan;
+
+open(XML, xalanCall . " -IN ../xml/ukfederation-metadata.xml -XSL extract_cert_locs.xsl|") || die "could not open input file";
 while (<XML>) {
 	if (/^http:/) {
 		print "skipping http location: $_";

diff --git a/build/probe_nocerts.pl b/build/probe_nocerts.pl
@@ -1,8 +1,10 @@
 #!/usr/bin/perl -w
 
+use Xalan;
+
 $known_bad{'census.data-archive.ac.uk:8080'} = 1; # it is really http, not https
 
-open(XML,"java -Djava.endorsed.dirs=../tools/xalan/endorsed org.apache.xalan.xslt.Process -IN ../xml/ukfederation-metadata.xml -XSL extract_nocert_locs.xsl|") || die "could not open input file";
+open(XML, xalanCall . " -IN ../xml/ukfederation-metadata.xml -XSL extract_nocert_locs.xsl|") || die "could not open input file";
 while (<XML>) {
 	chop;
 	if (/^http:/) {

diff --git a/tools/xalan/lib/joda-time-1.6.jar b/tools/xalan/lib/joda-time-1.6.jar