geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r358292 - in /geronimo/trunk/sandbox/adventurebuilder: maven.xml project.xml src/plan/adventure1.0.3-jms-ra-plan.xml src/plan/opc1.0.3.ear-plan.xml
Date Wed, 21 Dec 2005 13:34:43 GMT
Author: jlaskowski
Date: Wed Dec 21 05:34:33 2005
New Revision: 358292

URL: http://svn.apache.org/viewcvs?rev=358292&view=rev
Log:
AB deploys properly with the new naming and deployment approaches

WARNING: There's a missing dependency error while deploying OPC module.

Modified:
    geronimo/trunk/sandbox/adventurebuilder/maven.xml
    geronimo/trunk/sandbox/adventurebuilder/project.xml
    geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml
    geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml

Modified: geronimo/trunk/sandbox/adventurebuilder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/maven.xml?rev=358292&r1=358291&r2=358292&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/maven.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/maven.xml Wed Dec 21 05:34:33 2005
@@ -23,6 +23,7 @@
     xmlns:ant="jelly:ant"
     xmlns:deploy="geronimo:deploy"
     xmlns:velocity="jelly:velocity"
+    xmlns:u="jelly:util"
     >
 
     <j:set var="instDir" value="${maven.build.dir}/geronimo-${geronimo_version}"/>
@@ -32,9 +33,25 @@
     </goal>
 
     <goal name="ab:deploy" description="Deploys Adventure Builder" prereqs="clean">
+        <!-- TODO: Make geronimoArtifactId configurable -->
         <deploy:unpackServer
             geronimoVersion="${geronimo_version}"
-            geronimoName="geronimo"/>
+            geronimoArtifactId="geronimo-tomcat-j2ee"/>
+
+        <deploy:startRemoteServer
+            geronimoTarget="${instDir}"/>
+        <ant:echo message="Waiting for server to start at: ${instDir}"/>
+        <!-- TODO: No way to specify vv -->
+        <!-- TODO: Empty id leads to Exception -->
+        <!-- TODO: Use maven properties, e.g. 1.0-SNAPSHOT -->
+        <deploy:waitForStarted
+            uri="jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+            username="system"
+            password="manager"
+            maxTries="120"
+            id="geronimo/j2ee-deployer/1.0-SNAPSHOT/car"/>
+        <echo message="Deployer has started"/>
+        <u:sleep millis="60000"/>
 
         <fileScanner var="plans">
             <fileset dir="${basedir}/src/plan">
@@ -52,90 +69,76 @@
                 name="${maven.build.dir}/plan/${planName}"/>
         </j:forEach>
 
-        <ant:echo>Building JMS Configuration</ant:echo>
-        <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
-            <ant:jvmarg value="-ea"/>
-            <ant:arg value="--offline"/>
-            <ant:arg value="distribute"/>
-            <ant:arg value="${maven.build.dir}/plan/adventure1.0.3-jms-ra-plan.xml"/>
-            <ant:arg value="${maven.repo.local}/activemq/rars/activemq-ra-${activemq_version}.rar"/>
-        </ant:java>
+        <ant:echo>Distributing JMS Configuration</ant:echo>
+        <deploy:distribute
+            uri="deployer:geronimo:jmx"
+            username="system"
+            password="manager"
+            module="${maven.repo.local}/activemq/rars/activemq-ra-${activemq_version}.rar"
+            plan="${maven.build.dir}/plan/adventure1.0.3-jms-ra-plan.xml"/>
 
         <ant:echo>Distributing Database Configuration</ant:echo>
-        <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
-            <ant:jvmarg value="-ea"/>
-            <ant:arg value="--offline"/>
-            <ant:arg value="distribute"/>
-            <ant:arg value="${maven.build.dir}/plan/adventure1.0.1-db-ra-plan.xml"/>
-            <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar"/>
-        </ant:java>
+        <!-- TODO: TranQL version hardcoded -->
+        <deploy:distribute
+            uri="deployer:geronimo:jmx"
+            username="system"
+            password="manager"
+            module="${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-1.1-SNAPSHOT.rar"
+            plan="${maven.build.dir}/plan/adventure1.0.1-db-ra-plan.xml"/>
 
         <ant:echo>Distributing Adventure Builder Consumer Website Application</ant:echo>
-        <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
-            <ant:jvmarg value="-ea"/>
-<!--
-            <ant:jvmarg value="-Xdebug"/>
-            <ant:jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,address=8000"/>
--->
-            <ant:arg value="--offline"/>
-            <ant:arg value="distribute"/>
-            <ant:arg value="${maven.build.dir}/plan/consumerwebsite1.0.1.ear-plan.xml"/>
-            <!--ant:arg value="${ab.home}/project/apps/consumerwebsite/build/consumerwebsite.ear"/-->
-            <ant:arg value="${ab.home}/consumerwebsite.ear"/>
-        </ant:java>
+        <deploy:distribute
+            uri="deployer:geronimo:jmx"
+            username="system"
+            password="manager"
+            module="${ab.home}/consumerwebsite.ear"
+            plan="${maven.build.dir}/plan/consumerwebsite1.0.1.ear-plan.xml"/>
 
         <ant:echo>Distributing Adventure Builder Activity Supplier Application</ant:echo>
-        <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
-            <ant:jvmarg value="-ea"/>
-            <ant:arg value="--offline"/>
-            <ant:arg value="distribute"/>
-            <ant:arg value="${maven.build.dir}/plan/activitysupplier1.0.3.ear-plan.xml"/>
-            <ant:arg value="${ab.home}/activitysupplier.ear"/>
-        </ant:java>
+        <deploy:distribute
+            uri="deployer:geronimo:jmx"
+            username="system"
+            password="manager"
+            module="${ab.home}/activitysupplier.ear"
+            plan="${maven.build.dir}/plan/activitysupplier1.0.3.ear-plan.xml"/>
 
         <ant:echo>Distributing Adventure Builder OPC Application</ant:echo>
-        <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
-            <ant:jvmarg value="-ea"/>
-            <ant:arg value="--offline"/>
-            <ant:arg value="distribute"/>
-            <ant:arg value="${maven.build.dir}/plan/opc1.0.3.ear-plan.xml"/>
-            <ant:arg value="${ab.home}/opc.ear"/>
-        </ant:java>
+        <deploy:distribute
+            uri="deployer:geronimo:jmx"
+            username="system"
+            password="manager"
+            module="${ab.home}/opc.ear"
+            plan="${maven.build.dir}/plan/opc1.0.3.ear-plan.xml"/>
 
         <ant:echo>Distributing Adventure Builder Airline Supplier Application</ant:echo>
-        <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
-            <ant:jvmarg value="-ea"/>
-            <ant:arg value="--offline"/>
-            <ant:arg value="distribute"/>
-            <ant:arg value="${maven.build.dir}/plan/airlinesupplier1.0.3.ear-plan.xml"/>
-            <ant:arg value="${ab.home}/airlinesupplier.ear"/>
-        </ant:java>
+        <deploy:distribute
+            uri="deployer:geronimo:jmx"
+            username="system"
+            password="manager"
+            module="${ab.home}/airlinesupplier.ear"
+            plan="${maven.build.dir}/plan/airlinesupplier1.0.3.ear-plan.xml"/>
 
         <ant:echo>Distributing Adventure Builder Bank Application</ant:echo>
-        <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
-            <ant:jvmarg value="-ea"/>
-            <ant:arg value="--offline"/>
-            <ant:arg value="distribute"/>
-            <ant:arg value="${maven.build.dir}/plan/bank1.0.3.ear-plan.xml"/>
-            <ant:arg value="${ab.home}/bank.ear"/>
-        </ant:java>
+        <deploy:distribute
+            uri="deployer:geronimo:jmx"
+            username="system"
+            password="manager"
+            module="${ab.home}/bank.ear"
+            plan="${maven.build.dir}/plan/bank1.0.3.ear-plan.xml"/>
 
         <ant:echo>Distributing Adventure Lodging Supplier Application</ant:echo>
-        <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
-            <ant:jvmarg value="-ea"/>
-            <ant:arg value="--offline"/>
-            <ant:arg value="distribute"/>
-            <ant:arg value="${maven.build.dir}/plan/lodgingsupplier1.0.3.ear-plan.xml"/>
-            <ant:arg value="${ab.home}/lodgingsupplier.ear"/>
-        </ant:java>
+        <deploy:distribute
+            uri="deployer:geronimo:jmx"
+            username="system"
+            password="manager"
+            module="${ab.home}/lodgingsupplier.ear"
+            plan="${maven.build.dir}/plan/lodgingsupplier1.0.3.ear-plan.xml"/>
 
         <ant:echo>Creating Adventure Builder Database Schema</ant:echo>
-        <j:invokeStatic className="java.lang.System" method="setProperty">
-            <j:arg type="java.lang.String" value="derby.system.home"/>
-            <j:arg type="java.lang.String" value="${instDir}/var/derby"/>
-        </j:invokeStatic>
+        <j:set var="derby.system.home" value="${instDir}/var/derby"/>
         <ant:sql driver="org.apache.derby.jdbc.EmbeddedDriver"
-            url="jdbc:derby:AdventureDB;create=true" userid="" password="">
+            url="jdbc:derby:${derby.system.home}/AdventureDB;create=true" userid="" password=""
+            autocommit="true">
             <ant:fileset dir="src/sql"/>
             <ant:classpath>
                 <ant:pathelement location="${maven.repo.local}/org.apache.derby/jars/derby-${derby_version}.jar"/>
@@ -144,38 +147,33 @@
     </goal>
 
     <goal name="ab:start" description="Start Adventure Builder">
-        <deploy:startRemoteServer
-            geronimoTarget="${instDir}"
-            debugPort="8000"
-            configs="geronimo/console-jetty/1.0-SNAPSHOT/car geronimo/debug-console/1.0-SNAPSHOT/car
geronimo/runtime-deployer/1.0-SNAPSHOT/car  geronimo/uddi-jetty/1.0-SNAPSHOT/car geronimo/jetty-runtime-deployer/1.0-SNAPSHOT/car
org/apache/geronimo/Adventure1.0.1 org/apache/geronimo/AirlineSupplier1.0.3 org/apache/geronimo/ActivitySupplier1.0.3
org/apache/geronimo/Bank1.0.3 org/apache/geronimo/LodgingSupplier1.0.3 org/apache/geronimo/OPC1.0.3"/>
-        <ant:echo message="Waiting for server at: ${instDir}"/>
-        <deploy:waitForStarted
-            uri="jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+        <deploy:start
+            uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
             id="org/apache/geronimo/Adventure1.0.1"/>
-        <deploy:waitForStarted
-            uri="jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+        <deploy:start
+            uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
             id="org/apache/geronimo/AirlineSupplier1.0.3"/>
-        <deploy:waitForStarted
-            uri="jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+        <deploy:start
+            uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
             id="org/apache/geronimo/ActivitySupplier1.0.3"/>
-        <deploy:waitForStarted
-            uri="jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+        <deploy:start
+            uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
             id="org/apache/geronimo/Bank1.0.3"/>
-        <deploy:waitForStarted
-            uri="jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+        <deploy:start
+            uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
             id="org/apache/geronimo/LodgingSupplier1.0.3"/>
-        <deploy:waitForStarted
-            uri="jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+        <deploy:start
+            uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
             id="org/apache/geronimo/OPC1.0.3"/>

Modified: geronimo/trunk/sandbox/adventurebuilder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/project.xml?rev=358292&r1=358291&r2=358292&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/project.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/project.xml Wed Dec 21 05:34:33 2005
@@ -48,8 +48,16 @@
       <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-javamail</artifactId>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-mail</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+            <geronimo.dependency>true</geronimo.dependency>
+        </properties>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
         <version>${geronimo_spec_javamail_version}</version>
     </dependency>
     <dependency>

Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml?rev=358292&r1=358291&r2=358292&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/adventure1.0.3-jms-ra-plan.xml Wed Dec
21 05:34:33 2005
@@ -17,7 +17,7 @@
 -->
 <!-- $Rev$ $Date$ -->
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
-    parentId="geronimo/system-jms/1.0-SNAPSHOT/car" 
+    parentId="geronimo/activemq-broker/1.0-SNAPSHOT/car" 
     configId="org/apache/geronimo/AdventureBuilderJMS">
     <resourceadapter>
         <resourceadapter-instance>

Modified: geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml?rev=358292&r1=358291&r2=358292&view=diff
==============================================================================
--- geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml (original)
+++ geronimo/trunk/sandbox/adventurebuilder/src/plan/opc1.0.3.ear-plan.xml Wed Dec 21 05:34:33
2005
@@ -23,16 +23,24 @@
         <uri>org/apache/geronimo/AdventureBuilderJMS</uri>
     </import>
     <dependency>
-        <uri>geronimo/geronimo-common/${geronimo_version}/jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-        <uri>geronimo/geronimo-mail/${geronimo_version}/jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-mail</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-        <uri>geronimo-spec/geronimo-spec-activation/${geronimo_spec_activation_version}/jar</uri>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-activation</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-        <uri>geronimo-spec/geronimo-spec-javamail/${geronimo_spec_javamail_version}/jar</uri>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-javamail</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </dependency>
     <module>
         <ejb>opc-ejb.jar</ejb>



Mime
View raw message