dain 2005/08/25 22:43:15
Modified: modules/itests maven.xml project.properties project.xml
Log:
Removed assembly module. OpenEJB 2 will only ship jars.
Changed itests to use geronimo assembly.
Revision Changes Path
1.30 +55 -13 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- maven.xml 20 Aug 2005 03:49:06 -0000 1.29
+++ maven.xml 26 Aug 2005 02:43:02 -0000 1.30
@@ -55,6 +55,7 @@
xmlns:maven="jelly:maven"
xmlns:u="jelly:util"
xmlns:define="jelly:define"
+ xmlns:velocity="jelly:velocity"
>
<preGoal name="xdoc:jelly-transform">
@@ -68,32 +69,73 @@
</postGoal>
<preGoal name="itest:setup">
- <ant:delete dir="${maven.build.dir}/openejb"/>
+ <!-- Preprocess all plans using velocity -->
+ <ant:mkdir dir="${basedir}/target/plan"/>
+ <fileScanner var="plans">
+ <fileset dir="${basedir}/src/plan">
+ <include name="*-plan.xml"/>
+ </fileset>
+ </fileScanner>
+
+ <j:forEach var="plan" items="${plans.iterator()}">
+ <j:set var="planName" value="${plan.name}"/>
+ <echo>Preprocessing ${planName}</echo>
+ <velocity:merge
+ basedir="${basedir}/src/plan"
+ template="${planName}"
+ name="${basedir}/target/plan/${planName}"/>
+ </j:forEach>
+
+ <ant:delete dir="${maven.build.dir}/geronimo"/>
<deploy:unpackServer
- geronimoVersion="${openejb_version}"
- geronimoName="openejb"
- targetDir="${maven.build.dir}/openejb"/>
- <ant:copy todir="${maven.build.dir}/openejb/var/certstores">
+ geronimoVersion="${geronimo_version}"
+ geronimoName="geronimo"
+ targetDir="${maven.build.dir}/geronimo"/>
+ <ant:copy todir="${maven.build.dir}/geronimo/var/certstores">
<ant:fileset dir="src/test-resources"
includes="keystore,truststore"/>
</ant:copy>
+
+ <ant:copy todir="${maven.build.dir}/geronimo/var">
+ <ant:fileset dir="src/var"/>
+ </ant:copy>
+
<deploy:startRemoteServer
- geronimoTarget="${maven.build.dir}/openejb"
+ geronimoTarget="${maven.build.dir}/geronimo"
vmArgs="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -Xmx512m
-XX:MaxPermSize=128m ${corba.vmargs}"
- configs="org/openejb/Security"/>
+ configs="org/apache/geronimo/DefaultDatabase"/>
<ant:echo message="Waiting for server at: ${geronimoTarget}"/>
<deploy:waitForStarted
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/Security"/>
+ id="org/apache/geronimo/DefaultDatabase"/>
+ <echo message="default database has started"/>
+ <deploy:start
+
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/apache/geronimo/RuntimeDeployer"/>
+ <echo message="runtime deployer starting"/>
+ <deploy:waitForStarted
+
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/apache/geronimo/RuntimeDeployer"/>
+ <echo message="runtime deployer has started"/>
<echo message="server has started"/>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
-
module="${basedir}/target/openejb-itests-${pom.currentVersion}.jar"
- />
- <echo message="distributed ejbs"/>
+ plan="${basedir}/target/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" />
+ <echo message="deployed ejbs"/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
@@ -318,7 +360,7 @@
<goal name="svr:start">
<deploy:startRemoteServer
- geronimoTarget="${maven.build.dir}/openejb"
+ geronimoTarget="${maven.build.dir}/geronimo"
vmArgs="-Xmx512m -XX:MaxPermSize=128m -Xdebug -Xnoagent
-Dcom.sun.CORBA.ORBDebug=transport,giop,subcontract,POA,naming,serviceContext
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 ${corba.vmargs}"
configs="org/openejb/Security"/>
<ant:echo message="Waiting for server at: ${geronimoTarget}"/>
1.34 +3 -2 openejb/modules/itests/project.properties
Index: project.properties
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/project.properties,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- project.properties 23 Jun 2005 00:56:43 -0000 1.33
+++ project.properties 26 Aug 2005 02:43:14 -0000 1.34
@@ -13,7 +13,8 @@
maven.itest.jvmargs=${corba.vmargs}
-Djava.security.auth.login.config=${maven.itest.dest}/login.config
maven.itest.includes=**/CmpTestSuite.java,**/Cmp2TestSuite.java,**/BmpTestSuite.java,**/StatefulTestSuite.java,**/StatelessTestSuite.java
-,**/security/**/*Tests.java,**/interop/**/*Tests.java
+# these don't work
+#maven.itest.includes=,**/security/**/*Tests.java,**/interop/**/*Tests.java
maven.itest.sysproperties=openejb.test.server openejb.test.database
java.security.auth.login.config
openejb.test.server=org.openejb.test.RemoteTestServer
1.34 +4 -4 openejb/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- project.xml 15 Aug 2005 22:48:05 -0000 1.33
+++ project.xml 26 Aug 2005 02:43:14 -0000 1.34
@@ -106,9 +106,9 @@
</dependency>
<dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-assembly</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-assembly</artifactId>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
