Hi,

The attached patch will update the Gump descriptor to make the JSSE package optional, so the JSSE package is not required when using JDK 1.4.

The util build file is also updated to use the JDK 1.4 jsse if available (or any JSSE on the classpath). The existing JSSE should continue to be used on pre JDK 1.4 builds.

This is all in the jakarta-tomcat-connectors repository

Thanks
Conor

Index: gump.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/gump.xml,v
retrieving revision 1.9
diff -3 -u -w -p -r1.9 gump.xml
--- gump.xml    13 Nov 2002 00:12:49 -0000      1.9
+++ gump.xml    9 Jan 2003 13:35:39 -0000
@@ -21,7 +21,7 @@
     <depend project="xml-xerces"/>
     <depend project="jmx"/>
     <depend project="commons-logging"/>
-    <depend project="jsse"/>
+    <option project="jsse"/>
 
     <home nested="util/build"/>
     <jar name="lib/tomcat-util.jar"/>
@@ -74,9 +74,7 @@
   <project name="jakarta-tomcat-jk">
     <package>org.apache.jk</package>
 
-    <ant basedir="jk">
-      <property name="jsse.home" reference="home" project="jsse"/>
-    </ant>
+    <ant basedir="jk"/>
 
     <depend project="jakarta-ant"/>
     <depend project="commons-logging"/>
Index: util/build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/util/build.xml,v
retrieving revision 1.15
diff -3 -u -w -p -r1.15 build.xml
--- util/build.xml      6 Jan 2003 18:36:18 -0000       1.15
+++ util/build.xml      9 Jan 2003 13:35:43 -0000
@@ -33,6 +33,7 @@
 
     <target name="detect">
         <available property="jsse.present" file="${jsse.jar}"/>
+        <available property="jsse.present" classname="javax.net.ssl.SSLSocket"/>
         <available property="jmx.present" file="${jmx.jar}"/>
         <available property="puretls.present" file="${puretls.jar}"/>
         <available property="commons-logging.present" file="${commons-logging.jar}"/>
--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>


Reply via email to