geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r558873 - in /geronimo/server/branches/2.0: 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/ a...
Date Mon, 23 Jul 2007 21:50:09 GMT
Author: djencks
Date: Mon Jul 23 14:50:05 2007
New Revision: 558873

URL: http://svn.apache.org/viewvc?view=rev&rev=558873
Log:
GERONIMO-2735 clean up config substitutions

Modified:
    geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
    geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/configs/client-system/src/plan/plan.xml
    geronimo/server/branches/2.0/configs/j2ee-system/src/plan/plan.xml
    geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
    geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java
    geronimo/server/branches/2.0/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java

Modified: geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/config-substitutions.properties
Mon Jul 23 14:50:05 2007
@@ -20,32 +20,32 @@
 #httpPort=8080
 #httpsPort=8443
 ##   To run multiple instances of geronimo choose a portOffset such that none of the ports
below conflict
-##   Try portOffset=10
-#portOffset=0
-PlanServerHostname=0.0.0.0
-PlanNamingPort=1099
-PlanOpenEJBPort=4201
-PlanClientAddresses=127.0.0.1
-PlanIIOPPort=9000
-PlanCOSNamingHost=localhost
-PlanCOSNamingPort=1050
-PlanCOSSunNamingPort=1050
-PlanORBHost=localhost
-PlanORBPort=6882
-PlanORBSunPort=6882
-PlanORBSSLHost=localhost
-PlanORBSSLPort=2001
-PlanORBSunSSLPort=2001
-PlanActiveMQPort=61616
-PlanActiveMQStompPort=61613
-PlanDerbyPort=1527
-PlanRemoteLoginPort=4242
-PlanLdapPort=1389
-PlanHTTPPortPrimary=8080
-PlanHTTPSPortPrimary=8443
-PlanAJPPortPrimary=8009
-PlanHTTPPortSecondary=8090
-PlanHTTPSPortSecondary=8453
-PlanAJPPortSecondary=8019
-PlanJMXPort=9999
-PlanNodeName=NODE1
\ No newline at end of file
+##   Try PortOffset=10
+#PortOffset=0
+ServerHostname=0.0.0.0
+NamingPort=1099
+OpenEJBPort=4201
+ClientAddresses=127.0.0.1
+IIOPPort=9000
+COSNamingHost=localhost
+COSNamingPort=1050
+COSSunNamingPort=1050
+ORBHost=localhost
+ORBPort=6882
+ORBSunPort=6882
+ORBSSLHost=localhost
+ORBSSLPort=2001
+ORBSunSSLPort=2001
+ActiveMQPort=61616
+ActiveMQStompPort=61613
+DerbyPort=1527
+RemoteLoginPort=4242
+LdapPort=1389
+HTTPPortPrimary=8080
+HTTPSPortPrimary=8443
+AJPPortPrimary=8009
+HTTPPortSecondary=8090
+HTTPSPortSecondary=8453
+AJPPortSecondary=8019
+JMXPort=9999
+NodeName=NODE1
\ No newline at end of file

Modified: geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
Mon Jul 23 14:50:05 2007
@@ -26,11 +26,11 @@
     
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
-            <attribute name="port">${PlanNamingPort}</attribute>
+            <attribute name="port">${NamingPort}</attribute>
         </gbean>
         <gbean name="NamingProperties">
             <!-- Check whether this really works if host name is 0.0.0.0 -->
-            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+            <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
@@ -41,9 +41,9 @@
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JMXService">
             <attribute name="protocol">rmi</attribute>
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanJMXPort}</attribute>
-            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${JMXPort}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort}/JMXConnector</attribute>
         </gbean>
     </module>
 

Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
Mon Jul 23 14:50:05 2007
@@ -28,11 +28,11 @@
 
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
-            <attribute name="port">${PlanNamingPort + portOffset}</attribute>
+            <attribute name="port">${NamingPort + PortOffset}</attribute>
         </gbean>                                                    
         <gbean name="NamingProperties">
             <!-- Check whether this really works if host name is 0.0.0.0 -->
-            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}</attribute>
+            <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
@@ -47,9 +47,9 @@
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JMXService">
             <attribute name="protocol">rmi</attribute>
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanJMXPort + portOffset}</attribute>
-            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}/JMXConnector</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${JMXPort + PortOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort +
PortOffset}/JMXConnector</attribute>
         </gbean>
     </module>
 
@@ -59,47 +59,47 @@
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
         <gbean name="EJBNetworkService">
-            <attribute name="port">${PlanOpenEJBPort + portOffset}</attribute>
-            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
         <gbean name="NameServer">
-            <attribute name="port">${PlanCOSNamingPort + portOffset}</attribute>
-            <attribute name="host">${PlanCOSNamingHost}</attribute>
+            <attribute name="port">${COSNamingPort + PortOffset}</attribute>
+            <attribute name="host">${COSNamingHost}</attribute>
         </gbean>
         <gbean name="Server">
-            <attribute name="port">${PlanORBSSLPort + portOffset}</attribute>
-            <attribute name="host">${PlanORBSSLHost}</attribute>
+            <attribute name="port">${ORBSSLPort + PortOffset}</attribute>
+            <attribute name="host">${ORBSSLHost}</attribute>
         </gbean>
         <gbean name="UnprotectedServer">
-            <attribute name="port">${PlanORBPort + portOffset}</attribute>
-            <attribute name="host">${PlanORBHost}</attribute>
+            <attribute name="port">${ORBPort + PortOffset}</attribute>
+            <attribute name="host">${ORBHost}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanDerbyPort + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${DerbyPort + PortOffset}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanActiveMQPort + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${ActiveMQPort + PortOffset}</attribute>
         </gbean>
         <gbean name="ActiveMQ.stomp.default">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanActiveMQStompPort + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${ActiveMQStompPort + PortOffset}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/activemq-ra/${version}/car">
         <gbean name="ActiveMQ RA">
-                <attribute name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort
+ portOffset}</attribute>
+                <attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort
+ PortOffset}</attribute>
         </gbean>
     </module>
 
@@ -109,18 +109,18 @@
 
     <module name="org.apache.geronimo.configs/jetty6/${version}/car">
         <gbean name="JettyWebConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortPrimary + portOffset}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${HTTPPortPrimary + PortOffset}</attribute>
+            <attribute name="redirectPort">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
         <gbean name="JettyAJP13Connector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanAJPPortPrimary + portOffset}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${AJPPortPrimary + PortOffset}</attribute>
+            <attribute name="redirectPort">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
         <gbean name="JettySSLConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
     </module>
 
@@ -308,7 +308,7 @@
     
     <module name="org.apache.geronimo.configs/clustering/${version}/car">
         <gbean name="Node">
-            <attribute name="nodeName">${PlanNodeName}</attribute>
+            <attribute name="nodeName">${NodeName}</attribute>
         </gbean>
     </module>
     

Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
Mon Jul 23 14:50:05 2007
@@ -26,11 +26,11 @@
     
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
-            <attribute name="port">${PlanNamingPort + portOffset}</attribute>
+            <attribute name="port">${NamingPort + PortOffset}</attribute>
         </gbean>
         <gbean name="NamingProperties">
             <!-- Check whether this really works if host name is 0.0.0.0 -->
-            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}</attribute>
+            <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
@@ -45,9 +45,9 @@
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JMXService">
             <attribute name="protocol">rmi</attribute>
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanJMXPort + portOffset}</attribute>
-            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}/JMXConnector</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${JMXPort + PortOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort +
PortOffset}/JMXConnector</attribute>
         </gbean>
     </module>
 
@@ -55,13 +55,13 @@
 
     <module name="org.apache.geronimo.configs/jetty6/${version}/car">
         <gbean name="JettyWebConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortPrimary + portOffset}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${HTTPPortPrimary + PortOffset}</attribute>
+            <attribute name="redirectPort">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
         <gbean name="JettySSLConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
 <!--        <gbean name="JettyAJP13Connector">
             <attribute name="host">0.0.0.0</attribute>

Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Mon Jul 23 14:50:05 2007
@@ -28,11 +28,11 @@
 
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
-            <attribute name="port">${PlanNamingPort + portOffset}</attribute>
+            <attribute name="port">${NamingPort + PortOffset}</attribute>
         </gbean>
         <gbean name="NamingProperties">
             <!-- Check whether this really works if host name is 0.0.0.0 -->
-            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}</attribute>
+            <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
@@ -47,9 +47,9 @@
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JMXService">
             <attribute name="protocol">rmi</attribute>
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanJMXPort + portOffset}</attribute>
-            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}/JMXConnector</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${JMXPort + PortOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort +
PortOffset}/JMXConnector</attribute>
         </gbean>
     </module>
 
@@ -59,47 +59,47 @@
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
         <gbean name="EJBNetworkService">
-            <attribute name="port">${PlanOpenEJBPort + portOffset}</attribute>
-            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
         <gbean name="NameServer">
-            <attribute name="port">${PlanCOSNamingPort + portOffset}</attribute>
-            <attribute name="host">${PlanCOSNamingHost}</attribute>
+            <attribute name="port">${COSNamingPort + PortOffset}</attribute>
+            <attribute name="host">${COSNamingHost}</attribute>
         </gbean>
         <gbean name="Server">
-            <attribute name="port">${PlanORBSSLPort + portOffset}</attribute>
-            <attribute name="host">${PlanORBSSLHost}</attribute>
+            <attribute name="port">${ORBSSLPort + PortOffset}</attribute>
+            <attribute name="host">${ORBSSLHost}</attribute>
         </gbean>
         <gbean name="UnprotectedServer">
-            <attribute name="port">${PlanORBPort + portOffset}</attribute>
-            <attribute name="host">${PlanORBHost}</attribute>
+            <attribute name="port">${ORBPort + PortOffset}</attribute>
+            <attribute name="host">${ORBHost}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanDerbyPort + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${DerbyPort + PortOffset}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanActiveMQPort + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${ActiveMQPort + PortOffset}</attribute>
         </gbean>
         <gbean name="ActiveMQ.stomp.default">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanActiveMQStompPort + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${ActiveMQStompPort + PortOffset}</attribute>
         </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/activemq-ra/${version}/car">
         <gbean name="ActiveMQ RA">
-            <attribute name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort
+ portOffset}</attribute>
+            <attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</attribute>
         </gbean>
     </module>
 
@@ -116,18 +116,18 @@
         -->
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortPrimary + portOffset}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${HTTPPortPrimary + PortOffset}</attribute>
+            <attribute name="redirectPort">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
         <gbean name="TomcatAJPConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanAJPPortPrimary + portOffset}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${AJPPortPrimary + PortOffset}</attribute>
+            <attribute name="redirectPort">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
         <gbean name="TomcatWebSSLConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
     </module>
 

Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
Mon Jul 23 14:50:05 2007
@@ -26,11 +26,11 @@
     
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
-            <attribute name="port">${PlanNamingPort + portOffset}</attribute>
+            <attribute name="port">${NamingPort + PortOffset}</attribute>
         </gbean>
         <gbean name="NamingProperties">
             <!-- Check whether this really works if host name is 0.0.0.0 -->
-            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}</attribute>
+            <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
@@ -45,9 +45,9 @@
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JMXService">
             <attribute name="protocol">rmi</attribute>
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanJMXPort + portOffset}</attribute>
-            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort
+ portOffset}/JMXConnector</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${JMXPort + PortOffset}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort +
PortOffset}/JMXConnector</attribute>
         </gbean>
     </module>
 
@@ -56,18 +56,18 @@
     <module name="org.apache.geronimo.configs/tomcat6/${version}/car">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortPrimary + portOffset}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${HTTPPortPrimary + PortOffset}</attribute>
+            <attribute name="redirectPort">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
         <gbean name="TomcatAJPConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanAJPPortPrimary + portOffset}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${AJPPortPrimary + PortOffset}</attribute>
+            <attribute name="redirectPort">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
         <gbean name="TomcatWebSSLConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortPrimary + portOffset}</attribute>
+            <attribute name="host">${ServerHostname}</attribute>
+            <attribute name="port">${HTTPSPortPrimary + PortOffset}</attribute>
         </gbean>
     </module>
     

Modified: geronimo/server/branches/2.0/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/client-system/src/plan/plan.xml?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/client-system/src/plan/plan.xml Mon Jul 23 14:50:05
2007
@@ -45,6 +45,7 @@
         </reference>
         <attribute name="configFile">var/config/config.xml</attribute>
         <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
     </gbean>
 
     <!-- ArtifactManager -->

Modified: geronimo/server/branches/2.0/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/j2ee-system/src/plan/plan.xml?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/j2ee-system/src/plan/plan.xml Mon Jul 23 14:50:05
2007
@@ -60,6 +60,7 @@
         </reference>
         <attribute name="configFile">var/config/config.xml</attribute>
         <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
     </gbean>
 
     <!-- ArtifactManager -->

Modified: geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
Mon Jul 23 14:50:05 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.geronimo.system.configuration;
 
-import java.beans.PropertyEditor;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -48,7 +47,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.common.propertyeditor.PropertyEditors;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanData;
@@ -83,6 +81,7 @@
 
     private static final String CONFIG_FILE_PROPERTY = "org.apache.geronimo.config.file";
     private final static String SUBSTITUTIONS_FILE_PROPERTY = "org.apache.geronimo.config.substitutions.file";
+    private final static String SUBSTITUTION_PREFIX_PREFIX = "org.apache.geronimo.config.substitution.prefix";
 
     private static final String BACKUP_EXTENSION = ".bak";
     private static final String TEMP_EXTENSION = ".working";
@@ -103,10 +102,11 @@
 
     private boolean kernelFullyStarted;
 
-    public LocalAttributeManager(String configFile, String configSubstitutionsFile, boolean
readOnly, ServerInfo serverInfo) {
+    public LocalAttributeManager(String configFile, String configSubstitutionsFile, String
configSubstitutionsPrefix, boolean readOnly, ServerInfo serverInfo) {
         this.configFile = System.getProperty(CONFIG_FILE_PROPERTY, configFile);
         String resolvedPropertiesFile = System.getProperty(SUBSTITUTIONS_FILE_PROPERTY, configSubstitutionsFile);
-        expressionParser = loadProperties(resolvedPropertiesFile, serverInfo);
+        String prefix = System.getProperty(SUBSTITUTION_PREFIX_PREFIX, configSubstitutionsPrefix);
+        expressionParser = loadProperties(resolvedPropertiesFile, serverInfo, prefix);
         this.readOnly = readOnly;
         this.serverInfo = serverInfo;
         serverOverride = new ServerOverride();
@@ -609,8 +609,8 @@
         }
     }
 
-    private static JexlExpressionParser loadProperties(String propertiesFile, ServerInfo
serverInfo) {
-        Map<Object, Object> vars = new HashMap<Object, Object>();
+    private static JexlExpressionParser loadProperties(String propertiesFile, ServerInfo
serverInfo, String prefix) {
+        Map<String, String> vars = new HashMap<String, String>();
         //properties file is least significant
         if (propertiesFile != null) {
             Properties properties = new Properties();
@@ -622,15 +622,25 @@
                 log.error("Caught exception " + e
                         + " trying to open properties file " + thePropertiesFile.getAbsolutePath());
             }
-            vars.putAll(properties);
+            addGeronimoSubstitutions(vars, properties, "");
         }
         //environment variables are next
-        vars.putAll(System.getenv());
+        addGeronimoSubstitutions(vars, System.getenv(), prefix);
         //most significant are the command line system properties
-        vars.putAll(System.getProperties());
+        addGeronimoSubstitutions(vars, System.getProperties(), prefix);
         return new JexlExpressionParser(vars);
     }
 
+    private static void addGeronimoSubstitutions(Map<String, String> vars, Map props,
String prefix) {
+        int start = prefix.length();
+        for (Object o: props.entrySet()) {
+            Map.Entry entry = (Map.Entry) o;
+            if (((String)entry.getKey()).startsWith(prefix)) {
+                vars.put(((String)entry.getKey()).substring(start), (String)entry.getValue());
+            }
+        }
+    }
+
     public static final GBeanInfo GBEAN_INFO;
 
     static {
@@ -639,10 +649,11 @@
         infoFactory.addAttribute("configFile", String.class, true);
         infoFactory.addAttribute("readOnly", boolean.class, true);
         infoFactory.addAttribute("substitutionsFile", String.class, true);
+        infoFactory.addAttribute("substitutionPrefix", String.class, true);
         infoFactory.addInterface(ManageableAttributeStore.class);
         infoFactory.addInterface(PersistentConfigurationList.class);
 
-        infoFactory.setConstructor(new String[]{"configFile", "substitutionsFile", "readOnly",
"ServerInfo"});
+        infoFactory.setConstructor(new String[]{"configFile", "substitutionsFile", "substitutionPrefix",
"readOnly", "ServerInfo"});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java
Mon Jul 23 14:50:05 2007
@@ -34,8 +34,8 @@
 public class SwitchableLocalAttributeManager extends LocalAttributeManager implements SwitchablePersistentConfigurationList
{
     private boolean online;
     
-    public SwitchableLocalAttributeManager(String configFile, String substitutionsFile, boolean
readOnly, ServerInfo serverInfo) {
-        super(configFile, substitutionsFile, readOnly, serverInfo);
+    public SwitchableLocalAttributeManager(String configFile, String substitutionsFile, String
configSubstitutionsPrefix, boolean readOnly, ServerInfo serverInfo) {
+        super(configFile, substitutionsFile, configSubstitutionsPrefix, readOnly, serverInfo);
     }
 
     @Override

Modified: geronimo/server/branches/2.0/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java?view=diff&rev=558873&r1=558872&r2=558873
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
Mon Jul 23 14:50:05 2007
@@ -216,9 +216,13 @@
         assertEquals(attributeValue, gbeanData.getAttribute(attributeInfo.getName()));
     }
 
+    public void testSwitchableLocalAttributeManager() throws Exception {
+        GBeanInfo gBeanInfo = SwitchableLocalAttributeManager.getGBeanInfo();
+    }
+
     protected void setUp() throws Exception {
         super.setUp();
-        localAttributeManager = new LocalAttributeManager("target/test-config.xml", "target/test-config-substitutions.properties",
false, new BasicServerInfo(basedir));
+        localAttributeManager = new LocalAttributeManager("target/test-config.xml", "target/test-config-substitutions.properties",
"org.apache.geronimo.config.substitution.", false, new BasicServerInfo(basedir));
         configurationName = Artifact.create("configuration/name/1/car");
         ObjectName objectName = ObjectName.getInstance(":name=gbean,parent="+configurationName+",foo=bar");
         gbeanName = new AbstractName(configurationName, objectName.getKeyPropertyList(),
objectName);



Mime
View raw message