geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r567225 - in /geronimo/server/trunk: assemblies/geronimo-framework/src/main/resources/var/config/ assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/ assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/ assemblies/ge...
Date Sat, 18 Aug 2007 04:19:35 GMT
Author: dwoods
Date: Fri Aug 17 21:19:30 2007
New Revision: 567225

URL: http://svn.apache.org/viewvc?view=rev&rev=567225
Log:
GERONIMO-3391 fix remoteDeployAddress, which must be a valid URL

Modified:
    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

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=567225&r1=567224&r2=567225
==============================================================================
--- 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
Fri Aug 17 21:19:30 2007
@@ -49,7 +49,7 @@
 
     <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
         <gbean name="Deployer">
-            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+            <attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
         </gbean>
     </module>
     

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=567225&r1=567224&r2=567225
==============================================================================
--- 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
Fri Aug 17 21:19:30 2007
@@ -130,7 +130,7 @@
     -->
     <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
         <gbean name="Deployer">
-            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+            <attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
         </gbean>
     </module>
 

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=567225&r1=567224&r2=567225
==============================================================================
--- 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
Fri Aug 17 21:19:30 2007
@@ -72,7 +72,7 @@
     
     <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
         <gbean name="Deployer">
-            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+            <attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
         </gbean>
     </module>
     

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=567225&r1=567224&r2=567225
==============================================================================
--- 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
Fri Aug 17 21:19:30 2007
@@ -137,7 +137,7 @@
     -->
     <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
         <gbean name="Deployer">
-            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+            <attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
         </gbean>
     </module>
 

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=567225&r1=567224&r2=567225
==============================================================================
--- 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
Fri Aug 17 21:19:30 2007
@@ -73,7 +73,7 @@
     
     <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
         <gbean name="Deployer">
-            <attribute name="remoteDeployAddress">${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
+            <attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary
+ PortOffset}</attribute>
         </gbean>
     </module>
     

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=567225&r1=567224&r2=567225
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Fri Aug 17 21:19:30
2007
@@ -20,7 +20,7 @@
     
     <!-- Deployer used to process modules and plans -->
     <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
-        <attribute name="remoteDeployAddress">${PlanRemoteDeployHostname}:${PlanHTTPPort}</attribute>
+        <attribute name="remoteDeployAddress">localhost:8080</attribute>
         <reference name="Store">
             <!--<pattern><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></pattern>-->
          </reference>



Mime
View raw message