geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r792608 - in /geronimo/server/branches/2.1/plugins/clustering: clustering/pom.xml farming/pom.xml wadi-clustering/pom.xml
Date Thu, 09 Jul 2009 17:03:01 GMT
Author: gawor
Date: Thu Jul  9 17:03:00 2009
New Revision: 792608

URL: http://svn.apache.org/viewvc?rev=792608&view=rev
Log:
cleanup clustering/farming config property names. Patch from Rex Wang (GERONIMO-4729)

Modified:
    geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml
    geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml
    geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml

Modified: geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml?rev=792608&r1=792607&r2=792608&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml Thu Jul  9 17:03:00
2009
@@ -88,10 +88,10 @@
                         <plugin-artifact>
                             <config-xml-content>
                                 <gbean name="Node">
-                                    <attribute name="nodeName">#{clusterNodeName}</attribute>
+                                    <attribute name="nodeName">#{ClusterNodeName}</attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-substitution key="clusterNodeName">NODE</config-substitution>
+                            <config-substitution key="ClusterNodeName">NODE</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml?rev=792608&r1=792607&r2=792608&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml Thu Jul  9 17:03:00 2009
@@ -90,10 +90,10 @@
                             <copy-file relative-to="geronimo" dest-dir="">master-repository</copy-file>
                             <config-xml-content load="false">
                                 <gbean name="NodeInfo">
-                                    <attribute name="name">#{clusterNodeName}</attribute>
+                                    <attribute name="name">#{ClusterNodeName}</attribute>
                                 </gbean>
                                 <gbean name="ClusterInfo">
-                                    <attribute name="name">#{clusterName}</attribute>
+                                    <attribute name="name">#{FarmName}</attribute>
                                     <attribute propertyEditor="org.apache.geronimo.farm.config.BasicExtendedJMXConnectorInfoEditor"
name="extendedJMXConnectorInfo">
                                         <ns:javabean class="org.apache.geronimo.farm.config.BasicExtendedJMXConnectorInfo"
xmlns:ns="http://geronimo.apache.org/xml/ns/deployment/javabean-1.0">
                                             <ns:property name="username">system</ns:property>
@@ -107,8 +107,8 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-substitution key="clusterNodeName">NODE</config-substitution>
-                            <config-substitution key="clusterName">CLUSTER_NAME</config-substitution>
+                            <config-substitution key="ClusterNodeName">NODE</config-substitution>
+                            <config-substitution key="FarmName">DEFAULT_FRAM</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml?rev=792608&r1=792607&r2=792608&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml Thu Jul  9 17:03:00
2009
@@ -106,12 +106,12 @@
                                 </gbean>
                                 <gbean name="DefaultDispatcherHolder">
                                     <attribute name="endPointURI">#{EndPointURI}</attribute>
-                                    <attribute name="clusterName">#{ClusterName}</attribute>
+                                    <attribute name="clusterName">#{WADIClusterName}</attribute>
                                 </gbean>
                             </config-xml-content>
                             <config-substitution key="ReplicaCount">2</config-substitution>
                             <config-substitution key="EndPointURI">http://localhost:8080</config-substitution>
-                            <config-substitution key="ClusterName">DEFAULT_CLUSTER</config-substitution>
+                            <config-substitution key="WADIClusterName">DEFAULT_WADI_CLUSTER</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>



Mime
View raw message