ammulder 2004/11/08 20:35:26
Modified: modules/assembly maven.xml
Log:
Make the new deployer the only deployer (will required updated Geronimo
libs for standalone OpenEJB builds)
Revision Changes Path
1.13 +5 -20 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maven.xml 8 Nov 2004 15:47:27 -0000 1.12
+++ maven.xml 9 Nov 2004 01:35:26 -0000 1.13
@@ -150,25 +150,10 @@
deploymentFactory="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl"
/>
- <!-- 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="--plan"/>
- <ant:arg value="target/plan/deployer-system-plan.xml"/>
- <ant:arg value="--outfile"/>
- <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:java fork="true" jar="${distDir}/bin/deployer.jar"
failonerror="true">
<ant:jvmarg value="-ea"/>
<ant:arg value="package"/>
<ant:arg value="--mainClass"/>
@@ -182,7 +167,7 @@
<!-- build the J2EEServer configuration -->
<ant:echo>Building server configuration</ant:echo>
- <ant:java fork="true" jar="${distDir}/bin/new-deployer.jar"
failonerror="true">
+ <ant:java fork="true" jar="${distDir}/bin/deployer.jar"
failonerror="true">
<ant:jvmarg value="-ea"/>
<ant:arg value="distribute"/>
<ant:arg value="target/plan/j2ee-server-plan.xml"/>
@@ -190,7 +175,7 @@
<!-- building tranql connector default database configuration-->
<ant:echo>Building default database configuration</ant:echo>
- <ant:java fork="true" jar="${distDir}/bin/new-deployer.jar"
failonerror="true">
+ <ant:java fork="true" jar="${distDir}/bin/deployer.jar"
failonerror="true">
<ant:jvmarg value="-ea"/>
<ant:arg value="distribute"/>
<ant:arg value="target/plan/default-database-plan.xml"/>
@@ -200,7 +185,7 @@
<!-- building security configuration-->
<ant:echo>Building security configuration</ant:echo>
- <ant:java fork="true" jar="${distDir}/bin/new-deployer.jar"
failonerror="true">
+ <ant:java fork="true" jar="${distDir}/bin/deployer.jar"
failonerror="true">
<ant:jvmarg value="-ea"/>
<ant:arg value="distribute"/>
<ant:arg value="target/plan/security-plan.xml"/>
