[PATCH] Use JDK1.4 JSSE if available in jakarta-tomcat-util

[Conor MacNeill]

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.xml13 Nov 2002 00:12:49 -  1.9
+++ gump.xml9 Jan 2003 13:35:39 -
@@ -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
 packageorg.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 -   1.15
+++ util/build.xml  9 Jan 2003 13:35:43 -
@@ -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]

Re: [GUMP] Build Failure - Tomcat 3.x

[Conor MacNeill]

Costin,

 Is there any reasonable explanation for changing the ant structure ( i.e.
 removing ant/bin ) ? Besides breaking backward compatibility and forcing
 people to change their scripts ?


We like you to change your scripts on a regular basis to stop them getting
stale :-)

Seriously Ant's build process was reorganized recently to build ant within
the ant directory rather than above it. At that time, the bootstrapped Ant
was moved into its own directory (bootstrap) so that generated jars
(ant.jar) were not placed into a CVS directory (lib) where they may be
inadvertently added to CVS. It made sense to move bin at the same time. If
you have previously been using the ant/bin and ant/lib directories, you
have actually been using the bootstrapped ant rather than the fully built
ant. That is generally not a problem, of course, but perhaps not desirable.
Also I think it is probably best for other projects not to rely on the
internal organizaton of the Ant CVS tree but on the distribution built in
the dist directory.

Is that a "reasonable explanation" - you'll have to be the judge.

Conor



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]