geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r355674 - in /geronimo/trunk: assemblies/j2ee-installer/ assemblies/j2ee-installer/src/var/config/ assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/ assemblies/j2ee-tomcat-server/src/v...
Date Sat, 10 Dec 2005 01:12:45 GMT
Author: ammulder
Date: Fri Dec  9 17:12:42 2005
New Revision: 355674

URL: http://svn.apache.org/viewcvs?rev=355674&view=rev
Log:
Fix the remote deploy configs and add them to assemblies

Modified:
    geronimo/trunk/assemblies/j2ee-installer/project.xml
    geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/trunk/configs/remote-deploy-jetty/project.properties
    geronimo/trunk/configs/remote-deploy-jetty/project.xml
    geronimo/trunk/configs/remote-deploy-tomcat/project.properties
    geronimo/trunk/configs/remote-deploy-tomcat/project.xml

Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Fri Dec  9 17:12:42 2005
@@ -214,6 +214,24 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>remote-deploy-jetty</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>jmxdebug-jetty</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>uddi-jetty</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
@@ -242,6 +260,24 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>webconsole-tomcat</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>remote-deploy-tomcat</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>jmxdebug-tomcat</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>

Modified: geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml Fri Dec  9 17:12:42
2005
@@ -79,6 +79,7 @@
     <configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/jmxdebug-jetty/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/tomcat/${pom.currentVersion}/car" load="false">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
@@ -102,6 +103,7 @@
     <configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car" load="false"/>
     <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="false"/>
     <configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car" load="false"/>
+    <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" load="false"/>
     <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Dec  9 17:12:42 2005
@@ -257,6 +257,15 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>remote-deploy-jetty</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>uddi-jetty</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Fri Dec  9 17:12:42
2005
@@ -91,5 +91,6 @@
     <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/jmxdebug-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/hot-deployer/1.0-SNAPSHOT/car" />
 </attributes>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri Dec  9 17:12:42 2005
@@ -257,6 +257,15 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>remote-deploy-tomcat</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>uddi-tomcat</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Fri Dec  9 17:12:42
2005
@@ -97,5 +97,6 @@
     <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car"/>
     <configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car"/>
     <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>
     <configuration name="geronimo/hot-deployer/1.0-SNAPSHOT/car" />
 </attributes>

Modified: geronimo/trunk/configs/remote-deploy-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-jetty/project.properties?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/project.properties (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/project.properties Fri Dec  9 17:12:42 2005
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
 
-geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/remote-deploy-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-jetty/project.xml?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/project.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/project.xml Fri Dec  9 17:12:42 2005
@@ -23,7 +23,7 @@
     <extend>../../etc/project.xml</extend>
 
     <name>Geronimo :: Remote Deploy Jetty Application</name>
-    <id>geronimo-remote-deploy-jetty</id>
+    <id>remote-deploy-jetty</id>
     <shortDescription>Geronimo Remote Deploy Jetty Application</shortDescription>
     <description>
         This application is essentially a servlet that accepts file upload

Modified: geronimo/trunk/configs/remote-deploy-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-tomcat/project.properties?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/project.properties (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/project.properties Fri Dec  9 17:12:42 2005
@@ -23,5 +23,5 @@
 
 geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
 
-geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/remote-deploy-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-tomcat/project.xml?rev=355674&r1=355673&r2=355674&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/project.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/project.xml Fri Dec  9 17:12:42 2005
@@ -23,7 +23,7 @@
     <extend>../../etc/project.xml</extend>
 
     <name>Geronimo :: Remote Deploy Tomcat Application</name>
-    <id>geronimo-remote-deploy-tomcat</id>
+    <id>remote-deploy-tomcat</id>
     <shortDescription>Geronimo Remote Deploy Tomcat Application</shortDescription>
     <description>
         This application is essentially a servlet that accepts file upload



Mime
View raw message