[jboss-cvs] JBossCache ...

[Manik Surtani]

  User: msurtani
  Date: 07/01/16 06:40:33

  Modified:    JBossCache  build.xml
  Log:
  Different log4j file for cruise control builds vs distribution
  
  Revision  Changes    Path
  1.171     +43 -34    JBossCache/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/build.xml,v
  retrieving revision 1.170
  retrieving revision 1.171
  diff -u -b -r1.170 -r1.171
  --- build.xml	13 Jan 2007 15:55:11 -0000	1.170
  +++ build.xml	16 Jan 2007 11:40:33 -0000	1.171
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  -<!-- $Id: build.xml,v 1.170 2007/01/13 15:55:11 bwang Exp $ -->
  +<!-- $Id: build.xml,v 1.171 2007/01/16 11:40:33 msurtani Exp $ -->
   
   <project default="compile" name="JBossCache">
   
  @@ -482,7 +482,8 @@
            <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
            <classpath refid="library.classpath"/>
            <classpath refid="output.classpath"/>
  -         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
  +                    extension="-${jgroups.stack}.xml"/>
            <test name="${test}" todir="${build.reports}"/>
         	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
  @@ -563,7 +564,8 @@
            <classpath refid="output.classpath"/>
            <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
            <classpath refid="library.classpath"/>
  -         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
  +                    extension="-${jgroups.stack}.xml"/>
            <test name="${test}" todir="${build.reports}"/>
         </junit>
      </target>
  @@ -646,7 +648,8 @@
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <jvmarg value="-Dtest.jar.dir=${output.dir}"/>
            <jvmarg value="-Dlib.dir=${lib.dir}"/>
  -         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
  +                    extension="-${jgroups.stack}.xml"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${functional.tests.dir}">
                  <include name="**/*Test.*"/>
  @@ -722,7 +725,8 @@
            <jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
            <classpath refid="output.classpath"/>
            <classpath refid="library.classpath"/>
  -         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
  +                    extension="-${jgroups.stack}.xml"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
  @@ -835,7 +839,8 @@
         	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
  -         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
  +                    extension="-${jgroups.stack}.xml"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${perf.tests.dir}">
                  <include name="**/*Test.*"/>
  @@ -862,7 +867,8 @@
         	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
  -         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
  +                    extension="-${jgroups.stack}.xml"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${stress.tests.dir}">
                  <include name="**/*Test.*"/>
  @@ -1006,12 +1012,12 @@
       
      	  <antcall target="all-unittests" inheritrefs="false">
            <reference refid="known.failures" torefid="junit.excludes"/>
  -      	 <param name="jgroups.stack" value="udp" /> 
  +         <param name="jgroups.stack" value="udp"/>
         </antcall>
      	
      	  <antcall target="all-unittests" inheritrefs="false">
      	     <reference refid="known.failures" torefid="junit.excludes"/>
  -   	     <param name="jgroups.stack" value="tcp" /> 
  +         <param name="jgroups.stack" value="tcp"/>
      	  </antcall>
      </target>
   
  @@ -1133,12 +1139,15 @@
   
         <copy todir="${tmp.dir}/etc" filtering="no">
            <fileset dir="${etc.dir}">
  -            <include name="log4j.xml"/>
  +            <exclude name="log4j.xml"/>
  +            <include name="log4j.release.xml"/>
               <include name="META-INF/*.xml"/>
               <include name="cache-jdbc.properties"/>
            </fileset>
         </copy>
   
  +      <move file="${tmp.dir}/etc/log4j.release.xml" tofile="${tmp.dir}/etc/log4j.xml"/>
  +
         <copy todir="${tmp.dir}/tests" filtering="no">
            <fileset dir="${functional.tests.dir}">
               <include name="**/*.java"/>