[pkg-java] r2750 - in branches/tomcat5.5/feature/debian: build connectors/util connectors/util/java/org/apache/tomcat/util/net/jsse container/catalina

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-14 21:16:14 +0100 (Tue, 14 Nov 2006)
New Revision: 2750

Modified:
   branches/tomcat5.5/feature/debian/build/build.xml
   branches/tomcat5.5/feature/debian/connectors/util/build.xml
   branches/tomcat5.5/feature/debian/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
   branches/tomcat5.5/feature/debian/container/catalina/build.xml
Log:
Remove JDK 1.3 support for JSSE.


Modified: branches/tomcat5.5/feature/debian/build/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/build/build.xml	2006-11-14 20:15:31 UTC (rev 2749)
+++ branches/tomcat5.5/feature/debian/build/build.xml	2006-11-14 20:16:14 UTC (rev 2750)
@@ -652,21 +652,6 @@
 
     <!-- <antcall target="build-commons-modeler" /> -->
     <!-- <antcall target="build-commons-daemon"  /> -->
-
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-collections-src.loc}"/>
-      <param name="destfile" value="${tomcat-dbcp.jar}" />
-    </antcall>
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-pool-src.loc}"/>
-      <param name="destfile" value="${tomcat-dbcp.jar}" />
-    </antcall>
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
-      <param name="destfile" value="${tomcat-dbcp.jar}" />
-    </antcall>
-
-    <antcall target="build-tomcat-dbcp" />
   </target>
 
   <target name="build-tomcat-dbcp">

Modified: branches/tomcat5.5/feature/debian/connectors/util/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/connectors/util/build.xml	2006-11-14 20:15:31 UTC (rev 2749)
+++ branches/tomcat5.5/feature/debian/connectors/util/build.xml	2006-11-14 20:16:14 UTC (rev 2750)
@@ -74,6 +74,7 @@
 	       verbose="off"
 	       excludes="**/CVS/**">
             <classpath refid="compile.classpath"/>
+            <exclude name="**/util/net/jsse/JSSE13*" />
             <exclude name="**/util/net/jsse/*" unless="jsse.present"/>
             <exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
             <exclude name="**/util/net/puretls/*" unless="puretls.present"/>

Modified: branches/tomcat5.5/feature/debian/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
===================================================================
--- branches/tomcat5.5/feature/debian/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java	2006-11-14 20:15:31 UTC (rev 2749)
+++ branches/tomcat5.5/feature/debian/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java	2006-11-14 20:16:14 UTC (rev 2750)
@@ -36,8 +36,6 @@
 	"org.apache.tomcat.util.net.jsse.JSSE15Factory";
     static final String JSSE14Factory = 
         "org.apache.tomcat.util.net.jsse.JSSE14Factory";
-    static final String JSSE13Factory = 
-        "org.apache.tomcat.util.net.jsse.JSSE13Factory";
     static final String SSLSocketClass = "javax.net.ssl.SSLSocket";
 
     static org.apache.commons.logging.Log logger = 
@@ -67,7 +65,9 @@
                 }
             }
         } if(factory == null) {
-            factory = new JSSE13Factory();
+            if(logger.isDebugEnabled()) {
+                   logger.debug("Error getting JDK 14/15 factory - JDK 1.3 is not supported by Debian package !");
+            }
         }
     }
 

Modified: branches/tomcat5.5/feature/debian/container/catalina/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/container/catalina/build.xml	2006-11-14 20:15:31 UTC (rev 2749)
+++ branches/tomcat5.5/feature/debian/container/catalina/build.xml	2006-11-14 20:16:14 UTC (rev 2750)
@@ -548,8 +548,6 @@
 <!--
     <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
 -->
-    <copy todir="${catalina.build}/common/lib"
-           file="${tomcat-dbcp.jar}" />
 
     <!-- Configuration Files -->
     <copy todir="${catalina.build}/conf">