dain 2004/02/13 15:18:59
Modified: assembly maven.xml
Log:
Added an empty file at META-INF/server-jar to the bootable jars. Using
this file the server can locate the booted jar and then the base directory.
Removed commented out junk.
Revision Changes Path
1.11 +6 -14 incubator-geronimo/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 13 Feb 2004 18:14:14 -0000 1.10
+++ maven.xml 13 Feb 2004 23:18:59 -0000 1.11
@@ -25,8 +25,6 @@
<!-- ==================== -->
<goal name="default">
-<!-- <attainGoal name="deploy:server"/>-->
-<!-- <attainGoal name="install:server"/>-->
<attainGoal name="build"/>
</goal>
@@ -92,8 +90,11 @@
</ant:copy>
<!-- Create the server.jar file used to run the server-->
+ <ant:touch file="target/.timestamp"/>
<ant:mkdir dir="target/bin"/>
<ant:jar destfile="target/bin/server.jar">
+ <!-- HACK: remove this when we hava target directory to dump
temp files -->
+ <zipfileset file="target/.timestamp"
fullpath="META-INF/startup-jar"/>
<manifest>
<attribute name="Main-Class"
value="org.apache.geronimo.Geronimo"/>
<attribute name="Class-Path" value="${server.classpath}"/>
@@ -102,6 +103,8 @@
<!-- Create the deploy.jar file used to deploy things -->
<ant:jar destfile="target/bin/deploy.jar">
+ <!-- HACK: remove this when we hava target directory to dump
temp files -->
+ <zipfileset file="target/.timestamp"
fullpath="META-INF/startup-jar"/>
<manifest>
<attribute name="Main-Class"
value="org.apache.geronimo.deployment.Deployer"/>
<attribute name="Class-Path" value="${deploy.classpath}"/>
@@ -166,17 +169,6 @@
<ant:arg value="--deployer"/>
<ant:arg value="org/apache/geronimo/ServiceDeployer"/>
</ant:java>
--->
-
- <!--
- <j:set var="g.repo" value="${maven.repo.local}/geronimo/jars"/>
- <ant:mkdir dir="${basedir}/target/config"/>
- <ant:echo message="in deploy:server"/>
- <deploy:deploy
- deployconfigid="org/apache/geronimo/Server"
- deployoutfile="target/config/server.car"
-
deployurl="${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar,${g.repo}/geronimo-web-console-package-DEV.jar,${maven.repo.local}/concurrent/jars/concurrent-1.3.2.jar,${maven.repo.local}/xerces/jars/xercesImpl-2.6.0.jar,${maven.repo.local}/xml-apis/jars/xml-apis-1.0.b2.jar,${maven.repo.local}/xml-commons-resolver/jars/xml-commons-resolver-1.1.jar,${maven.repo.local}/geronimo/jars/geronimo-core-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-deployment-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-common-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/loglog4j-service-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/server-info-${pom.currentVersion}.jar"/>
- <ant:echo message="did deploy:server"/>
-->
</goal>
