Ivan, just a friendly reminder to please run a complete server build
(with junit tests) and testsuite before committing patches. There have
been several build breaks in the past couple weeks due to patches you
have committed.... Even if all of the testsuite tests do not pass, you
should still run them before committing to ensure no new failures are
introduced.
-Donald
[email protected] wrote:
Author: xuhaihong
Date: Mon Jun 29 07:55:22 2009
New Revision: 789247
URL: http://svn.apache.org/viewvc?rev=789247&view=rev
Log:
Revert changes of Geronimo-4688 for it caused the server build failed
Modified:
geronimo/server/trunk/plugins/clustering/farming/pom.xml
geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml
Modified: geronimo/server/trunk/plugins/clustering/farming/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/pom.xml?rev=789247&r1=789246&r2=789247&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/pom.xml Mon Jun 29
07:55:22 2009
@@ -90,17 +90,6 @@
</gbean>
<gbean name="ClusterInfo">
<attribute
name="name">#{clusterName}</attribute>
- <attribute
propertyEditor="org.apache.geronimo.farm.deployment.DeploymentExtendedJMXConnectorInfoEditor"
name="extendedJMXConnectorInfo">
- <ns:javabean
class="org.apache.geronimo.farm.deployment.DeploymentExtendedJMXConnectorInfo"
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/trunk/plugins/clustering/farming/src/main/plan/plan.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml?rev=789247&r1=789246&r2=789247&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml Mon
Jun 29 07:55:22 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>