[jboss-cvs] JBossAS SVN: r61390 - in trunk: server/src/etc/conf/default and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-03-17 00:39:17 -0400 (Sat, 17 Mar 2007)
New Revision: 61390

Modified:
   trunk/build/build.xml
   trunk/server/src/etc/conf/default/jboss-minimal.xml
Log:
Include the updated naming service config and naming xmbean descriptor in the minimal config

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2007-03-17 04:31:54 UTC (rev 61389)
+++ trunk/build/build.xml	2007-03-17 04:39:17 UTC (rev 61390)
@@ -752,6 +752,8 @@
         <include name="jndi.properties" />
         <include name="log4j.xml" />
         <include name="bootstrap-beans.xml" />
+        <include name="xmdesc/NamingBean-xmbean.xml" />
+        <include name="xmdesc/NamingService-xmbean.xml" />
       </fileset>
     </copy>
     <copy file="${install.default.conf}/jboss-minimal.xml"

Modified: trunk/server/src/etc/conf/default/jboss-minimal.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-minimal.xml	2007-03-17 04:31:54 UTC (rev 61389)
+++ trunk/server/src/etc/conf/default/jboss-minimal.xml	2007-03-17 04:39:17 UTC (rev 61390)
@@ -49,28 +49,44 @@
       <attribute name="BlockingMode">run</attribute>
    </mbean>
 
+   <!-- A simple mbean wrapper around the jndi Naming object. This
+      only handles an in memory instance. The NamingService uses this
+      as the JNDI store and exposes it remotely.
+   -->
+   <mbean code="org.jnp.server.NamingBeanImpl"
+      name="jboss:service=NamingBeanImpl"
+      xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
+   </mbean>
+   
    <mbean code="org.jboss.naming.NamingService"
-      name="jboss:service=Naming">
+      name="jboss:service=Naming"
+      xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
       <!-- The call by value mode. true if all lookups are unmarshalled using
-      the caller's TCL, false if in VM lookups return the value by reference.
+         the caller's TCL, false if in VM lookups return the value by reference.
       -->
       <attribute name="CallByValue">false</attribute>
       <!-- The listening port for the bootstrap JNP service. Set this to -1
-        to run the NamingService without the JNP invoker listening port.
+         to run the NamingService without the JNP invoker listening port.
       -->
       <attribute name="Port">1099</attribute>
       <!-- The bootstrap JNP server bind address. This also sets the default
-      RMI service bind address. Empty == all addresses
-       -->
+         RMI service bind address. Empty == all addresses
+      -->
       <attribute name="BindAddress">${jboss.bind.address}</attribute>
       <!-- The port of the RMI naming service, 0 == anonymous -->
       <attribute name="RmiPort">1098</attribute>
       <!-- The RMI service bind address. Empty == all addresses
-       -->
+      -->
       <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
       <!-- The thread pool service used to control the bootstrap lookups -->
       <depends optional-attribute-name="LookupPool"
          proxy-type="attribute">jboss.system:service=ThreadPool</depends>
-   </mbean>
+      <!-- An example of using the unifed invoker as the transport.
+         <depends optional-attribute-name="InvokerProxyFactory"
+         proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
+      -->
+      <depends optional-attribute-name="Naming"
+         proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
+   </mbean>   
 
 </server>