[Jboss-cvs] JBossAS SVN: r56502 - projects/test/trunk/test

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2006-09-01 07:54:32 -0400 (Fri, 01 Sep 2006)
New Revision: 56502

Modified:
   projects/test/trunk/test/build-thirdparty.xml
   projects/test/trunk/test/build.xml
Log:
Compile jboss-test with jdk5 and introduce a retroed jboss-test14.jar

Modified: projects/test/trunk/test/build-thirdparty.xml
===================================================================
--- projects/test/trunk/test/build-thirdparty.xml	2006-09-01 11:45:55 UTC (rev 56501)
+++ projects/test/trunk/test/build-thirdparty.xml	2006-09-01 11:54:32 UTC (rev 56502)
@@ -46,11 +46,13 @@
 
       <componentref name="apache-log4j" version="1.2.8"/>  
       <componentref name="apache-xerces" version="2.7.1"/>
+      <componentref name="javassist" version="3.3.0.GA"/>
+      <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/common" version="1.0.1"/>
+      <componentref name="jboss/jbossretro" version="1.0.2.GA"/>
       <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
       <componentref name="junit" version="3.8.1"/>
 
-
    </build>
 
    <synchronizeinfo/>

Modified: projects/test/trunk/test/build.xml
===================================================================
--- projects/test/trunk/test/build.xml	2006-09-01 11:45:55 UTC (rev 56501)
+++ projects/test/trunk/test/build.xml	2006-09-01 11:54:32 UTC (rev 56502)
@@ -88,10 +88,25 @@
          <path refid="jboss.profiler.jvmti.classpath"/>
       </path>
 
+    <!-- ============================= -->
+    <!-- Paths etc. for the retro task -->
+    <!-- ============================= -->
+    <property name="build.classes.retro" value="${module.output}/classes-retro"/>
+    <property name="build.lib.retro" value="${module.output}/lib14"/>
+    <path id="jbossretro.classpath">
+       <path refid="apache.ant.classpath"/>
+       <path refid="javassist.javassist.classpath"/>
+       <path refid="jboss.jbossretro.classpath"/>
+       <path refid="jboss/backport.concurrent.classpath"/>
+    </path>
+
       <!-- ===== -->
       <!-- Tasks -->
       <!-- ===== -->
 
+    <property name="javac.target" value="1.5"/>
+    <property name="javac.source" value="1.5"/>
+
       <call target="_default:task-init"/>
    </target>
 
@@ -108,8 +123,24 @@
     -->
    <target name="compile"
            description="Compile all source files."
-           depends="_default:compile-classes, _default:compile-etc"
+           depends="_default:compile-classes, 
+                   _default:compile-etc,
+                   retro"
    />
+   
+  <target name="retro">
+     <mkdir dir="${build.lib.retro}"/>
+     <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
+     <retro compilerclasspathref="jbossretro.classpath" destdir="${build.classes.retro}">
+        <classpath refid="jbossretro.classpath"/>
+        <classpath refid="library.classpath"/>
+        <classpath refid="dependentmodule.classpath"/>
+        <classpath>
+           <pathelement path="${build.classes}"/>
+        </classpath>
+        <src path="${build.classes}"/>
+     </retro>      
+  </target> 
 
    <!-- ================================================================== -->
    <!-- Archives                                                           -->
@@ -119,10 +150,14 @@
       | Build all jar files.
     -->
    <target name="module-jars">
-      <jar jarfile="${build.lib}/${jar.server.name}"
+      <jar jarfile="${build.lib}/jboss-test.jar"
            manifest="${build.etc}/default.mf">
          <fileset dir="${build.classes}"/>
       </jar>
+     <jar jarfile="${build.lib.retro}/jboss-test14.jar" 
+          manifest="${build.etc}/default.mf">
+       <fileset dir="${build.classes.retro}"/>
+     </jar>
    </target>
 
    <!-- ================================================================== -->