tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/util build.xml build.properties.sample
Date Fri, 09 Aug 2002 20:49:44 GMT
costin      2002/08/09 13:49:44

  Modified:    util     build.xml build.properties.sample
  Log:
  Few minor fixes ( I hope :-)
  
  Revision  Changes    Path
  1.10      +12 -15    jakarta-tomcat-connectors/util/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	5 Jun 2002 21:12:50 -0000	1.9
  +++ build.xml	9 Aug 2002 20:49:44 -0000	1.10
  @@ -1,33 +1,30 @@
   <project name="tomcat-util" default="build-main" basedir=".">
   
       <!-- ===================== Initialize Property Values =================== -->
  -    <property file="build.properties"/>
       <property file="${user.home}/build.properties"/>
  +    <property file="build.properties"/>
  +    <property file="build.properties.sample"/>
   
       <property name="tomcat-util.build" value="${basedir}/build"/>
   
  -    <property name="jsse.home" location="../../jsse1.0.2"/>
  +    <property name="jsse.home" location="${base.path}/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.home" location="${base.path}/puretls"/>
  +    <property name="puretls.lib" location="${puretls.home}"/>
       <property name="puretls.jar" location="${puretls.lib}/puretls.jar"/>
       
  -    <property name="commons-logging.jar" value="../lib/commons-logging.jar" />
  -    <property name="jmx.jar" value="../lib/mx4j.jar" />
  +    <property name="commons-logging.jar" location="../lib/commons-logging.jar" />
  +    <property name="jmx.jar" location="../lib/mx4j.jar" />
       
       <target name="detect">
  -        <available property="jsse.present"
  -                   file="${jsse.jar}"/>
  -        <available property="jmx.present"
  -                   file="${jmx.jar}"/>
  -        <available property="puretls.present"
  - 	           file="${puretls.jar}"/>
  -        <available property="commons-logging.present"
  - 	           file="${commons-logging.jar}"/>
  +        <available property="jsse.present" file="${jsse.jar}"/>
  +        <available property="jmx.present" file="${jmx.jar}"/>
  +        <available property="puretls.present" file="${puretls.jar}"/>
  +        <available property="commons-logging.present" file="${commons-logging.jar}"/>
       </target>
   
       <target name="build-prepare" depends="detect">
  @@ -41,7 +38,7 @@
           <echo message="-- puretls.present = ${puretls.present}" />
           <echo message="-- jsse.present = ${jsse.present}"/>
           <echo message="-- commons-logging = ${commons-logging.present}"/>
  -        <echo message="-- jmx = ${jmx.present}"/>
  +        <echo message="-- jmx = ${jmx.present} ${jmx.jar}"/>
           <javac srcdir="java"
   	       destdir="${tomcat-util.build}/classes"
   	       deprecation="on"
  
  
  
  1.2       +4 -4      jakarta-tomcat-connectors/util/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.properties.sample	8 Apr 2002 02:35:06 -0000	1.1
  +++ build.properties.sample	9 Aug 2002 20:49:44 -0000	1.2
  @@ -22,11 +22,11 @@
   # -------------------------------------------------------------------
   
   # ----- (optional) Java Secure Sockets Extension (JSSE), v1.0.2 or later -----
  -jsse.home=../../jsse1.0.2
  +jsse.home=${base.path}/jsse1.0.2
   jsse.lib=${jsse.home}/lib
   
   
   # ----- (optional) PureTLS Extension -----
  -puretls.home=../../puretls-0.9b2
  +puretls.home=${base.path}/puretls-0.9b2
   puretls.lib=${puretls.home}/build
  -puretls.jar=${puretls.lib}/puretls.jar
  \ No newline at end of file
  +puretls.jar=${puretls.lib}/puretls.jar
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message