diff -ru j2sdkee1.3.1/bin/cleanup j2sdkee1.3.1-patched/bin/cleanup
--- j2sdkee1.3.1/bin/cleanup	2002-01-17 06:48:29.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/cleanup	2005-12-26 18:21:37.000000000 -0500
@@ -8,6 +8,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 PROPS=" -Dcom.sun.enterprise.home=$J2EE_HOME "
 CPATH=$J2EE_HOME/lib/classes:$CPATH
 
diff -ru j2sdkee1.3.1/bin/cloudscape j2sdkee1.3.1-patched/bin/cloudscape
--- j2sdkee1.3.1/bin/cloudscape	2002-01-17 06:48:29.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/cloudscape	2005-12-26 18:21:51.000000000 -0500
@@ -8,6 +8,9 @@
 # Environment variables needed to run...
 BINDIR=`dirname $0`
 . $BINDIR/userconfig.sh
+
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 if [ -n "$BINDIR" ]
 then
     J2EE_HOME=`cd $BINDIR/.. > /dev/null 2>&1 && pwd`
diff -ru j2sdkee1.3.1/bin/deploytool j2sdkee1.3.1-patched/bin/deploytool
--- j2sdkee1.3.1/bin/deploytool	2002-01-17 06:48:28.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/deploytool	2005-12-26 18:21:59.000000000 -0500
@@ -8,6 +8,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 SYSTEM_PROPERTIES="-Dcom.sun.enterprise.home=$J2EE_HOME"
 
 DH_LIB=$LIBDIR/../help/DeployTool
diff -ru j2sdkee1.3.1/bin/j2ee j2sdkee1.3.1-patched/bin/j2ee
--- j2sdkee1.3.1/bin/j2ee	2002-01-17 06:48:28.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/j2ee	2005-12-26 18:22:02.000000000 -0500
@@ -8,6 +8,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 SAX_PROPS=" -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter -Dorg.xml.sax.driver=org.apache.crimson.parser.XMLReaderImpl"
 PROPS=" $LISTEN_OPTIONS -Dcom.sun.enterprise.home=$J2EE_HOME  -Djms.home=$JMS_HOME -Dcom.sun.jms.service.jdbc.dbpath=$JMS_DB_PATH -Djms.properties=$J2EE_HOME/config/jms_service.properties -Djava.security.policy==$J2EE_HOME/lib/security/server.policy -Djava.security.auth.login.config=$J2EE_HOME/lib/security/serverlogin.config"
 
diff -ru j2sdkee1.3.1/bin/j2eeadmin j2sdkee1.3.1-patched/bin/j2eeadmin
--- j2sdkee1.3.1/bin/j2eeadmin	2002-01-17 06:48:29.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/j2eeadmin	2005-12-26 18:22:06.000000000 -0500
@@ -8,6 +8,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 OPTIONS="-Dcom.sun.enterprise.home=$J2EE_HOME"
 
 $JAVA_HOME/bin/java $OPTIONS -classpath "$CPATH" com.sun.enterprise.tools.admin.AdminTool "$@"
diff -ru j2sdkee1.3.1/bin/keytool j2sdkee1.3.1-patched/bin/keytool
--- j2sdkee1.3.1/bin/keytool	2002-01-17 06:48:29.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/keytool	2005-12-26 18:22:10.000000000 -0500
@@ -8,4 +8,6 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 $JAVACMD -classpath "$CPATH" com.sun.enterprise.security.KeyTool "$@"
diff -ru j2sdkee1.3.1/bin/packager j2sdkee1.3.1-patched/bin/packager
--- j2sdkee1.3.1/bin/packager	2002-01-17 06:48:28.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/packager	2005-12-26 18:22:18.000000000 -0500
@@ -8,6 +8,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 SYSTEM_PROPERTIES="-Dcom.sun.enterprise.home=$J2EE_HOME"
 
 $JAVACMD -classpath "$CPATH" $SYSTEM_PROPERTIES com.sun.enterprise.tools.packager.Main "$@"
diff -ru j2sdkee1.3.1/bin/realmtool j2sdkee1.3.1-patched/bin/realmtool
--- j2sdkee1.3.1/bin/realmtool	2002-01-17 06:48:28.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/realmtool	2005-12-26 18:22:22.000000000 -0500
@@ -8,6 +8,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 OPTIONS="-Dcom.sun.enterprise.home=$J2EE_HOME"
 
 $JAVACMD $OPTIONS -classpath "$CPATH" com.sun.enterprise.tools.admin.RealmTool "$@"
diff -ru j2sdkee1.3.1/bin/runclient j2sdkee1.3.1-patched/bin/runclient
--- j2sdkee1.3.1/bin/runclient	2002-01-17 06:48:29.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/runclient	2005-12-26 18:22:25.000000000 -0500
@@ -8,6 +8,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 ACTIVATION=" -Dcom.sun.enterprise.home=$J2EE_HOME -Djms.home=$JMS_HOME -Djms.properties=$J2EE_HOME/config/jms_client.properties -Djava.security.policy=$J2EE_HOME/lib/security/client.policy -Djava.security.auth.login.config=$J2EE_HOME/lib/security/clientlogin.config "
 
 $JAVACMD $ACTIVATION $VMARGS -classpath "$CPATH:$APPCPATH" com.sun.enterprise.appclient.Main "$@"
diff -ru j2sdkee1.3.1/bin/setenv.sh j2sdkee1.3.1-patched/bin/setenv.sh
--- j2sdkee1.3.1/bin/setenv.sh	2002-01-17 06:48:28.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/setenv.sh	2005-12-26 18:22:28.000000000 -0500
@@ -10,6 +10,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/userconfig.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 HOSTNAME=`uname -n`
 
 if [ -n "$BINDIR" ]
diff -ru j2sdkee1.3.1/bin/verifier j2sdkee1.3.1-patched/bin/verifier
--- j2sdkee1.3.1/bin/verifier	2002-01-17 06:48:28.000000000 -0500
+++ j2sdkee1.3.1-patched/bin/verifier	2005-12-26 18:22:34.000000000 -0500
@@ -8,6 +8,8 @@
 BINDIR=`dirname $0`
 . $BINDIR/setenv.sh
 
+source /etc/env.d/java/22sun-j2ee-1.3.1
+
 DH_LIB=$LIBDIR/../help/DeployTool
 
 JAVA_HELP=$LIBDIR/jh.jar