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/tests db.xml build.xml performance.xml ugli-test.xml servlet.xml
Date Mon, 03 Jan 2005 10:17:45 GMT
ceki        2005/01/03 02:17:45

  Modified:    .        ugli.xml build.xml
               tests    db.xml build.xml performance.xml ugli-test.xml
                        servlet.xml
  Log:
  main javac output directory is now LOG4J_HOME/classes instead of LOG4J_HOME/dist/classes
  
  Revision  Changes    Path
  1.3       +2 -2      logging-log4j/ugli.xml
  
  Index: ugli.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/ugli.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ugli.xml	31 Dec 2004 17:51:32 -0000	1.2
  +++ ugli.xml	3 Jan 2005 10:17:45 -0000	1.3
  @@ -10,12 +10,12 @@
     <property name="deprecation" value="on"/>
     
     <!-- Destination for compiled files -->
  -  <property name="javac.dest" value="./dist/classes"/>
  +  <property name="javac.dest" value="./classes"/>
     
     
     <property name="UGLI_STEM" value="org/apache/ugli"/>
     
  -  <property name="ugli.properties" value="dist/classes/ugli.properties"/>
  +  <property name="ugli.properties" value="./classes/ugli.properties"/>
   
       <!-- ================================================================= -->
     <!-- Default target                                                    -->
  
  
  
  1.127     +9 -9      logging-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/build.xml,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- build.xml	2 Jan 2005 09:51:40 -0000	1.126
  +++ build.xml	3 Jan 2005 10:17:45 -0000	1.127
  @@ -123,13 +123,13 @@
       </available>
       <fail unless="jndi-present">
   
  -The JNDI API is required to build ContextJNDISelector, which has
  -become a core log4j class. The JNDI API ships with JDK 1.3 and
  -later. For JDK 1.2, you can get the JNDI API from
  +      The JNDI API is required to build ContextJNDISelector, which has
  +      become a core log4j class. The JNDI API ships with JDK 1.3 and
  +      later. For JDK 1.2, you can get the JNDI API from
   
  -   http://java.sun.com/products/jndi/downloads/index.html
  +        http://java.sun.com/products/jndi/downloads/index.html
   
  -</fail>
  +    </fail>
     </target>
     <target name="jndi" depends="jndiCheck" if="jndi-present">
       <echo message="JNDI is present."/>
  @@ -203,10 +203,10 @@
       <tstamp />
     </target>
   
  -	 <target name="build" description="Compile all log4j components."
  -	          depends="init, build.core, build.examples, 
  -	                   build.xml, build.javamail, build.jms, build.jmx, 
  -	                   build.servletAPI, build.db, build.oro, build.chainsaw"/>
  +  <target name="build" description="Compile all log4j components."
  +	      depends="init, build.core, build.examples, 
  +	               build.xml, build.javamail, build.jms, build.jmx, 
  +	               build.servletAPI, build.db, build.oro, build.chainsaw"/>
   
     <target name="build.requiredeps" 
     	depends="jndiCheck,jmsCheck,oroCheck,javamailCheck,servletAPICheck,jdbcExtensionCheck,jmxCheck,jaxpCheck"
  
  
  
  1.2       +1 -1      logging-log4j/tests/db.xml
  
  Index: db.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/db.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- db.xml	18 Dec 2004 16:54:18 -0000	1.1
  +++ db.xml	3 Jan 2005 10:17:45 -0000	1.2
  @@ -7,7 +7,7 @@
    
     <!-- The directory where source files are stored. -->
     <property name="project.source.home" value="../src/java/"/>
  -  <property name="project.classes.home" value="../dist/classes/"/>
  +  <property name="project.classes.home" value="../classes/"/>
     <property name="examples.classes" value="../examples/classes/"/>
     
     <property name="tests.source.home" value="./src/java/"/>
  
  
  
  1.85      +1 -1      logging-log4j/tests/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/build.xml,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- build.xml	31 Dec 2004 17:51:32 -0000	1.84
  +++ build.xml	3 Jan 2005 10:17:45 -0000	1.85
  @@ -15,7 +15,7 @@
    
     <!-- The directory where source files are stored. -->
     <property name="project.source.home" value="../src/java/"/>
  -  <property name="project.classes.home" value="../dist/classes/"/>
  +  <property name="project.classes.home" value="../classes/"/>
     <property name="examples.classes" value="../examples/classes/"/>
     
     <property name="tests.source.home" value="./src/java/"/>
  
  
  
  1.5       +1 -1      logging-log4j/tests/performance.xml
  
  Index: performance.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/performance.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- performance.xml	21 Dec 2004 01:24:10 -0000	1.4
  +++ performance.xml	3 Jan 2005 10:17:45 -0000	1.5
  @@ -5,7 +5,7 @@
     <!-- The directory where source files are stored. -->
   	
     <property name="project.source.home" value="../src/java/"/>
  -  <property name="project.classes.home" value="../dist/classes/"/>
  +  <property name="project.classes.home" value="../classes/"/>
     <property name="examples.classes" value="../examples/classes/"/>
     <property name="tests.source.home" value="${base}/tests/src/java/"/>
   
  
  
  
  1.2       +3 -3      logging-log4j/tests/ugli-test.xml
  
  Index: ugli-test.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/ugli-test.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ugli-test.xml	31 Dec 2004 17:52:29 -0000	1.1
  +++ ugli-test.xml	3 Jan 2005 10:17:45 -0000	1.2
  @@ -10,12 +10,12 @@
     <property name="deprecation" value="on"/>
     
     <!-- Destination for compiled files -->
  -  <property name="javac.dest" value="./dist/classes"/>
  +  <property name="javac.dest" value="classes"/>
   
     
     <path id="basic.classpath">
       <pathelement location="${tests.source.home}"/>
  -    <pathelement location="./classes"/>
  +    <pathelement location="${javac.dest}"/>
       <pathelement location="${jakarta-oro.jar}"/>
     </path>
   
  @@ -63,7 +63,7 @@
   
     <target name="build" depends="siblingBuild">
       <javac srcdir="${tests.source.home}"
  -           destdir="./classes" 
  +           destdir="${javac.dest}" 
              includes="${stem}/ugli/**.java"
   	   deprecation="${deprecation}"
   	   debug="on">
  
  
  
  1.2       +1 -1      logging-log4j/tests/servlet.xml
  
  Index: servlet.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/servlet.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- servlet.xml	11 Jun 2004 19:43:03 -0000	1.1
  +++ servlet.xml	3 Jan 2005 10:17:45 -0000	1.2
  @@ -15,7 +15,7 @@
    
     <!-- The directory where source files are stored. -->
     <property name="project.source.home" value="../src/java/"/>
  -  <property name="project.classes.home" value="../dist/classes/"/>
  +  <property name="project.classes.home" value="../classes/"/>
     <property name="examples.classes" value="../examples/classes/"/>
     
     <property name="tests.source.home" value="./src/java/"/>
  
  
  

---------------------------------------------------------------------
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