You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/07/24 11:50:07 UTC
svn commit: r797396 - in
/geronimo/server/branches/2.1/plugins/clustering/farming: pom.xml
src/main/plan/plan.xml
Author: xuhaihong
Date: Fri Jul 24 09:50:07 2009
New Revision: 797396
URL: http://svn.apache.org/viewvc?rev=797396&view=rev
Log:
Geronimo-4688 Revert the changes due to the JAXB namespace marshaller issue
Modified:
geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml
geronimo/server/branches/2.1/plugins/clustering/farming/src/main/plan/plan.xml
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=797396&r1=797395&r2=797396&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml Fri Jul 24 09:50:07 2009
@@ -94,17 +94,6 @@
</gbean>
<gbean name="ClusterInfo">
<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>
- <ns:property name="password">manager</ns:property>
- <ns:property name="protocol">rmi</ns:property>
- <ns:property name="host">localhost</ns:property>
- <ns:property name="port">${NamingPort + PortOffset}</ns:property>
- <ns:property name="urlPath">JMXConnector</ns:property>
- <ns:property name="local">true</ns:property>
- </ns:javabean>
- </attribute>
</gbean>
</config-xml-content>
<config-substitution key="ClusterNodeName">NODE</config-substitution>
Modified: geronimo/server/branches/2.1/plugins/clustering/farming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/farming/src/main/plan/plan.xml?rev=797396&r1=797395&r2=797396&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/farming/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/farming/src/main/plan/plan.xml Fri Jul 24 09:50:07 2009
@@ -87,7 +87,7 @@
<ns:property name="password">manager</ns:property>
<ns:property name="protocol">rmi</ns:property>
<ns:property name="host">localhost</ns:property>
- <ns:property name="port">${PlanNamingPort}</ns:property>
+ <ns:property name="port">1099</ns:property>
<ns:property name="urlPath">JMXConnector</ns:property>
<ns:property name="local">true</ns:property>
</ns:javabean>