Limit number of jars used for axis (scanning script with the expected list).

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 574bfc3..59c86cb 100644 (file)
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -18,11 +18,14 @@ JAVA:=${jdk_prefix}/bin/java
 
 GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl
 AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3
-axis_classpath:=$(shell ls -1 ${axis_prefix}/lib/*.jar ${axis_prefix}/share/java/*.jar 2>/dev/null | tr '\012' :)
+axis_classpath:=$(shell ${top_srcdir}/project/list-jars.sh ${axis_prefix}/lib ${axis_prefix}/share/java /usr/share/java /usr/lib/java)
 trustmanager_classpath:=$(shell ls -1 ${trustmanager_prefix}/share/java/glite-security-trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager-axis.jar ${stagedir}${prefix}/share/java/trustmanager.jar ${stagedir}${prefix}/share/java/trustmanager-axis.jar 2>/dev/null | tr '\012' :)
 
 all compile: compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar examples build-c
 
+wtf:
+       echo "axis_classpath: ${axis_classpath}"
+
 compile-java-axis: genws
        ${JAVAC} \
                -classpath ${jakarta-commons-lang_jar}:${stagedir}${prefix}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath} \
@@ -107,4 +110,4 @@ clean:
 distclean:
        rm -rvf Makefile.inc *.spec debian/
 
-.PHONY: all compile compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar build-c examples genevents genws check stage install clean distclean
+.PHONY: all compile compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar build-c examples genevents genws check stage install clean distclean wtf

diff --git a/org.glite.lb.client-java/project/list-jars.sh b/org.glite.lb.client-java/project/list-jars.sh
new file mode 100755 (executable)
index 0000000..f768eb7
--- /dev/null
+++ b/org.glite.lb.client-java/project/list-jars.sh
@@ -0,0 +1,22 @@
+#! /bin/sh
+#
+# generate a classpath with all axis dependencies
+#
+
+PREFIXES="${@:-'/usr/lib /usr/share/java'}"
+LIST="activation ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-apache-xalan2 ant-commons-logging ant-commons-net ant-javamail ant-jdepend ant-jmf ant-jsch ant-junit ant-nodeps ant-swing ant-trax axis axis-jaxrpc axis-saaj jaxrpc saaj commons-codec commons-discovery commons-lang commons-logging-adapters commons-logging-api commons-logging el-api gettext gnome-java-bridge gnumail gnumail-providers inetlib jobid-api-java jsp-api libintl servlet-api wsdl4j xercesImpl xml-apis"
+
+CP=""
+for prefix in $PREFIXES; do
+       #echo $prefix >&2
+       for pkgid in $LIST; do
+               #echo $pkgid >&2
+               for pkg in `ls -1 ${prefix}/${pkgid}*.jar 2>/dev/null`; do
+                       if ! test -h ${pkg}; then
+                               CP="$CP:${pkg}"
+                       fi
+               done
+       done
+done
+
+echo $CP | sed 's/^://'