[Jboss-cvs] JBossAS SVN: r55205 - in projects/microcontainer/trunk: build container dependency kernel tools/etc/buildmagic
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 4 12:46:21 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-08-04 12:46:15 -0400 (Fri, 04 Aug 2006)
New Revision: 55205
Modified:
projects/microcontainer/trunk/build/build-thirdparty.xml
projects/microcontainer/trunk/container/build-test.xml
projects/microcontainer/trunk/container/build-test14.xml
projects/microcontainer/trunk/dependency/build-test.xml
projects/microcontainer/trunk/dependency/build.xml
projects/microcontainer/trunk/kernel/build-test.xml
projects/microcontainer/trunk/kernel/build.xml
projects/microcontainer/trunk/tools/etc/buildmagic/buildmagic.ent
Log:
Break out 1.4 jars and create retroed tests
Modified: projects/microcontainer/trunk/build/build-thirdparty.xml
===================================================================
--- projects/microcontainer/trunk/build/build-thirdparty.xml 2006-08-04 16:40:56 UTC (rev 55204)
+++ projects/microcontainer/trunk/build/build-thirdparty.xml 2006-08-04 16:46:15 UTC (rev 55205)
@@ -49,7 +49,7 @@
<componentref name="jboss/jbossxb" version="snapshot"/>
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR4"/>
<componentref name="junit" version="3.8.1"/>
- <componentref name="jboss/aop" version="1.5.1.snapshot" />
+ <componentref name="jboss/aop" version="snapshot" />
<componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
<componentref name="jboss/jbossretro" version="snapshot"/>
<componentref name="jboss/test" version="1.0.0.CR1"/>
Modified: projects/microcontainer/trunk/container/build-test.xml
===================================================================
--- projects/microcontainer/trunk/container/build-test.xml 2006-08-04 16:40:56 UTC (rev 55204)
+++ projects/microcontainer/trunk/container/build-test.xml 2006-08-04 16:46:15 UTC (rev 55205)
@@ -114,6 +114,8 @@
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jboss.profiler.jvmti.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="jboss.common.classpath"/>
</path>
</target>
Modified: projects/microcontainer/trunk/container/build-test14.xml
===================================================================
--- projects/microcontainer/trunk/container/build-test14.xml 2006-08-04 16:40:56 UTC (rev 55204)
+++ projects/microcontainer/trunk/container/build-test14.xml 2006-08-04 16:46:15 UTC (rev 55205)
@@ -2,7 +2,6 @@
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
<!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
]>
@@ -72,13 +71,13 @@
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jboss.profiler.jvmti.classpath"/>
+ <path refid="jboss.test.classpath"/>
</path>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
- &modules;
<!-- this -->
<property name="jboss.this.root" value="${module.root}/output"/>
<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
@@ -86,6 +85,7 @@
<fileset dir="${jboss.this.lib}">
<include name="*.jar"/>
<include name="*14.jar"/>
+ <exclude name="*-test.jar"/>
<exclude name="${jar.prefix}14.jar"/>
</fileset>
</path>
@@ -94,7 +94,6 @@
<path id="dependentmodule.classpath">
<path refid="jboss.this.classpath"/>
<path refid="jboss.common.classpath"/>
- <path refid="jboss.test.classpath"/>
</path>
<!-- ===== -->
@@ -110,19 +109,11 @@
<property name="build-bypass.disabled" value="true"/>
<call target="_default:task-init"/>
-
+
<path id="thirdparty.classpath">
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
</path>
-
- <path id="no.javassist.classpath">
- <path refid="junit.junit.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
<!-- ============================= -->
<!-- Paths etc. for the retro task -->
@@ -166,8 +157,7 @@
<target name="compile"
description="Compile all source files."
- depends="_default:compile-classes,
- retro"
+ depends="retro"
/>
<target name="retro">
@@ -181,19 +171,19 @@
<pathelement path="${build.classes}"/>
</classpath>
<src path="${build.classes}"/>
- </retro>
- </target>
+ </retro>
+ </target>
-
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
- <!--
+ <!--
| Build all jar files.
-->
<target name="module-jars" depends="init">
-
+
<!-- Build jboss-kernel.jar -->
<jar jarfile="${build.lib.retro}/jboss-container-test14.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes.retro}"/>
@@ -267,7 +257,7 @@
<equals arg1="${ant.java.version}" arg2="1.4" />
</condition>
<fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
-
+
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<!-- Remove the test.log so each run has a fresh log -->
@@ -305,11 +295,11 @@
</junit>
</target>
-
+
<target name="memory-test" depends="most" description="Execute MemoryLeakTestCase">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
-
+
<junit printsummary="yes" fork="yes" haltonfailure="no">
<classpath>
<pathelement location="${build.classes}"/>
Modified: projects/microcontainer/trunk/dependency/build-test.xml
===================================================================
--- projects/microcontainer/trunk/dependency/build-test.xml 2006-08-04 16:40:56 UTC (rev 55204)
+++ projects/microcontainer/trunk/dependency/build-test.xml 2006-08-04 16:46:15 UTC (rev 55205)
@@ -2,7 +2,6 @@
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
<!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
]>
@@ -70,13 +69,13 @@
<path refid="junit.junit.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.test.classpath"/>
</path>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
- &modules;
<!-- this -->
<property name="jboss.this.root" value="${module.root}/output"/>
<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
@@ -91,7 +90,6 @@
<path id="dependentmodule.classpath">
<path refid="jboss.this.classpath"/>
<path refid="jboss.common.classpath"/>
- <path refid="jboss.test.classpath"/>
</path>
<!-- ===== -->
@@ -130,11 +128,11 @@
<!-- Archives -->
<!-- ================================================================== -->
- <!--
+ <!--
| Build all jar files.
-->
<target name="module-jars" depends="init">
-
+
<jar jarfile="${build.lib}/jboss-dependency-test.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}"/>
</jar>
Modified: projects/microcontainer/trunk/dependency/build.xml
===================================================================
--- projects/microcontainer/trunk/dependency/build.xml 2006-08-04 16:40:56 UTC (rev 55204)
+++ projects/microcontainer/trunk/dependency/build.xml 2006-08-04 16:46:15 UTC (rev 55205)
@@ -74,6 +74,19 @@
<path id="dependentmodule.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="jboss.jbossretro.classpath"/>
+ <path refid="jboss/backport.concurrent.classpath"/>
+ <path refid="javassist.classpath"/>
+ </path>
+
+
<!-- ===== -->
<!-- Tasks -->
<!-- ===== -->
@@ -101,9 +114,24 @@
<target name="compile"
description="Compile all source files."
depends="_default:compile-classes,
- _default:compile-etc"
+ _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 -->
<!-- ================================================================== -->
@@ -116,7 +144,9 @@
<jar jarfile="${build.lib}/jboss-dependency.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}"/>
</jar>
-
+ <jar jarfile="${build.lib.retro}/jboss-dependency14.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes.retro}"/>
+ </jar>
</target>
</project>
Modified: projects/microcontainer/trunk/kernel/build-test.xml
===================================================================
--- projects/microcontainer/trunk/kernel/build-test.xml 2006-08-04 16:40:56 UTC (rev 55204)
+++ projects/microcontainer/trunk/kernel/build-test.xml 2006-08-04 16:46:15 UTC (rev 55205)
@@ -2,7 +2,6 @@
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
<!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
]>
@@ -70,13 +69,14 @@
<path refid="junit.junit.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
</path>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
- &modules;
<!-- this -->
<property name="jboss.this.root" value="${module.root}/output"/>
<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
@@ -109,8 +109,6 @@
<path refid="jboss.common.classpath"/>
<path refid="jboss.container.classpath"/>
<path refid="jboss.dependency.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
</path>
<!-- ===== -->
@@ -162,7 +160,7 @@
<!-- Archives -->
<!-- ================================================================== -->
- <!--
+ <!--
| Build all jar files.
-->
<target name="module-jars" depends="init">
Modified: projects/microcontainer/trunk/kernel/build.xml
===================================================================
--- projects/microcontainer/trunk/kernel/build.xml 2006-08-04 16:40:56 UTC (rev 55204)
+++ projects/microcontainer/trunk/kernel/build.xml 2006-08-04 16:46:15 UTC (rev 55205)
@@ -95,10 +95,22 @@
</path>
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.container.classpath"/>
- <path refid="jboss.dependency.classpath"/>
+ <path refid="jboss.container.classpath"/>
+ <path refid="jboss.dependency.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="jboss.jbossretro.classpath"/>
+ <path refid="jboss/backport.concurrent.classpath"/>
+ <path refid="javassist.classpath"/>
+ </path>
+
<!-- ===== -->
<!-- Tasks -->
<!-- ===== -->
@@ -127,9 +139,24 @@
description="Compile all source files."
depends="_default:compile-classes,
_default:compile-resources,
- _default:compile-etc"
+ _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 -->
<!-- ================================================================== -->
@@ -146,6 +173,12 @@
<include name="schema/**"/>
</fileset>
</jar>
+ <jar jarfile="${build.lib.retro}/${jar.prefix}14.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes.retro}"/>
+ <fileset dir="${build.resources}">
+ <include name="schema/**"/>
+ </fileset>
+ </jar>
</target>
Modified: projects/microcontainer/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- projects/microcontainer/trunk/tools/etc/buildmagic/buildmagic.ent 2006-08-04 16:40:56 UTC (rev 55204)
+++ projects/microcontainer/trunk/tools/etc/buildmagic/buildmagic.ent 2006-08-04 16:46:15 UTC (rev 55205)
@@ -38,9 +38,6 @@
<!-- JDK Detection -->
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <fail unless="HAVE_JDK_1.5">
- Unsupported Java version: You need at least JDK5 to build the Microcontainer
- </fail>
<!-- Setup the project environment. -->
<dirname property="project.root" file="${basedir}"/>
More information about the jboss-cvs-commits
mailing list