dain 2005/08/30 02:27:47
Modified: modules/itests maven.xml project.xml
Log:
Updated to latest geronimo deployment plugin.
Revision Changes Path
1.32 +7 -10 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- maven.xml 29 Aug 2005 23:30:10 -0000 1.31
+++ maven.xml 30 Aug 2005 06:27:47 -0000 1.32
@@ -86,21 +86,18 @@
name="${basedir}/target/plan/${planName}"/>
</j:forEach>
- <ant:delete dir="${maven.build.dir}/geronimo"/>
- <deploy:unpackServer
- geronimoVersion="${geronimo_version}"
- geronimoName="geronimo"
- targetDir="${maven.build.dir}/geronimo"/>
- <ant:copy todir="${maven.build.dir}/geronimo/var/certstores">
+ <ant:delete dir="${maven.build.dir}/geronimo-${geronimo_version}"/>
+ <deploy:unpackServer geronimoVersion="${geronimo_version}"/>
+ <ant:copy
todir="${maven.build.dir}/geronimo-${geronimo_version}/var/certstores">
<ant:fileset dir="src/test-resources"
includes="keystore,truststore"/>
</ant:copy>
-<!-- <ant:copy todir="${maven.build.dir}/geronimo/var">-->
+<!-- <ant:copy
todir="${maven.build.dir}/geronimo-${geronimo_version}/var">-->
<!-- <ant:fileset dir="src/var"/>-->
<!-- </ant:copy>-->
<deploy:startRemoteServer
- geronimoTarget="${maven.build.dir}/geronimo"
+ geronimoTarget="${maven.build.dir}/geronimo-${geronimo_version}"
vmArgs="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -Xmx512m
-XX:MaxPermSize=128m ${corba.vmargs}"
configs="org/apache/geronimo/DefaultDatabase"/>
<ant:echo message="Waiting for server at: ${geronimoTarget}"/>
@@ -360,7 +357,7 @@
<goal name="svr:start">
<deploy:startRemoteServer
- geronimoTarget="${maven.build.dir}/geronimo"
+ geronimoTarget="${maven.build.dir}/geronimo-${geronimo_version}"
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.35 +4 -10 openejb/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.xml 26 Aug 2005 02:43:14 -0000 1.34
+++ project.xml 30 Aug 2005 06:27:47 -0000 1.35
@@ -54,14 +54,6 @@
<version>${geronimo_version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-remoting</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- -->
-
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
@@ -107,8 +99,10 @@
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-assembly</artifactId>
+ <artifactId>geronimo</artifactId>
<version>${geronimo_version}</version>
+ <jar>geronimo-${geronimo_version}.zip</jar>
+ <type>distribution</type>
</dependency>
<dependency>
