geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r125373 - /geronimo/trunk/modules/assembly/maven.xml /geronimo/trunk/modules/assembly/project.properties /geronimo/trunk/modules/assembly/project.xml
Date Sun, 16 Jan 2005 23:14:02 GMT
Author: djencks
Date: Sun Jan 16 15:13:59 2005
New Revision: 125373

URL: http://svn.apache.org/viewcvs?view=rev&rev=125373
Log:
Deploy with runtime deployer unless property geronimo.assemble.offline=true. Clean by default.
Remove logs before assembling by default.
Modified:
   geronimo/trunk/modules/assembly/maven.xml
   geronimo/trunk/modules/assembly/project.properties
   geronimo/trunk/modules/assembly/project.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?view=diff&rev=125373&p1=geronimo/trunk/modules/assembly/maven.xml&r1=125372&p2=geronimo/trunk/modules/assembly/maven.xml&r2=125373
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml	(original)
+++ geronimo/trunk/modules/assembly/maven.xml	Sun Jan 16 15:13:59 2005
@@ -23,7 +23,9 @@
     xmlns:ant="jelly:ant"
     xmlns:define="jelly:define"
     xmlns:velocity="jelly:velocity"
-    xmlns:bootstrap="geronimo:bootstrap">
+    xmlns:bootstrap="geronimo:bootstrap"
+    xmlns:deploy="geronimo:deploy"
+    >
 
     <!-- ================= -->
     <!-- Global Properties -->
@@ -55,13 +57,22 @@
 
     <preGoal name="jar:jar">
         <attainGoal name="assemble"/>
-        <j:set var="maven.build.dest" value="${basedir}/target/${pom.groupId}-${pom.currentVersion}"/>
+        <j:if test="${context.getVariable('geronimo.assemble.delete.logs') == 'true'}">
+            <delete>
+                <fileset dir="${distDir}/var/log" includes="*.log"/>
+            </delete>
+        </j:if>
+        <j:set var="maven.build.dest" value="${distDir}"/>
     </preGoal>
 
     <!-- ==================================================== -->
     <!-- Assemble server installation from generated modules  -->
     <!-- ==================================================== -->
     <goal name="assemble">
+        <j:if test="${context.getVariable('geronimo.assemble.clean') == 'true'}">
+            <echo>Deleting target directory</echo>
+            <delete dir="${basedir}/target"/>
+        </j:if>
 
         <!-- Copy  the runtime dependencies into lib and create a classpath for the server.jar
file -->
         <j:set var="libDir" value="${distDir}/lib"/>
@@ -133,6 +144,7 @@
         </j:forEach>
 
         <!-- copy in data files -->
+        <!-- the persistent config list will need to be recopied if the online deployer
is used -->
         <ant:copy todir="${distDir}/var">
             <ant:fileset dir="src/var"/>
         </ant:copy>
@@ -250,10 +262,43 @@
             <ant:arg value="target/plan/j2ee-runtime-deployer-plan.xml"/>
         </ant:java>
 
+        <!-- build the system configuration and client.jar -->
+        <ant:echo>Building client.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="package"/>
+            <ant:arg value="--mainClass"/>
+            <ant:arg value="org.apache.geronimo.system.main.ClientCommandLine"/>
+            <ant:arg value="--classPath"/>
+            <ant:arg value="${client.classpath}"/>
+            <ant:arg value="--install"/>
+            <ant:arg value="target/plan/client-system-plan.xml"/>
+            <ant:arg value="${distDir}/bin/client.jar"/>
+        </ant:java>
+
+        <j:if test="${context.getVariable('geronimo.assemble.offline') != 'true'}">
+            <deploy:startRemoteServer
+                geronimoTarget="${distDir}"
+                vmArgs="-Xmx512m -XX:MaxPermSize=128m -Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl"
+                configs="org/apache/geronimo/RuntimeDeployer"/>
+            <ant:echo message="Waiting for server at: ${distDir}"/>
+            <deploy:waitForStarted
+                uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+                username="system"
+                password="manager"
+                id="org/apache/geronimo/RuntimeDeployer"/>
+            <echo message="server has started"/>
+        </j:if>
+
         <!-- 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:jvmarg value="-ea"/>
+            <ant:arg value="--user"/>
+            <ant:arg value="system"/>
+            <ant:arg value="--password"/>
+            <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
             <ant:arg value="target/plan/default-database-plan.xml"/>
             <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-${tranql_connector_version}.rar"/>
@@ -263,6 +308,10 @@
         <ant:echo>Building system database configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
+            <ant:arg value="--user"/>
+            <ant:arg value="system"/>
+            <ant:arg value="--password"/>
+            <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
             <ant:arg value="target/plan/system-database-plan.xml"/>
             <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-${tranql_connector_version}.rar"/>
@@ -272,6 +321,10 @@
         <ant:echo>Building system activemq configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
+            <ant:arg value="--user"/>
+            <ant:arg value="system"/>
+            <ant:arg value="--password"/>
+            <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
             <ant:arg value="target/plan/system-activemq-plan.xml"/>
         </ant:java>
@@ -280,6 +333,10 @@
         <ant:echo>Building system jms configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
+            <ant:arg value="--user"/>
+            <ant:arg value="system"/>
+            <ant:arg value="--password"/>
+            <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
             <ant:arg value="target/plan/system-jms-plan.xml"/>
             <ant:arg value="${maven.repo.local}/activemq/rars/activemq-ra-${activemq_version}.rar"/>
@@ -289,59 +346,74 @@
         <ant:echo>Building secure server configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
+            <ant:arg value="--user"/>
+            <ant:arg value="system"/>
+            <ant:arg value="--password"/>
+            <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
             <ant:arg value="target/plan/j2ee-secure-plan.xml"/>
         </ant:java>
 
-        <!-- build the system configuration and client.jar -->
-        <ant:echo>Building client.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="package"/>
-            <ant:arg value="--mainClass"/>
-            <ant:arg value="org.apache.geronimo.system.main.ClientCommandLine"/>
-            <ant:arg value="--classPath"/>
-            <ant:arg value="${client.classpath}"/>
-            <ant:arg value="--install"/>
-            <ant:arg value="target/plan/client-system-plan.xml"/>
-            <ant:arg value="${distDir}/bin/client.jar"/>
-        </ant:java>
-
         <!-- build the J2EE client configuration -->
         <ant:echo>Building J2EE Client configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
+            <ant:arg value="--user"/>
+            <ant:arg value="system"/>
+            <ant:arg value="--password"/>
+            <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
             <ant:arg value="target/plan/j2ee-client-plan.xml"/>
         </ant:java>
-        
+
         <!-- build the J2EEServer with Apache Tomcat (as the web container) configuration
-->
         <ant:echo>Building Apache Tomcat server configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
+            <ant:arg value="--user"/>
+            <ant:arg value="system"/>
+            <ant:arg value="--password"/>
+            <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
             <ant:arg value="target/plan/j2ee-server-tomcat-plan.xml"/>
         </ant:java>
 
-        <ant:copy todir="${distDir}/var/catalina/conf"  file="${project.root}/modules/tomcat/src/var/web.xml"/>
+        <ant:copy todir="${distDir}/var/catalina/conf" file="${project.root}/modules/tomcat/src/var/web.xml"/>
 
         <!-- build the Demo configuration -->
-<!--        <ant:echo>Building demo website configuration</ant:echo>-->
-<!--        <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">-->
-<!--            <ant:jvmarg value="-ea"/>-->
-<!--            <ant:arg value="distribute"/>-->
-<!--            <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-demo-${pom.currentVersion}.war"/>-->
-<!--        </ant:java>-->
+        <!--        <ant:echo>Building demo website configuration</ant:echo>-->
+        <!--        <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">-->
+        <!--            <ant:jvmarg value="-ea"/>-->
+        <!--            <ant:arg value="distribute"/>-->
+        <!--            <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-demo-${pom.currentVersion}.war"/>-->
+        <!--        </ant:java>-->
 
         <!-- build the Debug Tool configuration "org/apache/geronimo/DebugConsole"-->
         <ant:echo>Building debug tool configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
+            <ant:arg value="--user"/>
+            <ant:arg value="system"/>
+            <ant:arg value="--password"/>
+            <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
             <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${pom.currentVersion}.war"/>
         </ant:java>
-        
+
+        <j:if test="${context.getVariable('geronimo.assemble.offline') != 'true'}">
+            <deploy:stopRemoteServer
+                uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+                username="system"
+                password="manager"/>
+            <echo message="server has stopped"/>
+            <!-- re-copy in persistent config list -->
+            <echo message="refreshing persistent configuration list"/>
+            <ant:copy todir="${distDir}/var" overwrite="true">
+                <ant:fileset dir="src/var">
+                    <include name="config/config.list"/>
+                </ant:fileset>
+            </ant:copy>
+        </j:if>
     </goal>
 
     <goal name="cli">

Modified: geronimo/trunk/modules/assembly/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.properties?view=diff&rev=125373&p1=geronimo/trunk/modules/assembly/project.properties&r1=125372&p2=geronimo/trunk/modules/assembly/project.properties&r2=125373
==============================================================================
--- geronimo/trunk/modules/assembly/project.properties	(original)
+++ geronimo/trunk/modules/assembly/project.properties	Sun Jan 16 15:13:59 2005
@@ -6,3 +6,14 @@
 
 geronimo.cvs.docdir = ../incubator-site/build/site/projects/geronimo
 maven.repo.remote=http://www.apache.org/~jlaskowski/maven, http://www.mortbay.org/maven,
http://www.openejb.org/maven, http://dist.codehaus.org, http://www.ibiblio.org/maven 
+
+# Uncomment this line to use the deployer offline.
+# This is slower and doesn't check that the runtime deployer works,
+# but doesn't start jetty, openejb, etc.
+#geronimo.assemble.offline=true
+
+# Controls whether the logs generated during assembly are removed before packaging
+geronimo.assemble.delete.logs=true
+
+#controls whether to remove previous versions even if clean was not explicitly called
+geronimo.assemble.clean=true
\ No newline at end of file

Modified: geronimo/trunk/modules/assembly/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&rev=125373&p1=geronimo/trunk/modules/assembly/project.xml&r1=125372&p2=geronimo/trunk/modules/assembly/project.xml&r2=125373
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml	(original)
+++ geronimo/trunk/modules/assembly/project.xml	Sun Jan 16 15:13:59 2005
@@ -39,6 +39,15 @@
     <!-- ============ -->
 
     <dependencies>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment-plugin</artifactId>
+            <version>${geronimo_version}</version>
+            <type>plugin</type>
+        </dependency>
+
+        
         <!-- Used for preprocessing our plans -->
         <dependency>
             <groupId>commons-jelly</groupId>
@@ -884,6 +893,24 @@
         </dependency>
 
         <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                 <repository>true</repository>
+             </properties>
+         </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-axis-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                 <repository>true</repository>
+             </properties>
+         </dependency>
+
+        <dependency>
             <groupId>axis</groupId>
             <artifactId>axis</artifactId>
             <version>${axis_version}</version>
@@ -894,12 +921,49 @@
 
         <dependency>
             <groupId>axis</groupId>
+            <artifactId>axis-jaxrpc</artifactId>
+            <version>${axis_jaxrpc_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis-saaj</artifactId>
+            <version>${axis_saaj_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis-wsdl4j</artifactId>
+            <version>${axis_wsdl4j_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>axis</groupId>
             <artifactId>commons-discovery</artifactId>
             <version>${axis_commons_discovery_version}</version>
             <properties>
                 <repository>true</repository>
             </properties>
         </dependency>
+
+        <dependency>
+            <groupId>ews</groupId>
+            <artifactId>ews</artifactId>
+            <version>${ews_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
         <dependency>
             <groupId>xfire</groupId>
             <artifactId>xfire</artifactId>

Mime
View raw message