Author: djencks
Date: Fri Oct 7 14:28:21 2005
New Revision: 307199
URL: http://svn.apache.org/viewcvs?rev=307199&view=rev
Log:
parameterize the version
Modified:
geronimo/trunk/applications/magicGball/maven.xml
geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml
geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml
Modified: geronimo/trunk/applications/magicGball/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/maven.xml?rev=307199&r1=307198&r2=307199&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/maven.xml (original)
+++ geronimo/trunk/applications/magicGball/maven.xml Fri Oct 7 14:28:21 2005
@@ -6,6 +6,7 @@
xmlns:j="jelly:core"
xmlns:u="jelly:util"
xmlns:ant="jelly:ant"
+ xmlns:velocity="jelly:velocity"
xmlns:deploy="geronimo:deploy">
<goal name="default" prereqs="ear"/>
@@ -13,6 +14,33 @@
<goal name="rebuild" prereqs="clean,build"/>
+ <goal name="filter">
+ <fileScanner var="plans">
+ <fileset dir="${basedir}/src/plan">
+ <include name="*-plan.xml"/>
+ </fileset>
+ </fileScanner>
+
+ <!-- Prepare the web container -->
+ <ant:mkdir dir="${basedir}/target/tmp"/>
+
+ <ant:mkdir dir="${basedir}/target/plan"/>
+ <j:forEach var="plan" items="${plans.iterator()}">
+ <j:set var="planName" value="${plan.name}"/>
+ <echo>Preprocessing plan ${planName}</echo>
+ <velocity:merge
+ basedir="${basedir}/src/plan"
+ template="${planName}"
+ name="${basedir}/target/plan/${planName}"/>
+ </j:forEach>
+
+ <ant:mkdir dir="${basedir}/target/resources/ear/META-INF"/>
+ <velocity:merge
+ basedir="${basedir}/src/resources/ear/META-INF"
+ template="application.xml"
+ name="${basedir}/target/resources/ear/META-INF/application.xml"/>
+ </goal>
+
<goal name="ejb" prereqs="java:compile">
<ant:jar destfile="target/${pom.artifactId}-ejb-${geronimo_version}.jar">
<fileset dir="target/classes">
@@ -38,14 +66,14 @@
</ant:jar>
</goal>
- <goal name="ear" prereqs="ejb,war:war,client">
+ <goal name="ear" prereqs="ejb,war:war,client,filter">
<ant:jar destfile="target/${pom.artifactId}-${geronimo_version}.ear">
<fileset dir="target">
<include name="${pom.artifactId}-ejb-${geronimo_version}.jar"/>
<include name="${pom.artifactId}-client-${geronimo_version}.jar"/>
<include name="${pom.artifactId}-${geronimo_version}.war"/>
</fileset>
- <fileset dir="src/resources/ear"/>
+ <fileset dir="target/resources/ear"/>
</ant:jar>
</goal>
@@ -82,7 +110,7 @@
username="system"
password="manager"
module="${basedir}/target/magicGball-${geronimo_version}.ear"
- plan="${basedir}/src/plan/magicgball-corba-plan.xml"/>
+ plan="${basedir}/target/plan/magicgball-corba-plan.xml"/>
</goal>
<goal name="startApp">
<deploy:start
@@ -108,20 +136,19 @@
<goal name="runClient" prereqs="initVars">
<j:if test="${context.getVariable('enable.debug') == 'true'}">
- <j:set var="geronimo.client.debug.options" value="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5003"/>
- </j:if>
- <java classname="org.apache.geronimo.system.main.ClientCommandLine" fork="yes"
+ <j:set var="geronimo.client.debug.options" value="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5003"/>
+ </j:if>
+ <java classname="org.apache.geronimo.system.main.ClientCommandLine" fork="yes"
jvmargs="${geronimo.client.debug.options} ${geronimo.corba.options} ${geronimo.ssl.options}">
<classpath>
<pathelement location="${maven.build.dir}/geronimo-${geronimo_version}/bin/client.jar"/>
</classpath>
-<!-- <jvmarg value="${geronimo.server.corba.options}"/>-->
+ <!-- <jvmarg value="${geronimo.server.corba.options}"/>-->
<arg value="org/apache/geronimo/MagicGBallClient"/>
<arg value="foo"/>
<arg value="bar"/>
</java>
</goal>
-
</project>
Modified: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml?rev=307199&r1=307198&r2=307199&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml Fri Oct
7 14:28:21 2005
@@ -9,7 +9,7 @@
</import>
<module>
- <ejb>magicGball-ejb-1.0-SNAPSHOT.jar</ejb>
+ <ejb>magicGball-ejb-${geronimo_version}.jar</ejb>
<openejb-jar
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
configId="MagicGBallEJB"
@@ -26,14 +26,14 @@
</module>
<module>
- <web>magicGball-1.0-SNAPSHOT.war</web>
+ <web>magicGball-${geronimo_version}.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="MagicGBallWAR">
<context-priority-classloader>false</context-priority-classloader>
</web-app>
</module>
<module>
- <java>magicGball-client-1.0-SNAPSHOT.jar</java>
+ <java>magicGball-client-${geronimo_version}.jar</java>
<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
configId="client"
clientConfigId="org/apache/geronimo/MagicGBallClient"
Modified: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml?rev=307199&r1=307198&r2=307199&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml Fri Oct 7 14:28:21
2005
@@ -9,7 +9,7 @@
</import>
<module>
- <ejb>magicGball-ejb-1.0-SNAPSHOT.jar</ejb>
+ <ejb>magicGball-ejb-${geronimo_version}.jar</ejb>
<openejb-jar
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
configId="MagicGBallEJB"
@@ -26,14 +26,14 @@
</module>
<module>
- <web>magicGball-1.0-SNAPSHOT.war</web>
+ <web>magicGball-${geronimo_version}.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="MagicGBallWAR">
<context-priority-classloader>false</context-priority-classloader>
</web-app>
</module>
<module>
- <java>magicGball-client-1.0-SNAPSHOT.jar</java>
+ <java>magicGball-client-${geronimo_version}.jar</java>
<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
configId="client"
clientConfigId="org/apache/geronimo/MagicGBallClient"
Modified: geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml?rev=307199&r1=307198&r2=307199&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml (original)
+++ geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml Fri
Oct 7 14:28:21 2005
@@ -3,15 +3,15 @@
<application>
<display-name>MagicGBall</display-name>
<module>
- <ejb>magicGball-ejb-1.0-SNAPSHOT.jar</ejb>
+ <ejb>magicGball-ejb-${geronimo_version}.jar</ejb>
</module>
<module>
<web>
- <web-uri>magicGball-1.0-SNAPSHOT.war</web-uri>
+ <web-uri>magicGball-${geronimo_version}.war</web-uri>
<context-root>magicGball</context-root>
</web>
</module>
<module>
- <java>magicGball-client-1.0-SNAPSHOT.jar</java>
+ <java>magicGball-client-${geronimo_version}.jar</java>
</module>
</application>
|