[jboss-cvs] JBossAS SVN: r96664 - in trunk/server/src: etc/deploy and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2009-11-20 16:05:27 -0500 (Fri, 20 Nov 2009)
New Revision: 96664

Modified:
   trunk/server/src/etc/conf/all/xmdesc/NamingService-xmbean.xml
   trunk/server/src/etc/deploy/naming-jboss-beans.xml
   trunk/server/src/main/java/org/jboss/naming/NamingService.java
   trunk/server/src/main/java/org/jboss/naming/NamingServiceMBean.java
Log:
JBAS-6948, JBAS-7476, Add a startNamingBean (default = true) flag indicating if the namingMain should be started in our startService. The default restores the legacy behavior.

Modified: trunk/server/src/etc/conf/all/xmdesc/NamingService-xmbean.xml
===================================================================
--- trunk/server/src/etc/conf/all/xmdesc/NamingService-xmbean.xml	2009-11-20 20:40:55 UTC (rev 96663)
+++ trunk/server/src/etc/conf/all/xmdesc/NamingService-xmbean.xml	2009-11-20 21:05:27 UTC (rev 96664)
@@ -150,7 +150,14 @@
       <name>InvokerProxyFactory</name>
       <type>org.jboss.invocation.jrmp.server.JRMPProxyFactoryMBean</type>
    </attribute>
-   
+   <attribute access="read-write" getMethod="getStartNamingBean"
+      setMethod="setStartNamingBean">
+      <description>A flag indicating if the NamingService should start the
+         .</description>
+      <name>StartNamingBean</name>
+      <type>boolean</type>
+   </attribute>
+
    <!-- Operations -->
    <operation>
       <description>The generic invocation operation used by detached invokers

Modified: trunk/server/src/etc/deploy/naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/naming-jboss-beans.xml	2009-11-20 20:40:55 UTC (rev 96663)
+++ trunk/server/src/etc/deploy/naming-jboss-beans.xml	2009-11-20 21:05:27 UTC (rev 96664)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
     
-    <!-- JNDI util and legacy beans -->
+    <!-- JNDI util and legacy beans: $Id:$ -->
     
     <bean name="JndiViewBean" class="org.jboss.naming.JNDIView">
         <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=JNDIView", exposedInterface=org.jboss.naming.JNDIViewMBean, registerDirectly=true)</annotation>
@@ -21,6 +21,8 @@
             proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
         -->
         <property name="namingInfo"><inject bean="RemoteNamingBean"/></property>
+        <!-- Do not start the injected naming bean -->
+        <property name="startNamingBean">false</property>
     </bean>
     
 </deployment>

Modified: trunk/server/src/main/java/org/jboss/naming/NamingService.java
===================================================================
--- trunk/server/src/main/java/org/jboss/naming/NamingService.java	2009-11-20 20:40:55 UTC (rev 96663)
+++ trunk/server/src/main/java/org/jboss/naming/NamingService.java	2009-11-20 21:05:27 UTC (rev 96664)
@@ -69,6 +69,8 @@
    private Map marshalledInvocationMapping = new HashMap();
    /** An optional proxy factory for externalizing the Naming proxy transport */
    private JRMPProxyFactoryMBean proxyFactory;
+   /** A flag indicating if the namingMain should be started in our startService */
+   private boolean startNamingBean = true;
 
    public NamingService()
    {
@@ -283,6 +285,16 @@
       return namingMain.getLookupListenerException();
    }
 
+   
+   public boolean getStartNamingBean()
+   {
+      return startNamingBean;
+   }
+   public void setStartNamingBean(boolean startNamingBean)
+   {
+      this.startNamingBean = startNamingBean;
+   }
+
    protected void startService()
       throws Exception
    {
@@ -315,7 +327,8 @@
       }
       if( proxyFactory != null )
          namingMain.setNamingProxy(proxyFactory.getProxy());
-      //namingMain.start();
+      if( startNamingBean )
+         namingMain.start();
 
       // Build the Naming interface method map
       HashMap tmpMap = new HashMap(13);
@@ -332,8 +345,11 @@
    protected void stopService()
       throws Exception
    {
-      namingMain.stop();
-      log.debug("JNP server stopped");
+      if(startNamingBean)
+      {
+         namingMain.stop();
+         log.debug("JNP server stopped");
+      }
    }
 
    /**

Modified: trunk/server/src/main/java/org/jboss/naming/NamingServiceMBean.java
===================================================================
--- trunk/server/src/main/java/org/jboss/naming/NamingServiceMBean.java	2009-11-20 20:40:55 UTC (rev 96663)
+++ trunk/server/src/main/java/org/jboss/naming/NamingServiceMBean.java	2009-11-20 21:05:27 UTC (rev 96664)
@@ -48,6 +48,9 @@
     * @param flag - true if all lookups are unmarshalled using the caller's TCL, false if in VM lookups return the value by reference.    */
   void setCallByValue(boolean flag) ;
 
+  public boolean getStartNamingBean();
+  public void setStartNamingBean(boolean startNamingBean);
+  
    /**
     * Expose the Naming service interface mapping as a read-only attribute
     * @return A Map<Long hash, Method> of the Naming interface    */