You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/07/09 17:27:13 UTC
svn commit: r792581 - in /geronimo/server/trunk/plugins/clustering:
clustering/pom.xml farming/pom.xml wadi-clustering/pom.xml
Author: gawor
Date: Thu Jul 9 15:27:13 2009
New Revision: 792581
URL: http://svn.apache.org/viewvc?rev=792581&view=rev
Log:
cleanup clustering/farming config property names. Patch from Rex Wang (GERONIMO-4729)
Modified:
geronimo/server/trunk/plugins/clustering/clustering/pom.xml
geronimo/server/trunk/plugins/clustering/farming/pom.xml
geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
Modified: geronimo/server/trunk/plugins/clustering/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/pom.xml?rev=792581&r1=792580&r2=792581&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering/pom.xml Thu Jul 9 15:27:13 2009
@@ -86,10 +86,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/trunk/plugins/clustering/farming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/pom.xml?rev=792581&r1=792580&r2=792581&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/pom.xml Thu Jul 9 15:27:13 2009
@@ -86,14 +86,14 @@
<copy-file relative-to="geronimo" dest-dir="farming">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>
</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_FARM</config-substitution>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=792581&r1=792580&r2=792581&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml Thu Jul 9 15:27:13 2009
@@ -105,12 +105,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>