logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: logging-log4j slf4j.xml build.xml
Date Thu, 28 Apr 2005 20:36:23 GMT
ceki        2005/04/28 13:36:23

  Modified:    .        Tag: v1_2-branch build.xml
  Added:       .        Tag: v1_2-branch slf4j.xml
  Log:
  
  
  On the v1_2-branch, more changes to support SLF4J
  
  PR:
  Obtained from:
  Submitted by:	
  Reviewed by:	
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.34.2.14 +31 -7     logging-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/build.xml,v
  retrieving revision 1.34.2.13
  retrieving revision 1.34.2.14
  diff -u -r1.34.2.13 -r1.34.2.14
  --- build.xml	3 Nov 2004 18:39:08 -0000	1.34.2.13
  +++ build.xml	28 Apr 2005 20:36:23 -0000	1.34.2.14
  @@ -4,7 +4,7 @@
   
   
   <!-- ================================================================= -->
  -<!-- NOTE: all directories are relative to jakarta-log4j/              -->
  +<!-- NOTE: all directories are relative to logging-log4j/              -->
   <!-- the parent of build/                                              -->
   <!-- ================================================================= -->
   <project name="log4j" default="usage" basedir="." >
  @@ -17,7 +17,7 @@
     <!-- prefixed with "env". -->
     <property environment="env"/>
   
  -  <property name="version" value="1.2.9"/>
  +  <property name="version" value="1.2.10"/>
   
     <!-- The base directory relative to which most targets are built -->
     <property name="base" value="."/>
  @@ -161,6 +161,19 @@
       <echo message="JAVAMAIL is present."/>
     </target>
   
  +  <target name="slf4jCheck">
  +    <available file="${java.source.dir}/org/slf4j/ULogger.java"
  +               property="slf4j-present"/>
  +    
  +    <fail unless="slf4j-present">
  +       Missing src/java/org/slf4j/*.java source files.
  +  	  		
  +       Just run the refresh-slf4j target with the command:
  +
  +       ant refresh-slf4j		
  +    </fail>
  +  </target>
  +
     <!-- ================================================================= -->
     <!-- Initialize variables                                              -->
     <!-- NOTE: all directories are relative to jakarta-log4j/              -->
  @@ -169,14 +182,23 @@
       <tstamp />
     </target>
   
  +
  +  <target name="refresh-slf4j">
  +    <echo>Fecthing required source files from SLF4J.ORG</echo> 
  +    <!-- copy required SLF4J files into log4j -->
  +    <ant antfile="slf4j.xml" target="refresh-slf4j"/>
  +  </target>
  +
     <target name="build" depends="init, build.core, build.examples, build.xml,
                                   build.javamail, build.jms, build.jmx"/>
   
  -  <target name="build.core" depends="init">
  +  <target name="build.core" depends="init, slf4jCheck">
       <mkdir dir="${javac.dest}" />
       <javac srcdir="${java.source.dir}"
   	   destdir="${javac.dest}"
  -	   includes="${stem}/**/*.java, ${stem}/xml/XMLLayout.java,"
  +	   includes="org/slf4j/**/*.java,
  +                     ${stem}/**/*.java, 
  +                     ${stem}/xml/XMLLayout.java"
   	   excludes="misc/*, **/UnitTest*.java,
                       **/StressCategory.java,
                       **/doc-files/*,
  @@ -325,7 +347,9 @@
       </delete>
   
       <jar jarfile="${jar.dest}/${jar.filename}" basedir="${javac.dest}"
  -      includes="${stem}/*.class, ${stem}/xml/log4j.dtd,
  +      includes="org/slf4j/**/*.class,
  +                ${stem}/*.class, 
  +                ${stem}/xml/log4j.dtd,
                   ${stem}/config/*.class,
   	        ${stem}/helpers/*.class,
   		${stem}/spi/*.class,
  @@ -383,9 +407,9 @@
   	   doctitle="log4j version ${version}&lt;br&gt;API Specification"
   	   windowtitle="Log4j Version ${version}"
              header="&lt;b&gt;Log4j ${version}&lt;/b&gt;"
  -	   bottom="Copyright 2000-2002 Apache Software Foundation.">
  +	   bottom="Copyright 2000-2005 Apache Software Foundation.">
   
  -      <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
  +      <link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
         <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
         <classpath refid="compile.classpath"/>
       </javadoc>
  
  
  
  No                   revision
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/build.xml,v
  retrieving revision 1.34.2.13
  retrieving revision 1.34.2.14
  diff -u -r1.34.2.13 -r1.34.2.14
  --- build.xml	3 Nov 2004 18:39:08 -0000	1.34.2.13
  +++ build.xml	28 Apr 2005 20:36:23 -0000	1.34.2.14
  @@ -4,7 +4,7 @@
   
   
   <!-- ================================================================= -->
  -<!-- NOTE: all directories are relative to jakarta-log4j/              -->
  +<!-- NOTE: all directories are relative to logging-log4j/              -->
   <!-- the parent of build/                                              -->
   <!-- ================================================================= -->
   <project name="log4j" default="usage" basedir="." >
  @@ -17,7 +17,7 @@
     <!-- prefixed with "env". -->
     <property environment="env"/>
   
  -  <property name="version" value="1.2.9"/>
  +  <property name="version" value="1.2.10"/>
   
     <!-- The base directory relative to which most targets are built -->
     <property name="base" value="."/>
  @@ -161,6 +161,19 @@
       <echo message="JAVAMAIL is present."/>
     </target>
   
  +  <target name="slf4jCheck">
  +    <available file="${java.source.dir}/org/slf4j/ULogger.java"
  +               property="slf4j-present"/>
  +    
  +    <fail unless="slf4j-present">
  +       Missing src/java/org/slf4j/*.java source files.
  +  	  		
  +       Just run the refresh-slf4j target with the command:
  +
  +       ant refresh-slf4j		
  +    </fail>
  +  </target>
  +
     <!-- ================================================================= -->
     <!-- Initialize variables                                              -->
     <!-- NOTE: all directories are relative to jakarta-log4j/              -->
  @@ -169,14 +182,23 @@
       <tstamp />
     </target>
   
  +
  +  <target name="refresh-slf4j">
  +    <echo>Fecthing required source files from SLF4J.ORG</echo> 
  +    <!-- copy required SLF4J files into log4j -->
  +    <ant antfile="slf4j.xml" target="refresh-slf4j"/>
  +  </target>
  +
     <target name="build" depends="init, build.core, build.examples, build.xml,
                                   build.javamail, build.jms, build.jmx"/>
   
  -  <target name="build.core" depends="init">
  +  <target name="build.core" depends="init, slf4jCheck">
       <mkdir dir="${javac.dest}" />
       <javac srcdir="${java.source.dir}"
   	   destdir="${javac.dest}"
  -	   includes="${stem}/**/*.java, ${stem}/xml/XMLLayout.java,"
  +	   includes="org/slf4j/**/*.java,
  +                     ${stem}/**/*.java, 
  +                     ${stem}/xml/XMLLayout.java"
   	   excludes="misc/*, **/UnitTest*.java,
                       **/StressCategory.java,
                       **/doc-files/*,
  @@ -325,7 +347,9 @@
       </delete>
   
       <jar jarfile="${jar.dest}/${jar.filename}" basedir="${javac.dest}"
  -      includes="${stem}/*.class, ${stem}/xml/log4j.dtd,
  +      includes="org/slf4j/**/*.class,
  +                ${stem}/*.class, 
  +                ${stem}/xml/log4j.dtd,
                   ${stem}/config/*.class,
   	        ${stem}/helpers/*.class,
   		${stem}/spi/*.class,
  @@ -383,9 +407,9 @@
   	   doctitle="log4j version ${version}&lt;br&gt;API Specification"
   	   windowtitle="Log4j Version ${version}"
              header="&lt;b&gt;Log4j ${version}&lt;/b&gt;"
  -	   bottom="Copyright 2000-2002 Apache Software Foundation.">
  +	   bottom="Copyright 2000-2005 Apache Software Foundation.">
   
  -      <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
  +      <link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
         <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
         <classpath refid="compile.classpath"/>
       </javadoc>
  
  
  
  No                   revision
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/build.xml,v
  retrieving revision 1.34.2.13
  retrieving revision 1.34.2.14
  diff -u -r1.34.2.13 -r1.34.2.14
  --- build.xml	3 Nov 2004 18:39:08 -0000	1.34.2.13
  +++ build.xml	28 Apr 2005 20:36:23 -0000	1.34.2.14
  @@ -4,7 +4,7 @@
   
   
   <!-- ================================================================= -->
  -<!-- NOTE: all directories are relative to jakarta-log4j/              -->
  +<!-- NOTE: all directories are relative to logging-log4j/              -->
   <!-- the parent of build/                                              -->
   <!-- ================================================================= -->
   <project name="log4j" default="usage" basedir="." >
  @@ -17,7 +17,7 @@
     <!-- prefixed with "env". -->
     <property environment="env"/>
   
  -  <property name="version" value="1.2.9"/>
  +  <property name="version" value="1.2.10"/>
   
     <!-- The base directory relative to which most targets are built -->
     <property name="base" value="."/>
  @@ -161,6 +161,19 @@
       <echo message="JAVAMAIL is present."/>
     </target>
   
  +  <target name="slf4jCheck">
  +    <available file="${java.source.dir}/org/slf4j/ULogger.java"
  +               property="slf4j-present"/>
  +    
  +    <fail unless="slf4j-present">
  +       Missing src/java/org/slf4j/*.java source files.
  +  	  		
  +       Just run the refresh-slf4j target with the command:
  +
  +       ant refresh-slf4j		
  +    </fail>
  +  </target>
  +
     <!-- ================================================================= -->
     <!-- Initialize variables                                              -->
     <!-- NOTE: all directories are relative to jakarta-log4j/              -->
  @@ -169,14 +182,23 @@
       <tstamp />
     </target>
   
  +
  +  <target name="refresh-slf4j">
  +    <echo>Fecthing required source files from SLF4J.ORG</echo> 
  +    <!-- copy required SLF4J files into log4j -->
  +    <ant antfile="slf4j.xml" target="refresh-slf4j"/>
  +  </target>
  +
     <target name="build" depends="init, build.core, build.examples, build.xml,
                                   build.javamail, build.jms, build.jmx"/>
   
  -  <target name="build.core" depends="init">
  +  <target name="build.core" depends="init, slf4jCheck">
       <mkdir dir="${javac.dest}" />
       <javac srcdir="${java.source.dir}"
   	   destdir="${javac.dest}"
  -	   includes="${stem}/**/*.java, ${stem}/xml/XMLLayout.java,"
  +	   includes="org/slf4j/**/*.java,
  +                     ${stem}/**/*.java, 
  +                     ${stem}/xml/XMLLayout.java"
   	   excludes="misc/*, **/UnitTest*.java,
                       **/StressCategory.java,
                       **/doc-files/*,
  @@ -325,7 +347,9 @@
       </delete>
   
       <jar jarfile="${jar.dest}/${jar.filename}" basedir="${javac.dest}"
  -      includes="${stem}/*.class, ${stem}/xml/log4j.dtd,
  +      includes="org/slf4j/**/*.class,
  +                ${stem}/*.class, 
  +                ${stem}/xml/log4j.dtd,
                   ${stem}/config/*.class,
   	        ${stem}/helpers/*.class,
   		${stem}/spi/*.class,
  @@ -383,9 +407,9 @@
   	   doctitle="log4j version ${version}&lt;br&gt;API Specification"
   	   windowtitle="Log4j Version ${version}"
              header="&lt;b&gt;Log4j ${version}&lt;/b&gt;"
  -	   bottom="Copyright 2000-2002 Apache Software Foundation.">
  +	   bottom="Copyright 2000-2005 Apache Software Foundation.">
   
  -      <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
  +      <link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
         <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
         <classpath refid="compile.classpath"/>
       </javadoc>
  
  
  
  1.2.2.1   +82 -82    logging-log4j/slf4j.xml
  
  Index: slf4j.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/slf4j.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- slf4j.xml	28 Apr 2005 16:43:35 -0000	1.2
  +++ slf4j.xml	28 Apr 2005 20:36:23 -0000	1.2.2.1
  @@ -1,82 +1,82 @@
  -<project name="slf4j" default="usage" basedir="." >
  -
  -  <!-- The directory where source files are stored. -->
  -  <property name="java.source.dir" value="./src/java/"/>
  -
  -  <!-- Destination for compiled files -->
  -  <property name="javac.dest" value="./classes"/>
  -	
  -  <!-- The directory where source files are stored. -->
  -  <property name="version" value="1.0alpha"/>
  -
  -  <!-- Deprecation warning? --> 
  -  <property name="deprecation" value="on"/>
  -
  -	
  -  <property name="SLF4J_STEM" value="org/slf4j"/>
  -  
  -
  -  <!-- ================================================================= -->
  -  <!-- Default target                                                    -->
  -  <!-- ================================================================= -->
  -  <target name="usage">
  -    <echo>      
  -      These are some of the targets supported by this ANT build scpript:
  -      
  -      svnCheckout - get SLF4J files into src/filtered-java
  -
  -      refresh-slf4j - copy source files into the log4j source tree, using
  -    	              variable substitution
  -    </echo>
  -  </target>
  -
  -  <target name="init">
  -    <mkdir dir="tmp"/>
  -	<mkdir dir="${java.source.dir}/${SLF4J_STEM}"/>
  -  </target>
  -	
  -  <!-- ================================================================= -->
  -  <!-- Remove all generated (compiled) class files.                      -->
  -  <!-- ================================================================= -->
  -  <target name="clean" description="Delete all compiled SLF4J files.">
  -    <delete dir="${javac.dest}/org/slf4j" />
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Copy SLF4J files into log4j source tree. This step is necessary for -->
  -  <!-- building log4j. However, it needs to be done whenever code in SLF4J -->
  -  <!-- changes, that is seldom                                             -->
  -  <!-- =================================================================== -->
  -  <target name="refresh-slf4j" depends="init, svnCheckout">	
  -  	<!-- delete any stale copy of LoggerFactory.java -->
  - 	<delete>
  - 		<fileset dir="src/java/org/slf4j" 
  - 		         includes="**/*.java"
  -	             excludes="impl/Log4jLoggerFA.java"/>
  - 	</delete>
  -  	
  -   	<!-- copy a filtered version of slf4j to tmp/src -->
  -  	<copy todir="src/java">
  -  	  <fileset dir="src/filtered-java">
  -  	  	<include name="**/*.java"/>
  -  	    <exclude name="**/impl/JDK14*.java"/>
  -  	  </fileset>
  -  	  <filterset><filter token="IMPL" value="Log4j"/></filterset>
  -  	</copy>
  -  </target>
  -
  -
  -  <target name="svnCheckout">
  -    <property name="repository.URL" value="http://svn.slf4j.org/repos/slf4j/trunk/src/filtered-java"/>
  -	<java classname="org.tmatesoft.svn.cli.SVN" dir="src/" fork="true">
  -	   <arg value="co"/>
  -	   <arg value="${repository.URL}"/>
  -	   <arg value="filtered-java"/>
  -	   <classpath>
  -	     <pathelement location="lib/javasvn.jar" />
  -	     <pathelement location="lib/javasvn-cli.jar" />
  -	   </classpath>
  -	</java>
  -  </target>
  -	
  -</project>
  +<project name="slf4j" default="usage" basedir="." >
  +
  +  <!-- The directory where source files are stored. -->
  +  <property name="java.source.dir" value="./src/java/"/>
  +
  +  <!-- Destination for compiled files -->
  +  <property name="javac.dest" value="./classes"/>
  +	
  +  <!-- The directory where source files are stored. -->
  +  <property name="version" value="1.0alpha"/>
  +
  +  <!-- Deprecation warning? --> 
  +  <property name="deprecation" value="on"/>
  +
  +	
  +  <property name="SLF4J_STEM" value="org/slf4j"/>
  +  
  +
  +  <!-- ================================================================= -->
  +  <!-- Default target                                                    -->
  +  <!-- ================================================================= -->
  +  <target name="usage">
  +    <echo>      
  +      These are some of the targets supported by this ANT build scpript:
  +      
  +      svnCheckout - get SLF4J files into src/filtered-java
  +
  +      refresh-slf4j - copy source files into the log4j source tree, using
  +    	              variable substitution
  +    </echo>
  +  </target>
  +
  +  <target name="init">
  +    <mkdir dir="tmp"/>
  +	<mkdir dir="${java.source.dir}/${SLF4J_STEM}"/>
  +  </target>
  +	
  +  <!-- ================================================================= -->
  +  <!-- Remove all generated (compiled) class files.                      -->
  +  <!-- ================================================================= -->
  +  <target name="clean" description="Delete all compiled SLF4J files.">
  +    <delete dir="${javac.dest}/org/slf4j" />
  +  </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- Copy SLF4J files into log4j source tree. This step is necessary for -->
  +  <!-- building log4j. However, it needs to be done whenever code in SLF4J -->
  +  <!-- changes, that is seldom                                             -->
  +  <!-- =================================================================== -->
  +  <target name="refresh-slf4j" depends="init, svnCheckout">	
  +  	<!-- delete any stale copy of LoggerFactory.java -->
  + 	<delete>
  + 		<fileset dir="src/java/org/slf4j" 
  + 		         includes="**/*.java"
  +	             excludes="impl/Log4jLoggerFA.java"/>
  + 	</delete>
  +  	
  +   	<!-- copy a filtered version of slf4j to tmp/src -->
  +  	<copy todir="src/java">
  +  	  <fileset dir="src/filtered-java">
  +  	  	<include name="**/*.java"/>
  +  	    <exclude name="**/impl/JDK14*.java"/>
  +  	  </fileset>
  +  	  <filterset><filter token="IMPL" value="Log4j"/></filterset>
  +  	</copy>
  +  </target>
  +
  +
  +  <target name="svnCheckout">
  +    <property name="repository.URL" value="http://svn.slf4j.org/repos/slf4j/trunk/src/filtered-java"/>
  +	<java classname="org.tmatesoft.svn.cli.SVN" dir="src/" fork="true">
  +	   <arg value="co"/>
  +	   <arg value="${repository.URL}"/>
  +	   <arg value="filtered-java"/>
  +	   <classpath>
  +	     <pathelement location="lib/javasvn.jar" />
  +	     <pathelement location="lib/javasvn-cli.jar" />
  +	   </classpath>
  +	</java>
  +  </target>
  +	
  +</project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Mime
View raw message