[jboss-cvs] JBossAS SVN: r69481 - projects/ejb3/trunk/core.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 30 01:57:50 EST 2008
Author: ALRubinger
Date: 2008-01-30 01:57:50 -0500 (Wed, 30 Jan 2008)
New Revision: 69481
Modified:
projects/ejb3/trunk/core/build-test.xml
projects/ejb3/trunk/core/pom.xml
Log:
Set EJB3 Core to Build Test JARs Properly
Modified: projects/ejb3/trunk/core/build-test.xml
===================================================================
--- projects/ejb3/trunk/core/build-test.xml 2008-01-30 06:53:30 UTC (rev 69480)
+++ projects/ejb3/trunk/core/build-test.xml 2008-01-30 06:57:50 UTC (rev 69481)
@@ -18,10 +18,7 @@
<project default="main" name="JBoss/EJB3 Tests"
xmlns:server="http://jboss.org/ns/test/ant/server">
- <import file="../tools/etc/buildmagic/build-common.xml"/>
- &libraries;
- &modules;
-
+
<!-- ======================================================== -->
<!-- Initialization -->
<!-- ======================================================== -->
@@ -29,7 +26,12 @@
<format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/>
</tstamp>
<echo message="${TIMENOW}" file="run.tstamp"/>
-
+
+ <!-- Define test Classpath -->
+ <path id="jboss.test.classpath">
+ <pathelement path="${jboss.test.path}"/>
+ </path>
+
<property name="results_web" value="http://jboss.sourceforge.net/junit-results/32"/>
<property name="buildlog.level" value="info" />
<property environment="env"/>
@@ -76,7 +78,7 @@
<property name="jbosstest.udpGroup" value="${udpGroup}"/>
<!-- Import the jboss server run targets -->
- <import file="../testsuite/imports/server-config.xml"/>
+ <import file="target/dependencies/unpacked/jboss-test/server-config.xml"/>
<!-- Propagate the dist directory as a jbosstest system property -->
<property name="jbosstest.dist" value="${jboss.dist}"/>
@@ -122,6 +124,11 @@
<property name="module.name" value="ejb3"/>
<property name="module.Name" value="JBoss Testsuite"/>
<property name="module.version" value="DEV"/>
+ <property name="module.source" value="./src"/>
+ <property name="module.output" value="./target"/>
+ <property name="location.dependency" value ="./target" />
+ <property name="location.dependency.unpacked" value ="${location.dependency}/unpacked" />
+ <property name="location.dependency.unpacked.testsuite" value ="${location.dependency.unpacked}/jboss-test" />
<!-- ========= -->
@@ -222,22 +229,22 @@
<!-- ===== -->
<!-- Where source files live -->
- <property name="source.java" value="${module.source}/test"/>
+ <property name="source.java" value="${module.source}/test/java"/>
<property name="source.etc" value="${module.source}/etc"/>
- <property name="resources" value="${module.source}/resources"/>
- <property name="source.stylesheets" value="../testsuite/src/stylesheets"/>
+ <property name="resources" value="${module.source}/test/resources"/>
+ <property name="source.stylesheets" value="{location.dependency.unpacked.testsuite}/src/stylesheets"/>
<!-- Where build generated files will go -->
<property name="build.reports" value="${module.output}/reports"/>
<property name="build.testlog" value="${module.output}/log"/>
- <property name="build.classes" value="${module.output}/test-classes"/>
+ <property name="build.classes" value="${module.output}/tests-classes"/>
<property name="build.lib" value="${module.output}/test-lib"/>
<property name="build.ejb3.lib" value="${module.output}/lib"/>
<property name="build.api" value="${module.output}/api"/>
<property name="build.etc" value="${module.output}/etc"/>
<property name="build.stylesheets" value="${module.output}/stylesheets"/>
<!-- build.resources is needed for the test-configs directory used by the create-config macro -->
- <property name="build.resources" value="${module.source}/resources"/>
+ <property name="build.resources" value="${module.source}/test/resources"/>
<!-- Install/Release structure -->
<property name="install.id" value="${module.name}-${module.version}"/>
@@ -339,54 +346,6 @@
<!-- Setup the version 1 classes so the tests compile -->
</target>
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <!-- Compile all class files -->
- <target name="compile-classes" depends="init">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- source="1.5"
- target="1.5"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${project.root}/testsuite/src/main"/>
- <classpath refid="javac.classpath"/>
- <include name="org/jboss/test/*.java"/>
- </javac>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- source="1.5"
- target="1.5"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.java}"/>
- <classpath refid="javac.classpath"/>
- <exclude name="org/jboss/ejb3/test/**/*EmbeddedTest.java"/>
- <!-- compilerarg value="-verbose"/ -->
- </javac>
- </target>
-
<target name="compile-stylesheets">
<mkdir dir="${build.stylesheets}"/>
<copy todir="${build.stylesheets}" filtering="yes">
@@ -400,8 +359,7 @@
<!-- ================================================================== -->
<target name="initial"
- description="Builds all jar files."
- depends="compile-classes">
+ description="Builds all jar files.">
<mkdir dir="${build.lib}"/>
@@ -454,9 +412,7 @@
</jar>
</target>
- <target name="jca/inflowmdb"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="jca/inflowmdb">
<mkdir dir="${build.lib}"/>
@@ -533,9 +489,7 @@
</copy>
</target>
- <target name="cache"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="cache">
<mkdir dir="${build.lib}"/>
@@ -564,9 +518,7 @@
</target>
- <target name="factory"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="factory">
<mkdir dir="${build.lib}"/>
@@ -649,9 +601,7 @@
</jar>
</target>
- <target name="ear"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="ear">
<mkdir dir="${build.lib}"/>
@@ -690,9 +640,7 @@
</target>
- <target name="dependency"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="dependency">
<mkdir dir="${build.lib}"/>
@@ -777,9 +725,7 @@
</target>
- <target name="benchmark"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="benchmark">
<mkdir dir="${build.lib}"/>
@@ -821,9 +767,7 @@
</jar>
</target>
- <target name="appclient"
- description="Builds appclient-test.ear."
- depends="compile-classes">
+ <target name="appclient">
<mkdir dir="${build.lib}"/>
@@ -876,9 +820,7 @@
</copy>
</target>
- <target name="asynchronous"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="asynchronous">
<mkdir dir="${build.lib}"/>
@@ -904,9 +846,7 @@
</jar>
</target>
- <target name="localcall"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="localcall">
<mkdir dir="${build.lib}"/>
@@ -917,9 +857,7 @@
</jar>
</target>
- <target name="webservices"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="webservices">
<mkdir dir="${build.lib}"/>
@@ -955,9 +893,7 @@
</jar>
</target>
- <target name="interceptors"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="interceptors">
<mkdir dir="${build.lib}"/>
@@ -972,9 +908,7 @@
</jar>
</target>
- <target name="interceptors2"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="interceptors2">
<mkdir dir="${build.lib}"/>
@@ -995,9 +929,7 @@
</target>
- <target name="interceptors3"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="interceptors3">
<mkdir dir="${build.lib}"/>
@@ -1018,12 +950,10 @@
</target>
- <target name="cachepassivation" depends="compile-classes">
+ <target name="cachepassivation" >
</target>
- <target name="clientinterceptor"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="clientinterceptor">
<mkdir dir="${build.lib}"/>
@@ -1037,12 +967,10 @@
</jar>
</target>
- <target name="threadlocal" depends="compile-classes">
+ <target name="threadlocal">
</target>
- <target name="timer"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="timer">
<mkdir dir="${build.lib}"/>
@@ -1053,9 +981,7 @@
</jar>
</target>
- <target name="timerdependency"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="timerdependency">
<mkdir dir="${build.lib}"/>
@@ -1066,9 +992,7 @@
</jar>
</target>
- <target name="pkg"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="pkg">
<mkdir dir="${build.lib}"/>
@@ -1082,9 +1006,7 @@
</jar>
</target>
- <target name="txexceptions"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="txexceptions">
<mkdir dir="${build.lib}"/>
@@ -1099,9 +1021,7 @@
</jar>
</target>
- <target name="dd"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="dd">
<mkdir dir="${build.lib}"/>
@@ -1112,9 +1032,7 @@
</jar>
</target>
- <target name="pool"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="pool">
<mkdir dir="${build.lib}"/>
@@ -1125,9 +1043,7 @@
</jar>
</target>
- <target name="naming"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="naming">
<mkdir dir="${build.lib}"/>
@@ -1180,9 +1096,7 @@
</jar>
</target>
- <target name="bmt"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="bmt">
<mkdir dir="${build.lib}"/>
@@ -1196,9 +1110,7 @@
</jar>
</target>
- <target name="schema"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="schema">
<mkdir dir="${build.lib}"/>
@@ -1215,9 +1127,7 @@
</jar>
</target>
- <target name="bank"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="bank">
<mkdir dir="${build.lib}"/>
@@ -1254,9 +1164,7 @@
</jar>
</target-->
- <target name="mail"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="mail">
<mkdir dir="${build.lib}"/>
@@ -1270,9 +1178,7 @@
</jar>
</target>
- <target name="security5"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="security5">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/security5.jar">
@@ -1289,9 +1195,7 @@
</jar>
</target>
- <target name="securitydomain"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="securitydomain">
<mkdir dir="${build.lib}"/>
@@ -1307,9 +1211,7 @@
</jar>
</target>
- <target name="unauthenticatedprincipal"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="unauthenticatedprincipal">
<mkdir dir="${build.lib}"/>
@@ -1325,9 +1227,7 @@
</jar>
</target>
- <target name="reference21_30"
- description="Builds all jar files."
- depends="compile-classes">
+ <target name="reference21_30">
<mkdir dir="${build.lib}"/>
@@ -1444,7 +1344,7 @@
<target name="dd/mdb"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1465,7 +1365,7 @@
<target name="jms"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1481,7 +1381,7 @@
<target name="jms/managed"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1500,7 +1400,7 @@
<target name="enventry"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1522,7 +1422,7 @@
<!--target name="loginmodule"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1547,7 +1447,7 @@
<target name="dd/web"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1606,7 +1506,7 @@
<target name="jsp"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1634,7 +1534,7 @@
<target name="classloader"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1669,7 +1569,7 @@
<target name="clusteredservice"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1692,7 +1592,7 @@
<target name="clusteredjms"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1705,7 +1605,7 @@
<target name="servlet"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1762,7 +1662,7 @@
<target name="ejbthree440"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1788,7 +1688,7 @@
<target name="ejbthree454"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1839,7 +1739,7 @@
<target name="ejbthree485"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1852,7 +1752,7 @@
<target name="ejbthree620"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1865,7 +1765,7 @@
<target name="ejbthree653"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1878,7 +1778,7 @@
<target name="ejbthree670"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1891,7 +1791,7 @@
<target name="ejbthree712"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1905,7 +1805,7 @@
<target name="ejbthree724"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1928,8 +1828,7 @@
</target>
<target name="ejbthree751"
- description="Builds all jar files."
- depends="compile-classes">
+ description="Builds all jar files.">
<mkdir dir="${build.lib}"/>
@@ -1946,17 +1845,17 @@
</jar>
</target>
- <target name="ejbthree785" depends="compile-classes">
+ <target name="ejbthree785" >
<build-simple-jar name="ejbthree785"/>
</target>
- <target name="ejbthree786" depends="compile-classes">
+ <target name="ejbthree786" >
<build-simple-jar name="ejbthree786"/>
</target>
<target name="ejbthree832"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1972,7 +1871,7 @@
<target name="ejbthree921"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -1986,7 +1885,7 @@
<target name="ejbthree936"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2000,7 +1899,7 @@
<target name="ejbthree939"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2020,7 +1919,7 @@
<target name="ejbthree953"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2034,7 +1933,7 @@
<target name="ejbthree957"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2069,35 +1968,35 @@
<target name="ejbthree959"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree959"/>
</target>
<target name="ejbthree963"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree963"/>
</target>
<target name="ejbthree967"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree967"/>
</target>
<target name="ejbthree971"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree971"/>
</target>
<target name="ejbthree973"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree973"/>
@@ -2110,21 +2009,21 @@
<target name="ejbthree985"
description="Builds a simple jar file."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree985"/>
</target>
<target name="ejbthree986"
description="Builds a simple jar file."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree986"/>
</target>
<target name="ejbthree994"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree994"/>
@@ -2137,21 +2036,21 @@
<target name="ejbthree989"
description="Builds a simple jar file."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree989"/>
</target>
<target name="ejbthree1020"
description="Builds a simple jar file."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree1020"/>
</target>
<target name="ejbthree1023"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2167,38 +2066,38 @@
<target name="ejbthree1025"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree1025"/>
</target>
<target name="ejbthree1040"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="ejbthree1040"/>
</target>
- <target name="ejbthree1057" depends="compile-classes">
+ <target name="ejbthree1057" >
<build-simple-jar name="ejbthree1057"/>
</target>
- <target name="ejbthree1060" depends="compile-classes">
+ <target name="ejbthree1060" >
<build-simple-jar name="ejbthree1060"/>
</target>
- <target name="ejbthree1062" depends="compile-classes">
+ <target name="ejbthree1062" >
<build-simple-jar name="ejbthree1062"/>
</target>
- <target name="ejbthree1066" depends="compile-classes">
+ <target name="ejbthree1066" >
<build-simple-jar name="ejbthree1066"/>
</target>
- <target name="ejbthree1071" depends="compile-classes">
+ <target name="ejbthree1071" >
<build-simple-jar name="ejbthree1071"/>
</target>
- <target name="ejbthree1075" depends="compile-classes">
+ <target name="ejbthree1075" >
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/ejbthree1075-homeonly.jar">
<fileset dir="${build.classes}">
@@ -2212,19 +2111,19 @@
</jar>
</target>
- <target name="ejbthree1082" depends="compile-classes">
+ <target name="ejbthree1082" >
<build-simple-jar name="ejbthree1082"/>
</target>
- <target name="ejbthree1119" depends="compile-classes">
+ <target name="ejbthree1119" >
<build-simple-jar name="ejbthree1119"/>
</target>
- <target name="ejbthree1122" depends="compile-classes">
+ <target name="ejbthree1122" >
<build-simple-jar name="ejbthree1122"/>
</target>
- <target name="ejbthree1123" depends="compile-classes">
+ <target name="ejbthree1123" >
<build-simple-jar name="ejbthree1123"/>
<copy todir="${build.lib}">
@@ -2235,44 +2134,44 @@
</target>
- <target name="ejbthree1127" depends="compile-classes">
+ <target name="ejbthree1127" >
<build-simple-jar name="ejbthree1127"/>
</target>
- <target name="ejbthree1130" depends="compile-classes">
+ <target name="ejbthree1130" >
<build-simple-jar name="ejbthree1130"/>
</target>
- <target name="ejbthree1146" depends="compile-classes">
+ <target name="ejbthree1146" >
<build-simple-jar name="ejbthree1146"/>
</target>
- <target name="ejbthree1148" depends="compile-classes">
+ <target name="ejbthree1148" >
<build-simple-jar name="ejbthree1148"/>
</target>
- <target name="ejbthree1154" depends="compile-classes">
+ <target name="ejbthree1154" >
<build-simple-jar name="ejbthree1154"/>
</target>
- <target name="ejbthree1155" depends="compile-classes">
+ <target name="ejbthree1155" >
<build-simple-jar name="ejbthree1155"/>
</target>
- <target name="ejbthree1157" depends="compile-classes">
+ <target name="ejbthree1157" >
<build-simple-jar name="ejbthree1157"/>
</target>
<target name="jbas4489"
description="Builds a simple jar files."
- depends="compile-classes">
+ >
<build-simple-jar name="jbas4489"/>
</target>
<target name="jaxws"
description="Builds a simple jar."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2285,7 +2184,7 @@
<target name="wolfc"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2308,7 +2207,7 @@
<target name="scopedclassloader"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2374,7 +2273,7 @@
<target name="exception"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2387,7 +2286,7 @@
<target name="dd/override"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2409,7 +2308,7 @@
<target name="hbm"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2438,7 +2337,7 @@
<target name="regressionHHH275"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2454,7 +2353,7 @@
<target name="regression"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2519,7 +2418,7 @@
<target name="strictpool"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2540,7 +2439,7 @@
<target name="relationships"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2553,7 +2452,7 @@
<target name="ssl"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2566,7 +2465,7 @@
<target name="arjuna"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2582,7 +2481,7 @@
<target name="ssladvanced"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2598,7 +2497,7 @@
<target name="entity"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2614,7 +2513,7 @@
<target name="entityoptimisticlocking"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2630,7 +2529,7 @@
<target name="persistenceunits"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2648,7 +2547,7 @@
<target name="mdbtransactions"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2679,13 +2578,13 @@
</copy>
</target>
- <target name="lifecycle" depends="compile-classes">
+ <target name="lifecycle" >
<build-simple-jar name="lifecycle"/>
</target>
<target name="longlived"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2701,7 +2600,7 @@
<target name="entityexception"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2717,7 +2616,7 @@
<target name="composite"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2733,7 +2632,7 @@
<target name="composite2"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2749,7 +2648,7 @@
<target name="lob"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2765,7 +2664,7 @@
<target name="manytomany"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2781,7 +2680,7 @@
<target name="joininheritance"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2797,7 +2696,7 @@
<target name="singletable"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2813,7 +2712,7 @@
<target name="invalidtxmdb"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2832,7 +2731,7 @@
<target name="mdbsessionpoolclear"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2873,7 +2772,7 @@
<target name="mdb"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2906,7 +2805,7 @@
<target name="mdbtopic"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2937,7 +2836,7 @@
<target name="concurrent"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2950,7 +2849,7 @@
<target name="consumer"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2971,7 +2870,7 @@
<target name="tableperclass"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -2987,7 +2886,7 @@
<target name="dependent"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3003,7 +2902,7 @@
<!--target name="concurrent"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3017,7 +2916,7 @@
<target name="descriptortypo"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3033,7 +2932,7 @@
<target name="statefulproxyfactoryoverride"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3056,7 +2955,7 @@
<target name="stateful"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3077,7 +2976,7 @@
<!--target name="seam"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3094,7 +2993,7 @@
<target name="aspectdomain"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3111,7 +3010,7 @@
<target name="ejbthree1090"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3127,7 +3026,7 @@
<target name="ejbcontext"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3143,7 +3042,7 @@
<target name="iiop"
description="Builds iiop.jar."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3160,7 +3059,7 @@
<target name="tck5sec"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3187,7 +3086,7 @@
<target name="security"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3259,7 +3158,7 @@
<target name="homeinterface"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3275,7 +3174,7 @@
<target name="libdeployment"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3304,7 +3203,7 @@
<target name="stateless"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3323,7 +3222,7 @@
<target name="ejbthree1092"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3339,7 +3238,7 @@
<target name="statelesscreation"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3358,7 +3257,7 @@
<target name="removedislocal"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3372,7 +3271,7 @@
<target name="defaultremotebindings"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3388,7 +3287,7 @@
<target name="localfromremote"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3421,7 +3320,7 @@
<target name="concurrentnaming"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3434,7 +3333,7 @@
<target name="propertyreplacement"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3456,7 +3355,7 @@
<target name="invoker"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3469,7 +3368,7 @@
<target name="circulardependency"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3485,7 +3384,7 @@
<target name="changexml"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3501,7 +3400,7 @@
<target name="servicedependency"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3514,7 +3413,7 @@
<target name="stateless14"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3530,6 +3429,7 @@
</fileset>
</delete>
+ <!--
<javac destdir="${build.classes}"
optimize="${javac.optimize}"
debug="${javac.debug}"
@@ -3546,12 +3446,13 @@
<include name="org/jboss/ejb3/test/stateless14/**/*.java"/>
<exclude name="org/jboss/ejb3/test/stateless14/**/*Bean.java"/>
</javac>
+ -->
</target>
<!-- TODO use the other jacc target once the jars from hibernate are updated (changes already made to hibernate) -->
<target name="jacc"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3572,7 +3473,7 @@
<!--
<target name="jacc"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3603,7 +3504,7 @@
<target name="service"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3634,7 +3535,7 @@
<target name="entitycallback"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3650,7 +3551,7 @@
<target name="secondary"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3666,7 +3567,7 @@
<target name="xmlcfg"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3680,13 +3581,13 @@
</jar>
</target>
- <target name="xpcalt" depends="compile-classes">
+ <target name="xpcalt" >
<build-simple-jar name="xpcalt"/>
</target>
<target name="clusteredentity"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -3832,7 +3733,7 @@
<target name="clusteredsession"
description="Builds all jar files."
- depends="compile-classes">
+ >
<mkdir dir="${build.lib}"/>
@@ -4208,8 +4109,7 @@
</target>
<target name="standalone-jar"
- description="Builds all jar files."
- depends="compile-classes">
+ description="Builds all jar files.">
<mkdir dir="${build.lib}/embeddable/standalone"/>
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-01-30 06:53:30 UTC (rev 69480)
+++ projects/ejb3/trunk/core/pom.xml 2008-01-30 06:57:50 UTC (rev 69481)
@@ -28,38 +28,18 @@
<!-- Properties -->
<properties>
-
- <!--
- <resources>${project.basedir}/src/resources/test</resources>
- <build.test.lib>${project.build.directory}/test-lib</build.test.lib>
- <directory>output</directory>
- <outputDirectory>output/classes</outputDirectory>
- <testOutputDirectory>output/test-classes</testOutputDirectory>
-
- -->
+
</properties>
<!-- Build Information -->
<build>
-
- <!--
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- <directory>${directory}</directory>
- <finalName>${artifactId}</finalName>
- -->
-
- <!--
+ <plugins>
- Commented out for time being; tests to be run manually via ant
- <plugins>
+ <!-- Antrun Plugin Configuration -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<id>build-tests</id>
@@ -69,33 +49,71 @@
<phase>package</phase>
<configuration>
<tasks>
+
+ <!-- Set the jboss-test CP -->
+ <property name="jboss.test.path" value="${project.build.directory}/dependencies/lib/jboss-test/jboss-test.jar" />
+
+ <!-- Excute the Test Build -->
<ant antfile="build-test.xml" />
- !-
-
- property name="java.vm.version" value="${java.vm.version}"/>
- <mkdir dir="${build.test.lib}"/>
-
- <jar jarfile="${build.test.lib}/stateless-test.jar">
- <fileset dir="${testOutputDirectory}">
- <include name="org/jboss/ejb3/test/stateless/*.class"/>
- </fileset>
- <fileset dir="${resources}">
- <include name="users.properties"/>
- <include name="roles.properties"/>
- </fileset>
- </jar-
+
</tasks>
</configuration>
</execution>
</executions>
</plugin>
- </plugins>
- -->
- <!-- Temporarily, don't run any tests here -->
- <plugins>
+
+ <!-- Dependency Plugin Configuration -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+
+ <!-- Unpack requisite build scripts -->
+ <execution>
+ <id>unpack-build-scripts</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/dependencies/unpacked/jboss-test</outputDirectory>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </execution>
+
+ <!-- Copy jboss-test JAR -->
+ <execution>
+ <id>copy-jboss-test</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/dependencies/lib/jboss-test</outputDirectory>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <!-- Temporarily, don't run any tests here -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
@@ -110,6 +128,11 @@
<!-- Dependencies -->
<dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>3</version>
+ </dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
More information about the jboss-cvs-commits
mailing list