--- crypto-145/build1-6	2008-11-22 04:30:03.000000000 +0100
+++ crypto-145/build1-6-gil	2010-02-25 19:11:35.000000000 +0100
@@ -6,10 +6,10 @@
 # otherwise it just creates the docs and class files.
 #
 
-JDKPATH=/opt/jdk1.6.0   # JDK 1.6 location
-JAVA_MAIL_HOME=/opt/javamail-1.3.1
-JAVA_ACTIVATION_HOME=/opt/jaf-1.0.2
-JUNIT_HOME=/opt/junit3.8.1
+JDKPATH=/opt/java/jdk   # JDK 1.6 location
+JAVA_MAIL_HOME=/usr/share/java/geronimo
+JAVA_ACTIVATION_HOME=/usr/share/java/geronimo
+JUNIT_HOME=/usr/share/java
 
 JAVA_HOME=$JDKPATH
 export JAVA_HOME
@@ -17,7 +17,7 @@
 PATH=$JDKPATH/bin:$PATH
 export PATH
 
-CLASSPATH=$JAVA_MAIL_HOME/mail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$JUNIT_HOME/junit.jar:$CLASSPATH
+CLASSPATH=$JAVA_MAIL_HOME/javamail-1.4-api.jar:$JAVA_ACTIVATION_HOME/activation-1.0.2-api.jar:$JUNIT_HOME/junit381.jar:$CLASSPATH
 export CLASSPATH
 
 if [ "$1" = "test" ]