[jboss-cvs] JBossCache/etc ...

[Manik Surtani]

  User: msurtani
  Date: 07/03/14 13:58:03

  Modified:    etc      build.xml build.properties
  Log:
  Fixed various build-related issues
  
  Revision  Changes    Path
  1.22      +20 -9     JBossCache/etc/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/etc/build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- build.xml	14 Mar 2007 16:42:52 -0000	1.21
  +++ build.xml	14 Mar 2007 17:58:03 -0000	1.22
  @@ -70,12 +70,7 @@
   
      <target name="clobber" depends="clean"/>
   
  -   <!-- compile directory -->
  -   <target name="compile" depends="compile-50" description="Compiles all Java files">
  -   </target>
  -
      <target name="pojocache-resources" depends="init" if="ALLOW_POJOCACHE">
  -
         <copy todir="output/resources" filtering="no" overwrite="yes">
            <fileset dir="resources">
               <include name="pojocache-aop.xml"/>
  @@ -84,11 +79,10 @@
   
      </target>
   
  -   <target name="compile-50" depends="init, pojocache-resources" description="Build unit testing class for JDK50"
  +   <target name="compile" depends="init, pojocache-resources" description="Build unit testing class for JDK50"
              if="HAVE_JDK_1.5">
         <javac srcdir="${source}"
                destdir="${build}"
  -             includes="org/jboss/**"
                debug="true"
                deprecation="true">
            <classpath>
  @@ -96,6 +90,13 @@
            </classpath>
         </javac>
   
  +      <copy todir="${build}">
  +         <fileset dir="${source}">
  +            <include name="**/*.clazz"/>
  +            <include name="**/*.notjava"/>
  +         </fileset>
  +      </copy>
  +
         <copy todir="output/etc" filtering="no" overwrite="yes">
            <fileset dir="etc">
               <include name="log4j.xml"/>
  @@ -118,6 +119,8 @@
            <classpath refid="lib.classpath"/>
            <classpath path="${build}"/>
            <classpath path="${output}/etc"/>
  +         <jvmarg value="-Dbind.address=${bind.address}"/>
  +         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <formatter type="xml"/>
            <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
            <test name="${test}" todir="${reports}"/>
  @@ -146,6 +149,8 @@
                  <jvmarg value="-Dbind.address=172.16.129.57"/>
            -->
            <classpath refid="lib.classpath"/>
  +         <jvmarg value="-Dbind.address=${bind.address}"/>
  +         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <classpath path="${build}"/>
            <classpath path="${output}/etc"/>
            <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
  @@ -285,7 +290,8 @@
         <junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
            <jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/>
            <jvmarg value="-javaagent:${lib}/jboss-aop-jdk50.jar"/>
  -         <!-- jvmarg value="-Dbind.address=${bind.address}"/ -->
  +         <jvmarg value="-Dbind.address=${bind.address}"/>
  +         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <classpath path="${output}/etc"/>
            <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
            <classpath refid="lib.classpath"/>
  @@ -307,7 +313,8 @@
         <junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
            <jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/>
            <jvmarg value="-javaagent:${lib}/jboss-aop-jdk50.jar"/>
  -         <!-- jvmarg value="-Dbind.address=${bind.address}"/ -->
  +         <jvmarg value="-Dbind.address=${bind.address}"/>
  +         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <classpath path="${output}/etc"/>
            <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
            <classpath refid="lib.classpath"/>
  @@ -328,6 +335,8 @@
         <junit printsummary="true" fork="yes">
            <classpath refid="lib.classpath"/>
            <classpath refid="build.classpath"/>
  +         <jvmarg value="-Dbind.address=${bind.address}"/>
  +         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/>
            <classpath path="${output}/etc"/>
            <formatter type="xml"/>
  @@ -353,6 +362,8 @@
            <jvmarg value="-Xmx128M"/>
            <classpath refid="lib.classpath"/>
            <jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/>
  +         <jvmarg value="-Dbind.address=${bind.address}"/>
  +         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <classpath refid="build.classpath"/>
            <classpath path="${output}/etc"/>
            <formatter type="xml"/>
  
  
  
  1.7       +2 -1      JBossCache/etc/build.properties
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.properties
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/etc/build.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- build.properties	5 Feb 2006 05:53:56 -0000	1.6
  +++ build.properties	14 Mar 2007 17:58:03 -0000	1.7
  @@ -1,5 +1,7 @@
   # set up environment
   #
  +## Change this if you do not wish to run tests on the local loopback address.
  +bind.address=127.0.0.1
   
   #
   # Below should be transparent to you.
  @@ -19,6 +21,5 @@
   build-50=${output}/classes-50
   source-50=${basedir}/tests-50
   lib-50=${basedir}/lib-50
  -
   #Directory for Junit test result. Subdirectory html contains the result in html format.
   reports=${output}/reports