dain 2005/11/30 18:23:00
Modified: modules/itests maven.xml project.properties
Log:
Updated itests for new geronimo configuration ids
Revision Changes Path
1.38 +173 -88 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- maven.xml 18 Oct 2005 01:43:05 -0000 1.37
+++ maven.xml 30 Nov 2005 23:23:00 -0000 1.38
@@ -64,13 +64,145 @@
<goal name="default" prereqs="ejb:install"/>
+ <preGoal name="ejb:ejb">
+ <attainGoal name="buildTestJars"/>
+ </preGoal>
+
+ <goal name="buildTestJars">
+ <!-- openejb-itest-${openejb_version}.jar -->
+ <!-- Note: jar is built by ejb:ejb -->
+ <ant:mkdir dir="${maven.build.dir}/ejb/META-INF"/>
+ <ant:copy todir="${maven.build.dir}/ejb">
+ <ant:fileset dir="${basedir}/src/ejb"
excludes="META-INF/openejb-jar.xml"/>
+ </ant:copy>
+ <velocity:merge
+ basedir="${basedir}/src/ejb/META-INF"
+ template="openejb-jar.xml"
+ name="${maven.build.dir}/ejb/META-INF/openejb-jar.xml"/>
+
+ <!-- openejb-security-001.jar -->
+ <ant:mkdir dir="${maven.build.dir}/scenarios/001"/>
+ <ant:copy todir="${maven.build.dir}/scenarios/001">
+ <ant:fileset dir="${basedir}/src/scenarios/001"
excludes="openejb-jar.xml"/>
+ </ant:copy>
+ <velocity:merge
+ basedir="${basedir}/src/scenarios/001"
+ template="openejb-jar.xml"
+ name="${maven.build.dir}/scenarios/001/openejb-jar.xml"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-security-001.jar">
+ <fileset dir="${maven.build.dir}/classes"
includes="**/security/**/*.class"/>
+ <metainf dir="${maven.build.dir}/scenarios/001" includes="*.xml"/>
+ </ant:jar>
+
+ <!-- openejb-security-002.jar -->
+ <ant:mkdir dir="${maven.build.dir}/scenarios/002"/>
+ <ant:copy todir="${maven.build.dir}/scenarios/002">
+ <ant:fileset dir="${basedir}/src/scenarios/002"
excludes="openejb-jar.xml"/>
+ </ant:copy>
+ <velocity:merge
+ basedir="${basedir}/src/scenarios/002"
+ template="openejb-jar.xml"
+ name="${maven.build.dir}/scenarios/002/openejb-jar.xml"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-security-002.jar">
+ <fileset dir="${maven.build.dir}/classes"
includes="**/security/**/*.class"/>
+ <metainf dir="${maven.build.dir}/scenarios/002" includes="*.xml"/>
+ </ant:jar>
+
+ <!-- openejb-security-003.jar -->
+ <ant:mkdir dir="${maven.build.dir}/scenarios/003"/>
+ <ant:copy todir="${maven.build.dir}/scenarios/003">
+ <ant:fileset dir="${basedir}/src/scenarios/003"
excludes="openejb-jar.xml"/>
+ </ant:copy>
+ <velocity:merge
+ basedir="${basedir}/src/scenarios/003"
+ template="openejb-jar.xml"
+ name="${maven.build.dir}/scenarios/003/openejb-jar.xml"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-security-003.jar">
+ <fileset dir="${maven.build.dir}/classes">
+ <include name="**/interop/**/*.class"/>
+ <include name="**/security/slsb/BasicStatelessHome.class"/>
+ <include name="**/security/slsb/BasicStateless.class"/>
+ </fileset>
+ <metainf dir="${maven.build.dir}/scenarios/003" includes="*.xml"/>
+ </ant:jar>
+
+ <!-- openejb-cmp2-prefetch.jar -->
+ <ant:mkdir dir="${maven.build.dir}/cmp2/prefetch"/>
+ <ant:copy todir="${maven.build.dir}/cmp2/prefetch">
+ <ant:fileset dir="${basedir}/src/cmp2/prefetch"
excludes="openejb-jar.xml"/>
+ </ant:copy>
+ <velocity:merge
+ basedir="${basedir}/src/cmp2/prefetch"
+ template="openejb-jar.xml"
+ name="${maven.build.dir}/cmp2/prefetch/openejb-jar.xml"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-cmp2-prefetch.jar">
+ <fileset dir="${maven.build.dir}/classes">
+ <include name="**/cmp2/model/*.class"/>
+ <include name="**/cmp2/prefetch/*.class"/>
+ <include name="**/TestFailureException.class"/>
+ </fileset>
+ <metainf dir="${maven.build.dir}/cmp2/prefetch" includes="*.xml"/>
+ </ant:jar>
+
+ <!-- openejb-cmp2-cmrmapping.jar -->
+ <ant:mkdir dir="${maven.build.dir}/cmp2/cmrmapping"/>
+ <ant:copy todir="${maven.build.dir}/cmp2/cmrmapping">
+ <ant:fileset dir="${basedir}/src/cmp2/cmrmapping"
excludes="openejb-jar.xml"/>
+ </ant:copy>
+ <velocity:merge
+ basedir="${basedir}/src/cmp2/cmrmapping"
+ template="openejb-jar.xml"
+ name="${maven.build.dir}/cmp2/cmrmapping/openejb-jar.xml"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-cmp2-cmrmapping.jar">
+ <fileset dir="${maven.build.dir}/classes">
+ <include name="**/cmp2/cmrmapping/*.class"/>
+ <include name="**/TestFailureException.class"/>
+ </fileset>
+ <metainf dir="${maven.build.dir}/cmp2/cmrmapping"
includes="*.xml"/>
+ </ant:jar>
+
+ <!-- openejb-cmp2-petstore.jar -->
+ <ant:mkdir dir="${maven.build.dir}/cmp2/petstore"/>
+ <ant:copy todir="${maven.build.dir}/cmp2/petstore">
+ <ant:fileset dir="${basedir}/src/cmp2/petstore"
excludes="openejb-jar.xml"/>
+ </ant:copy>
+ <velocity:merge
+ basedir="${basedir}/src/cmp2/petstore"
+ template="openejb-jar.xml"
+ name="${maven.build.dir}/cmp2/petstore/openejb-jar.xml"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-cmp2-petstore.jar">
+ <fileset dir="${maven.build.dir}/classes">
+ <include name="**/cmp2/petstore/*.class"/>
+ <include name="**/TestFailureException.class"/>
+ </fileset>
+ <metainf dir="${maven.build.dir}/cmp2/petstore" includes="*.xml"/>
+ </ant:jar>
+
+
+ <!-- openejb-cmp2-storage.jar -->
+ <ant:mkdir dir="${maven.build.dir}/cmp2/storage"/>
+ <ant:copy todir="${maven.build.dir}/cmp2/storage">
+ <ant:fileset dir="${basedir}/src/cmp2/storage"
excludes="openejb-jar.xml"/>
+ </ant:copy>
+ <velocity:merge
+ basedir="${basedir}/src/cmp2/storage"
+ template="openejb-jar.xml"
+ name="${maven.build.dir}/cmp2/storage/openejb-jar.xml"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-cmp2-storage.jar">
+ <fileset dir="${maven.build.dir}/classes">
+ <include name="**/cmp2/model/Storage*.class"/>
+ </fileset>
+ <metainf dir="${maven.build.dir}/cmp2/storage" includes="*.xml"/>
+ </ant:jar>
+ </goal>
+
<postGoal name="ejb:install">
<attainGoal name="itest"/>
</postGoal>
<preGoal name="itest:setup">
<!-- Preprocess all plans using velocity -->
- <ant:mkdir dir="${basedir}/target/plan"/>
+ <ant:mkdir dir="${maven.build.dir}/plan"/>
<fileScanner var="plans">
<fileset dir="${basedir}/src/plan">
<include name="*-plan.xml"/>
@@ -83,7 +215,7 @@
<velocity:merge
basedir="${basedir}/src/plan"
template="${planName}"
- name="${basedir}/target/plan/${planName}"/>
+ name="${maven.build.dir}/plan/${planName}"/>
</j:forEach>
<ant:delete dir="${maven.build.dir}/geronimo-${geronimo_version}"/>
@@ -107,160 +239,113 @@
username="system"
password="manager"
maxtries="125"
- id="org/apache/geronimo/JettyRuntimeDeployer"/>
+ id="geronimo/jetty-runtime-deployer/${geronimo_version}/car"/>
<echo message="runtime deployer has started"/>
<u:sleep millis="7000"/>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- plan="${basedir}/target/plan/security-plan.xml" />
+ plan="${maven.build.dir}/plan/security-plan.xml" />
<echo message="deployed test security configuration"/>
<echo message="deploying itests... this will take a while"/>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
-
module="${basedir}/target/openejb-itests-${pom.currentVersion}.jar" />
+
module="${maven.build.dir}/openejb-itests-${pom.currentVersion}.jar" />
<echo message="deployed ejbs"/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/Itests"/>
- <ant:jar destfile="${basedir}/target/openejb-security-001.jar">
- <fileset dir="${basedir}/target/classes"
includes="**/security/**/*.class"/>
- <metainf dir="${basedir}/src/scenarios/001" includes="*.xml"/>
- </ant:jar>
-
- <ant:jar destfile="${basedir}/target/openejb-security-002.jar">
- <fileset dir="${basedir}/target/classes"
includes="**/security/**/*.class"/>
- <metainf dir="${basedir}/src/scenarios/002" includes="*.xml"/>
- </ant:jar>
-
- <ant:jar destfile="${basedir}/target/openejb-security-003.jar">
- <fileset dir="${basedir}/target/classes">
- <include name="**/interop/**/*.class"/>
- <include name="**/security/slsb/BasicStatelessHome.class"/>
- <include name="**/security/slsb/BasicStateless.class"/>
- </fileset>
- <metainf dir="${basedir}/src/scenarios/003" includes="*.xml"/>
- </ant:jar>
-
+ id="openejb/itests/${openejb_version}/car"/>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-security-001.jar"
+ module="${maven.build.dir}/openejb-security-001.jar"
/>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-security-002.jar"
+ module="${maven.build.dir}/openejb-security-002.jar"
/>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-security-003.jar"
+ module="${maven.build.dir}/openejb-security-003.jar"
/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario001"/>
+ id="openejb/itests-security-scenario001/${openejb_version}/car"/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario002"/>
+ id="openejb/itests-security-scenario002/${openejb_version}/car"/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario003"/>
+ id="openejb/itests-security-scenario003/${openejb_version}/car"/>
<!-- Prefetch Tests -->
- <ant:jar destfile="${basedir}/target/openejb-cmp2-prefetch.jar">
- <fileset dir="${basedir}/target/classes">
- <include name="**/cmp2/model/*.class"/>
- <include name="**/cmp2/prefetch/*.class"/>
- <include name="**/TestFailureException.class"/>
- </fileset>
- <metainf dir="${basedir}/src/cmp2/prefetch" includes="*.xml"/>
- </ant:jar>
<attainGoal name="antIntegration"/>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-cmp2-prefetch.jar"
+ module="${maven.build.dir}/openejb-cmp2-prefetch.jar"
/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/Prefetch"/>
+ id="openejb/cmp2-prefetch/${openejb_version}/car"/>
<!-- CMR Mapping Tests -->
- <ant:jar destfile="${basedir}/target/openejb-cmp2-cmrmapping.jar">
- <fileset dir="${basedir}/target/classes">
- <include name="**/cmp2/cmrmapping/*.class"/>
- <include name="**/TestFailureException.class"/>
- </fileset>
- <metainf dir="${basedir}/src/cmp2/cmrmapping" includes="*.xml"/>
- </ant:jar>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-cmp2-cmrmapping.jar"
+ module="${maven.build.dir}/openejb-cmp2-cmrmapping.jar"
/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/CMRMapping"/>
+ id="openejb/cmp2-cmrmapping/${openejb_version}/car"/>
<!-- PK Generator Tests -->
- <ant:jar destfile="${basedir}/target/openejb-cmp2-petstore.jar">
- <fileset dir="${basedir}/target/classes">
- <include name="**/cmp2/petstore/*.class"/>
- <include name="**/TestFailureException.class"/>
- </fileset>
- <metainf dir="${basedir}/src/cmp2/petstore" includes="*.xml"/>
- </ant:jar>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-cmp2-petstore.jar"
+ module="${maven.build.dir}/openejb-cmp2-petstore.jar"
/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/petstore"/>
+ id="openejb/cmp2-petstore/${openejb_version}/car"/>
<!-- Storage Tests -->
- <ant:jar destfile="${basedir}/target/openejb-cmp2-storage.jar">
- <fileset dir="${basedir}/target/classes">
- <include name="**/cmp2/model/Storage*.class"/>
- </fileset>
- <metainf dir="${basedir}/src/cmp2/storage" includes="*.xml"/>
- </ant:jar>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-cmp2-storage.jar"
+ module="${maven.build.dir}/openejb-cmp2-storage.jar"
/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/Storage"/>
+ id="openejb/cmp2-storage/${openejb_version}/car"/>
</preGoal>
<preGoal name="itest:teardown">
@@ -268,45 +353,45 @@
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/CMRMapping"/>
+ id="openejb/cmp2-cmrmapping/${openejb_version}/car"/>
<deploy:undeploy
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/CMRMapping"/>
+ id="openejb/cmp2-cmrmapping/${openejb_version}/car"/>
<deploy:stop
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/Storage"/>
+ id="openejb/cmp2-storage/${openejb_version}/car"/>
<deploy:undeploy
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/Storage"/>
+ id="openejb/cmp2-storage/${openejb_version}/car"/>
<deploy:stop
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/petstore"/>
+ id="openejb/cmp2-petstore/${openejb_version}/car"/>
<deploy:undeploy
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/petstore"/>
+ id="openejb/cmp2-petstore/${openejb_version}/car"/>
<deploy:stop
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/Prefetch"/>
+ id="openejb/cmp2-prefetch/${openejb_version}/car"/>
<deploy:undeploy
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/cmp2/Prefetch"/>
+ id="openejb/cmp2-prefetch/${openejb_version}/car"/>
<deploy:stop
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
@@ -369,25 +454,25 @@
</goal>
<goal name="sec:start">
- <ant:jar destfile="${basedir}/target/openejb-security-001.jar">
- <fileset dir="${basedir}/target/classes"
includes="**/security/**/*.class"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-security-001.jar">
+ <fileset dir="${maven.build.dir}/classes"
includes="**/security/**/*.class"/>
<metainf dir="${basedir}/src/scenarios/001" includes="*.xml"/>
</ant:jar>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-security-001.jar"
+ module="${maven.build.dir}/openejb-security-001.jar"
/>
- <ant:jar destfile="${basedir}/target/openejb-security-003.jar">
- <fileset dir="${basedir}/target/classes"
includes="**/security/**/*.class"/>
+ <ant:jar destfile="${maven.build.dir}/openejb-security-003.jar">
+ <fileset dir="${maven.build.dir}/classes"
includes="**/security/**/*.class"/>
<metainf dir="${basedir}/src/scenarios/001" includes="*.xml"/>
</ant:jar>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/openejb-security-003.jar"
+ module="${maven.build.dir}/openejb-security-003.jar"
/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
@@ -401,17 +486,17 @@
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario001"/>
+ id="openejb/itests-security-scenario003/${openejb_version}/car"/>
<deploy:stop
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario003"/>
+ id="openejb/itests-security-scenario003/${openejb_version}/car"/>
<deploy:undeploy
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario001"/>
+ id="openejb/itests-security-scenario003/${openejb_version}/car"/>
</goal>
<goal name="antIntegration">
@@ -431,9 +516,9 @@
</ant:taskdef>
<ddlExporter
- ejbJar="jar:${basedir}/target/openejb-cmp2-prefetch.jar"
- openejbJar="jar:${basedir}/target/openejb-cmp2-prefetch.jar"
- output="${basedir}/target/openejb-cmp2-prefetch.sql"
+ ejbJar="jar:${maven.build.dir}/openejb-cmp2-prefetch.jar"
+ openejbJar="jar:${maven.build.dir}/openejb-cmp2-prefetch.jar"
+ output="${maven.build.dir}/openejb-cmp2-prefetch.sql"
ddlCommandBuilder="org.tranql.ddl.DerbyDDLCommandBuilder"
type="drop-create-constraint">
<classpath>
1.37 +3 -1 openejb/modules/itests/project.properties
Index: project.properties
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/project.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- project.properties 1 Nov 2005 22:09:26 -0000 1.36
+++ project.properties 30 Nov 2005 23:23:00 -0000 1.37
@@ -4,6 +4,8 @@
maven.multiproject.type=ejb
+maven.ejb.src=${maven.build.dir}/ejb
+
corba.vmargs=-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl
\
-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl \
-Dorg.openejb.corba.UtilDelegateClass=com.sun.corba.se.internal.POA.ShutdownUtilDelegate
\
