geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r355665 - in /geronimo/branches/1.0: assemblies/j2ee-installer/src/var/config/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/src/var/config/ configs/hot-deployer/ configs/hot-deployer/src/plan/
Date Sat, 10 Dec 2005 00:36:38 GMT
Author: ammulder
Date: Fri Dec  9 16:36:36 2005
New Revision: 355665

URL: http://svn.apache.org/viewcvs?rev=355665&view=rev
Log:
Merge hot deploy & JMX Debug changes to branch

Modified:
    geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml
    geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/branches/1.0/configs/hot-deployer/project.xml
    geronimo/branches/1.0/configs/hot-deployer/src/plan/plan.xml

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml?rev=355665&r1=355664&r2=355665&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/src/var/config/config.xml Fri Dec  9 16:36:36
2005
@@ -78,6 +78,7 @@
     <configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car"/>
     <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/tomcat/${pom.currentVersion}/car" load="false">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
@@ -100,6 +101,7 @@
     <configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="false"/>
     <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/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
@@ -111,5 +113,6 @@
     </configuration>
     <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car" load="false"/>
+    <configuration name="geronimo/hot-deployer/1.0-SNAPSHOT/car" />
 
 </attributes>

Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355665&r1=355664&r2=355665&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml Fri Dec 
9 16:36:36 2005
@@ -90,4 +90,5 @@
     <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/hot-deployer/1.0-SNAPSHOT/car" />
 </attributes>

Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355665&r1=355664&r2=355665&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml Fri Dec
 9 16:36:36 2005
@@ -96,4 +96,5 @@
     <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/hot-deployer/1.0-SNAPSHOT/car" />
 </attributes>

Modified: geronimo/branches/1.0/configs/hot-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/hot-deployer/project.xml?rev=355665&r1=355664&r2=355665&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/hot-deployer/project.xml (original)
+++ geronimo/branches/1.0/configs/hot-deployer/project.xml Fri Dec  9 16:36:36 2005
@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>rmi-naming</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>

Modified: geronimo/branches/1.0/configs/hot-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/hot-deployer/src/plan/plan.xml?rev=355665&r1=355664&r2=355665&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/hot-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/hot-deployer/src/plan/plan.xml Fri Dec  9 16:36:36 2005
@@ -45,6 +45,7 @@
 		<attribute name="path">deploy/</attribute>
         <attribute name="pollIntervalMillis">2000</attribute>
         <dependency>
+            <domain>geronimo.maven</domain>
             <module>geronimo/j2ee-deployer/${pom.currentVersion}/car</module>
             <type>ConfigBuilder</type>
             <name>EARBuilder</name>



Mime
View raw message