geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r565768 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/ assemblies/geronimo-framework/src/main/resources/var/config/ assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/ assembli...
Date Tue, 14 Aug 2007 14:22:09 GMT
Author: dwoods
Date: Tue Aug 14 07:22:08 2007
New Revision: 565768

URL: http://svn.apache.org/viewvc?view=rev&rev=565768
Log:
GERONIMO-3391 Use the config-substitutions.properties for the Deployer remoteDeployAddress
settings

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
    geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties?view=diff&rev=565768&r1=565767&r2=565768
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
Tue Aug 14 07:22:08 2007
@@ -23,6 +23,7 @@
 ##   Try PortOffset=10
 #PortOffset=0
 ServerHostname=0.0.0.0
+RemoteDeployHostname=localhost
 NamingPort=1099
 OpenEJBPort=4201
 ClientAddresses=127.0.0.1

Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml?view=diff&rev=565768&r1=565767&r2=565768
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
Tue Aug 14 07:22:08 2007
@@ -47,7 +47,11 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
+        <gbean name="Deployer">
+            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+        </gbean>
+    </module>
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=565768&r1=565767&r2=565768
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
Tue Aug 14 07:22:08 2007
@@ -128,7 +128,11 @@
     NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer
           so that defaultEnvironment overrides work properly
     -->
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
+        <gbean name="Deployer">
+            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+        </gbean>
+    </module>
 
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=565768&r1=565767&r2=565768
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
Tue Aug 14 07:22:08 2007
@@ -70,7 +70,11 @@
 -->
     </module>
     
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
+        <gbean name="Deployer">
+            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+        </gbean>
+    </module>
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=565768&r1=565767&r2=565768
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Tue Aug 14 07:22:08 2007
@@ -135,7 +135,11 @@
     NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer
           so that defaultEnvironment overrides work properly
     -->
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
+        <gbean name="Deployer">
+            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+        </gbean>
+    </module>
 
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=565768&r1=565767&r2=565768
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
Tue Aug 14 07:22:08 2007
@@ -71,7 +71,11 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
+        <gbean name="Deployer">
+            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+        </gbean>
+    </module>
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">

Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?view=diff&rev=565768&r1=565767&r2=565768
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Tue Aug 14 07:22:08
2007
@@ -20,7 +20,7 @@
     
     <!-- Deployer used to process modules and plans -->
     <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
-        <attribute name="remoteDeployAddress">localhost:8080</attribute>
+        <attribute name="remoteDeployAddress">${PlanRemoteDeployHostname}:${PlanHTTPPort}</attribute>
         <reference name="Store">
             <!--<pattern><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></pattern>-->
          </reference>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=565768&r1=565767&r2=565768
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Aug 14 07:22:08 2007
@@ -55,6 +55,7 @@
 
         <!-- Common plan properties -->
         <PlanServerHostname>0.0.0.0</PlanServerHostname>
+        <PlanRemoteDeployHostname>127.0.0.1</PlanRemoteDeployHostname>
         <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
         <PlanHTTPPort>8080</PlanHTTPPort>
         <PlanHTTPSPort>8443</PlanHTTPSPort>



Mime
View raw message