Return-Path: 
 <scm-return-37295-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 76277 invoked from network); 29 Jun 2009 05:17:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 29 Jun 2009 05:17:37 -0000
Received: (qmail 2363 invoked by uid 500); 29 Jun 2009 05:17:47 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 2287 invoked by uid 500); 29 Jun 2009 05:17:47 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 2278 invoked by uid 99); 29 Jun 2009 05:17:47 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2009 05:17:47 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2009 05:17:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6FB77238889D; Mon, 29 Jun 2009 05:17:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r789212 - in
 /geronimo/server/trunk/plugins/clustering/farming:
 pom.xml src/main/plan/plan.xml
Date: Mon, 29 Jun 2009 05:17:25 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090629051725.6FB77238889D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xuhaihong
Date: Mon Jun 29 05:17:25 2009
New Revision: 789212

URL: http://svn.apache.org/viewvc?rev=789212&view=rev
Log:
GERONIMO-4688 hardcode port in plan.xml of plugin farming (Patch from Shawn Jiang)

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=789212&r1=789211&r2=789212&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/pom.xml Mon Jun 29 05:17:25 2009
@@ -90,6 +90,17 @@
                                 </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=789212&r1=789211&r2=789212&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 05:17:25 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">1099</ns:property>
+                  <ns:property name="port">${PlanNamingPort}</ns:property>
                   <ns:property name="urlPath">JMXConnector</ns:property>
                   <ns:property name="local">true</ns:property>
               </ns:javabean>