ammulder 2004/11/05 00:42:45
Modified: modules/assembly maven.xml project.xml
Log:
Use the new Geronimo deployer
Revision Changes Path
1.11 +25 -16 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 12 Sep 2004 17:11:53 -0000 1.10
+++ maven.xml 5 Nov 2004 05:42:45 -0000 1.11
@@ -150,49 +150,58 @@
deploymentFactory="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl"
/>
- <!-- build the system configuration and server.jar -->
- <ant:echo>Building system configuration</ant:echo>
+ <!-- build the new deployer JAR -->
+ <ant:echo>Building new-deployer.jar</ant:echo>
<ant:mkdir dir="${distDir}/bin"/>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
<ant:jvmarg value="-ea"/>
- <ant:arg value="--install"/>
<ant:arg value="--plan"/>
- <ant:arg value="target/plan/system-plan.xml"/>
+ <ant:arg value="target/plan/deployer-system-plan.xml"/>
<ant:arg value="--outfile"/>
- <ant:arg value="${distDir}/bin/server.jar"/>
+ <ant:arg value="${distDir}/bin/new-deployer.jar"/>
+ <ant:arg value="--mainClass"/>
+ <ant:arg value="org.apache.geronimo.deployment.cli.DeployTool"/>
+ <ant:arg value="--classPath"/>
+ <ant:arg value="${deploy.classpath}"/>
+ </ant:java>
+
+ <!-- build the system configuration and server.jar -->
+ <ant:echo>Building system configuration</ant:echo>
+ <ant:mkdir dir="${distDir}/bin"/>
+ <ant:java fork="true" jar="${distDir}/bin/new-deployer.jar"
failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="package"/>
<ant:arg value="--mainClass"/>
<ant:arg value="org.apache.geronimo.system.main.Daemon"/>
<ant:arg value="--classPath"/>
<ant:arg value="${server.classpath}"/>
+ <ant:arg value="target/plan/system-plan.xml"/>
+ <ant:arg value="${distDir}/bin/server.jar"/>
</ant:java>
<!-- build the J2EEServer configuration -->
<ant:echo>Building server configuration</ant:echo>
- <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:java fork="true" jar="${distDir}/bin/new-deployer.jar"
failonerror="true">
<ant:jvmarg value="-ea"/>
- <ant:arg value="--install"/>
- <ant:arg value="--plan"/>
+ <ant:arg value="distribute"/>
<ant:arg value="target/plan/j2ee-server-plan.xml"/>
</ant:java>
<!-- building tranql connector default database configuration-->
<ant:echo>Building default database configuration</ant:echo>
- <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:java fork="true" jar="${distDir}/bin/new-deployer.jar"
failonerror="true">
<ant:jvmarg value="-ea"/>
- <ant:arg value="--install"/>
- <ant:arg value="--plan"/>
+ <ant:arg value="distribute"/>
<ant:arg value="target/plan/default-database-plan.xml"/>
- <ant:arg value="--module"/>
<ant:arg
value="${maven.repo.local}/tranql/rars/tranql-connector-${tranql_connector_version}.rar"/>
</ant:java>
<!-- building security configuration-->
<ant:echo>Building security configuration</ant:echo>
- <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:java fork="true" jar="${distDir}/bin/new-deployer.jar"
failonerror="true">
<ant:jvmarg value="-ea"/>
- <ant:arg value="--install"/>
- <ant:arg value="--plan"/>
+ <ant:arg value="distribute"/>
<ant:arg value="target/plan/security-plan.xml"/>
</ant:java>
1.24 +4 -2 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- project.xml 2 Nov 2004 03:31:01 -0000 1.23
+++ project.xml 5 Nov 2004 05:42:45 -0000 1.24
@@ -230,7 +230,9 @@
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
<version>&geronimo-spec-j2ee-deployment-version;</version>
<properties>
- <clideployer>true</clideployer>
+ <lib>true</lib>
+ <deploy>true</deploy>
+ <repository>true</repository>
</properties>
</dependency>
