larryi 02/04/07 19:35:06 Modified: util build.xml Added: util build.properties.sample Log: Update to look for puretls.jar as the means of PureTLS detection. Include defining a puretls.jar property so it can be overridden with a build.properties file. For consistency, do the same for JSSE. Add a build.properties.sample. Revision Changes Path 1.5 +15 -6 jakarta-tomcat-connectors/util/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.xml 5 Apr 2002 17:45:08 -0000 1.4 +++ build.xml 8 Apr 2002 02:35:06 -0000 1.5 @@ -6,13 +6,21 @@ <property name="tomcat-util.build" value="${basedir}/build"/> + <property name="jsse.home" location="../../jsse1.0.2"/> + <property name="jsse.lib" location="${jsse.home}/lib"/> + <property name="jsse.jar" location="${jsse.lib}/jsse.jar"/> + <property name="jnet.jar" location="${jsse.lib}/jnet.jar"/> + <property name="jcert.jar" location="${jsse.lib}/jcert.jar"/> + + <property name="puretls.home" location="../../puretls-0.9b2"/> + <property name="puretls.lib" location="${puretls.home}/build"/> + <property name="puretls.jar" location="${puretls.lib}/puretls.jar"/> <target name="detect"> <available property="jsse.present" - file="${jsse.lib}/jsse.jar"/> - <!-- XXX make this file based, I don't like requiring it in the classpath --> + file="${jsse.jar}"/> <available property="puretls.present" - classname="COM.claymoresystems.ptls.SSLContext"/> + file="${puretls.jar}"/> </target> <target name="build-prepare" depends="detect"> @@ -32,9 +40,10 @@ optimize="off" verbose="off" excludes="**/CVS/**"> - <classpath location="${jsse.lib}/jsse.jar" /> - <classpath location="${jsse.lib}/jnet.jar" /> - <classpath location="${jsse.lib}/jcert.jar" /> + <classpath location="${jsse.jar}" /> + <classpath location="${jnet.jar}" /> + <classpath location="${jcert.jar}" /> + <classpath location="${puretls.jar}" /> <exclude name="**/util/net/JSSE*" unless="jsse.present"/> <exclude name="**/util/net/PureTLS*" unless="puretls.present"/> </javac> 1.1 jakarta-tomcat-connectors/util/build.properties.sample Index: build.properties.sample =================================================================== # ------------------------------------------------------------------- # build.properties.sample # # This is an example "build.properties" file, used to customize # building Jakarta Tomcat Connectors Util for your local environment. # Make any changes you need, and rename this file to # "build.properties" # # $Id: build.properties.sample,v 1.1 2002/04/08 02:35:06 larryi Exp $ # ------------------------------------------------------------------- # ------------------------------------------------------------------- # CONFIGURATION OPTIONS # ------------------------------------------------------------------- # # ------------------------------------------------------------------- # EXTERNAL DEPENDENCIES # ------------------------------------------------------------------- # ----- (optional) Java Secure Sockets Extension (JSSE), v1.0.2 or later ----- jsse.home=../../jsse1.0.2 jsse.lib=${jsse.home}/lib # ----- (optional) PureTLS Extension ----- puretls.home=../../puretls-0.9b2 puretls.lib=${puretls.home}/build puretls.jar=${puretls.lib}/puretls.jar
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>