geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r575052 - in /geronimo/server/branches/2.0/assemblies: geronimo-jetty6-jee5/src/main/resources/var/config/config.xml geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Date Wed, 12 Sep 2007 19:47:33 GMT
Author: dwoods
Date: Wed Sep 12 12:47:32 2007
New Revision: 575052

URL: http://svn.apache.org/viewvc?rev=575052&view=rev
Log:
GERONIMO-3461 - Temporarily disable the MEJB gbean in the JEE5 assemblies until G3456 is fixed.

Modified:
    geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml

Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?rev=575052&r1=575051&r2=575052&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
Wed Sep 12 12:47:32 2007
@@ -29,7 +29,7 @@
     <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${NamingPort + PortOffset}</attribute>
-        </gbean>                                                    
+        </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>
@@ -62,6 +62,8 @@
             <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
             <attribute name="host">${ServerHostname}</attribute>
         </gbean>
+        <!-- See GERONIMO-3461 for why this is disabled by default -->
+        <gbean load="false" name="ejb/mgmt/MEJB"/>
     </module>
 
     <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
@@ -99,7 +101,7 @@
 
     <module name="org.apache.geronimo.configs/activemq-ra/${version}/car">
         <gbean name="ActiveMQ RA">
-                <attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort
+ PortOffset}</attribute>
+            <attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</attribute>
         </gbean>
     </module>
 

Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?rev=575052&r1=575051&r2=575052&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Wed Sep 12 12:47:32 2007
@@ -62,6 +62,8 @@
             <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
             <attribute name="host">${ServerHostname}</attribute>
         </gbean>
+        <!-- See GERONIMO-3461 for why this is disabled by default -->
+        <gbean load="false" name="ejb/mgmt/MEJB"/>
     </module>
 
     <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">



Mime
View raw message