Author: djencks
Date: Tue Dec 20 18:05:20 2011
New Revision: 1221395
URL: http://svn.apache.org/viewvc?rev=1221395&view=rev
Log:
GERONIMO-6240 Port conflict with the RMIRegistry so disable it for now
Modified:
geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=1221395&r1=1221394&r2=1221395&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Tue Dec 20 18:05:20 2011
@@ -166,10 +166,10 @@
<instance>
<plugin-artifact>
<config-xml-content>
- <gbean name="RMIRegistry">
- <attribute name="port">${NamingPort + PortOffset}</attribute>
- <attribute name="host">${ServerHostname}</attribute>
- </gbean>
+ <!--<gbean name="RMIRegistry">-->
+ <!--<attribute name="port">${NamingPort + PortOffset}</attribute>-->
+ <!--<attribute name="host">${ServerHostname}</attribute>-->
+ <!--</gbean>-->
<!--<gbean name="NamingProperties">-->
<!--<!– Check whether this really
works if host name is 0.0.0.0 –>-->
<!--<attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort
+ PortOffset}</attribute>-->
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=1221395&r1=1221394&r2=1221395&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml Tue Dec 20 18:05:20
2011
@@ -22,11 +22,11 @@
<gbean name="WaitForBlueprint" class="org.apache.geronimo.blueprint.WaitForBlueprintGBean"/>
- <gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
- <attribute name="port">${planNamingPort}</attribute>
- <attribute name="host">${ServerHostname}</attribute>
- <attribute name="classLoaderSpi">org.apache.geronimo.kernel.rmi.RMIClassLoaderSpiImpl</attribute>
- </gbean>
+ <!--<gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">-->
+ <!--<attribute name="port">${planNamingPort}</attribute>-->
+ <!--<attribute name="host">${ServerHostname}</attribute>-->
+ <!--<attribute name="classLoaderSpi">org.apache.geronimo.kernel.rmi.RMIClassLoaderSpiImpl</attribute>-->
+ <!--</gbean>-->
<gbean name="JavaGlobalContext" class="org.apache.geronimo.gjndi.FederatedContextGBean">
<attribute name="nameInNamespace">java:</attribute>
|