ceki        2004/05/21 02:24:51

  Modified:    .        build.properties.sample build.xml
  Log:
  Trying to build on JDK 1.3 and 1.2
  
  Revision  Changes    Path
  1.16      +22 -1     logging-log4j/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/logging-log4j/build.properties.sample,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.properties.sample   30 Mar 2004 10:45:21 -0000      1.15
  +++ build.properties.sample   21 May 2004 09:24:51 -0000      1.16
  @@ -41,4 +41,25 @@
   # ===================================================================
   # describes the relative or full path to the Jakarta ORO Reg Exp jar file
   # This is required if you wish to use Chainsaw v2
  -#regexp.oro.jar=../oro/jakarta-oro-2.0.6.jar
  \ No newline at end of file
  +#regexp.oro.jar=../oro/jakarta-oro-2.0.6.jar
  +
  +
  +# ==================================================================
  +# Packages which have been incorporated in JDK 1.4 but optional in
  +# JDK 1.3 and 1.2.
  +# ==================================================================
  +
  +
  +# JDBC Standdard Extension Binary 2.0 (building with JDK 1.2 and 1.3)
  +# ###################################
  +
  +# The org.apache.log4j.db package makes use of the
  +# javax.sql.DataSource interface which is included in the JDBC
  +# standard extension. It ships with JDK 1.4 but not 1.3 or 1.2
  +#
  +# Download it from
  +#
  +#  http://java.sun.com/products/jdbc/download.html#spec
  +#
  +jdbc-stdext.jar=/java/lib/jdbc2_0-stdext.jar
  +
  
  
  
  1.100     +28 -2     logging-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/build.xml,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- build.xml 17 May 2004 22:26:09 -0000      1.99
  +++ build.xml 21 May 2004 09:24:51 -0000      1.100
  @@ -86,6 +86,7 @@
       <pathelement location="${jmx-extra.jar}"/>
       <pathelement location="${avalon-framework.jar}"/>
       <pathelement location="${servlet-api.jar}"/>
  +    <pathelement location="${jdbc-stdext.jar}"/>
     </path>
   
     <!-- Construct classpath for building the html pages-->
  @@ -177,6 +178,18 @@
     <target name="servletAPI" depends="servletAPICheck" if="servletAPI-present">
       <echo message="Servlet API is present."/>
     </target>
  +
  +  <target name="jdbcExtensionCheck">
  +    <available classname="javax.sql.DataSource" property="jdbcExtension-present">
  +     <classpath refid="compile.classpath"/>
  +    </available>
  +  </target>
  +  <target name="jdbcExtension" depends="jdbcExtensionCheck" 
if="jdbcExtension-present">
  +    <echo message="JDBC Standard Extension is present."/>
  +  </target>
  +
  +
  +
     <!-- ================================================================= -->
     <!-- Initialize variables                                              -->
     <!-- NOTE: all directories are relative to jakarta-log4j/              -->
  @@ -186,8 +199,10 @@
     </target>
   
     <target name="build" description="Compile all log4j components."
  -         depends="init, build.core, build.lf5, build.chainsaw, build.examples, 
build.xml,
  -         build.javamail, build.jms, build.jmx, build.avalonFramework, 
build.servletAPI"/>
  +          depends="init, build.core, build.lf5, build.examples, 
  +                   build.xml, build.javamail, build.jms, build.jmx, 
  +                   build.avalonFramework, build.servletAPI, build.db, 
  +                   build.chainsaw"/>
   
     <target name="build.core" depends="init">
       <mkdir dir="${javac.dest}" />
  @@ -197,6 +212,7 @@
        excludes="misc/*, **/UnitTest*.java,
                       **/StressCategory.java,
                       **/doc-files/*,
  +                    ${stem}/db/**,
                       ${stem}/lf5/**,
                       ${stem}/chainsaw/**,
                       ${stem}/xml/**,
  @@ -313,6 +329,16 @@
        destdir="${javac.dest}"
        deprecation="${deprecation}"
        includes="${stem}/selector/servlet/*.java">
  +      <classpath refid="compile.classpath"/>
  +    </javac>
  +  </target>
  +
  +   <target name="build.db" depends="init, jdbcExtension"
  +                if="jdbcExtension-present">
  +    <javac srcdir="${java.source.dir}"
  +     destdir="${javac.dest}"
  +     deprecation="${deprecation}"
  +     includes="${stem}/db/**.java">
         <classpath refid="compile.classpath"/>
       </javac>
     </target>
  
  
  

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

Reply via email to