You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2001/09/21 13:03:41 UTC

cvs commit: jakarta-tomcat build.xml

jfclere     01/09/21 04:03:41

  Modified:    .        build.xml
  Log:
  Add exclude for tomcat.jar target. (Otherwise does compile with JDK1.1.8).
  
  Revision  Changes    Path
  1.155     +16 -6     jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- build.xml	2001/09/21 08:29:56	1.154
  +++ build.xml	2001/09/21 11:03:41	1.155
  @@ -254,12 +254,18 @@
           <pathelement location="${jsse.lib}/jcert.jar"/>
         </classpath>
         <include name="org/apache/tomcat/util/**"/>
  -      <exclude name="**/util/net/SSLSocketFactory.java" unless="jsse.present"/>
  -      <exclude name="**/util/net/SSLSocketFactory.java" unless="jdk12.present"/>
  -      <exclude name="**/util/compat/JSSECertCompat.java" unless="jsse.present"/>
  -      <exclude name="**/util/compat/JSSECertCompat.java" unless="jdk12.present"/>
  -      <exclude name="**/util/compat/Jdk12Support.java" unless="jdk12.present"/>
  -      <exclude name="**/util/depend/DependClassLoader12.java" unless="jdk12.present"/>
  +      <exclude name="**/util/net/SSLSocketFactory.java"
  +               unless="jsse.present"/>
  +      <exclude name="**/util/net/SSLSocketFactory.java"
  +               unless="jdk12.present"/>
  +      <exclude name="**/util/compat/JSSECertCompat.java"
  +               unless="jsse.present"/>
  +      <exclude name="**/util/compat/JSSECertCompat.java"
  +               unless="jdk12.present"/>
  +      <exclude name="**/util/compat/Jdk12Support.java"
  +               unless="jdk12.present"/>
  +      <exclude name="**/util/depend/DependClassLoader12.java"
  +               unless="jdk12.present"/>
       </javac>
   
       <copy todir="${tomcat.build}/classes">
  @@ -305,6 +311,10 @@
   	       unless="jdk12.present"/>
         <exclude name="**/util/compat/Jdk12Support.java" 
   	       unless="jdk12.present"/>
  +      <exclude name="**/util/compat/JSSECertCompat.java"
  +               unless="jsse.present"/>
  +      <exclude name="**/util/compat/JSSECertCompat.java"
  +               unless="jdk12.present"/>
         <include name="org/apache/tomcat/util/IntrospectionUtils.java"/>
       </javac>
       <jar jarfile="${tomcat.build}/lib/tomcat.jar"