[jboss-cvs] JBossAS SVN: r79607 - in trunk: server/src/etc and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Oct 16 16:11:04 EDT 2008


Author: dimitris at jboss.org
Date: 2008-10-16 16:11:04 -0400 (Thu, 16 Oct 2008)
New Revision: 79607

Added:
   trunk/server/src/etc/deploy-minimal/
   trunk/server/src/etc/deploy-minimal/naming-jboss-beans.xml
Removed:
   trunk/server/src/etc/conf/default/jboss-minimal.xml
Modified:
   trunk/build/build.xml
   trunk/server/src/etc/conf/default/jboss-service.xml
   trunk/server/src/etc/deploy/naming-jboss-beans.xml
Log:
JBAS-6103, remove the binding service from the minimal config and deploy a smaller version of naming-jboss-beans.xml

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-10-16 20:01:49 UTC (rev 79606)
+++ trunk/build/build.xml	2008-10-16 20:11:04 UTC (rev 79607)
@@ -736,19 +736,12 @@
       dest="${install.docs}/examples/legacy-remoting/httpha-invoker.sar"/>
 
     <!-- Build server/minimal manually -->
-    <copy todir="${install.minimal.deploy}">
-      <fileset dir="${install.default.deploy}">
-        <include name="naming-jboss-beans.xml" />
-      </fileset>
-    </copy>
-    <mkdir dir="${install.minimal.deployers}"/>
     <copy todir="${install.minimal.conf}">
       <fileset dir="${install.default.conf}">
+        <include name="jboss-service.xml" />
         <include name="jndi.properties" />
         <include name="jboss-log4j.xml" />
-        <include name="bootstrap.xml" />
         <include name="aop.xml" />
-        <include name="bindings.xml" />
         <include name="classloader.xml" />
         <include name="deployers.xml" />
         <include name="jmx.xml" />
@@ -756,21 +749,25 @@
         <include name="xmdesc/Log4jService-xmbean.xml" />
       </fileset>
     </copy>
-    <copy file="${install.default.conf}/jboss-minimal.xml"
-          tofile="${install.minimal.conf}/jboss-service.xml"/>
+    <copy file="${install.default.conf}/bootstrap-minimal.xml"
+        tofile="${install.minimal.conf}/bootstrap.xml" />
+    <copy todir="${install.minimal.deploy}">
+      <fileset dir="${project.root}/server/src/etc/deploy-minimal">
+        <include name="naming-jboss-beans.xml" />
+      </fileset>
+    </copy>
+    <mkdir dir="${install.minimal.deployers}"/>        
     <copy todir="${install.minimal.lib}">
+      <fileset dir="${project.root}/server/output/lib">
+        <include name="jboss-minimal.jar"/>
+      </fileset>    
       <fileset dir="${install.default.lib}">
-        <include name="jboss-bindingservice.jar" />
-        <include name="jboss-management.jar" />
         <include name="jnpserver.jar" />
         <include name="log4j.jar" />
       </fileset>
     </copy>
-    <copy todir="${install.minimal.lib}"
-      file="${project.root}/server/output/lib/jboss-minimal.jar" />
-
+    
     <call target="jboss-all-client"/>
-
   </target>
 
   <target name="jboss-all-client" depends="init"

Deleted: trunk/server/src/etc/conf/default/jboss-minimal.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-minimal.xml	2008-10-16 20:01:49 UTC (rev 79606)
+++ trunk/server/src/etc/conf/default/jboss-minimal.xml	2008-10-16 20:11:04 UTC (rev 79607)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id$ -->
-
-<!-- ===================================================================== -->
-<!--  A minimal JBoss Server Configuration                                 -->
-<!-- ===================================================================== -->
-
-<server>
-
-   <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
-     can be restricted to specific jars by specifying them in the archives
-     attribute.
-    -->
-   <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
-
-   <!-- ==================================================================== -->
-   <!-- Log4j Initialization                                                 -->
-   <!-- ==================================================================== -->
-   
-   <mbean code="org.jboss.logging.Log4jService"
-      name="jboss.system:type=Log4jService,service=Logging"
-	  xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
-      <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
-      <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
-      this needs to be set to avoid a possible deadlock on exception at the
-      appender level. See bug#696819.
-      -->
-      <attribute name="Log4jQuietMode">true</attribute>
-      <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
-      <attribute name="RefreshPeriod">60</attribute>
-   </mbean>
-
-</server>

Modified: trunk/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-service.xml	2008-10-16 20:01:49 UTC (rev 79606)
+++ trunk/server/src/etc/conf/default/jboss-service.xml	2008-10-16 20:11:04 UTC (rev 79607)
@@ -9,9 +9,7 @@
 <server>
 
    <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
-     can be restricted to specific jars by specifying them in the archives
-     attribute.
-    -->
+   can be restricted to specific jars by specifying them in the archives attribute. -->
    <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
 
    <!-- ==================================================================== -->
@@ -20,13 +18,14 @@
 
    <mbean code="org.jboss.logging.Log4jService"
       name="jboss.system:type=Log4jService,service=Logging"
-	  xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+      xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+      
       <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
       <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
       this needs to be set to avoid a possible deadlock on exception at the
-      appender level. See bug#696819.
-      -->
+      appender level. See bug#696819. -->
       <attribute name="Log4jQuietMode">true</attribute>
+      
       <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
       <attribute name="RefreshPeriod">60</attribute>
    </mbean>

Modified: trunk/server/src/etc/deploy/naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/naming-jboss-beans.xml	2008-10-16 20:01:49 UTC (rev 79606)
+++ trunk/server/src/etc/deploy/naming-jboss-beans.xml	2008-10-16 20:11:04 UTC (rev 79607)
@@ -5,10 +5,6 @@
     <!-- JNDI                                                                 -->
     <!-- ==================================================================== -->
     
-    <!-- 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.
-    -->
     <bean name="LookupPool">
         <constructor factoryMethod="newFixedThreadPool"
             factoryClass="java.util.concurrent.Executors">
@@ -16,24 +12,24 @@
             <parameter>2</parameter>
         </constructor>
     </bean>
+    
     <bean name="LocalNamingBean" class="org.jnp.server.NamingBeanImpl">
         <!-- Install this bean as the global JVM NamingServer -->
         <property name="installGlobalService">true</property>
-        
         <property name="useGlobalService">false</property>
     </bean>
+    
     <bean name="RemoteNamingBean" class="org.jnp.server.Main">
         <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=Naming", exposedInterface=org.jnp.server.MainMBean, registerDirectly=true)</annotation>
+        
         <property name="namingInfo"><inject bean="LocalNamingBean" /></property>
+        
         <!-- 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. -->
         <property name="callByValue">false</property>
         
         <!-- The listening port for the bootstrap JNP service. Set this to -1
-            to run the NamingService without the JNP invoker listening port.
-        -->
-        <property name="port">1099</property>
+            to run the NamingService without the JNP invoker listening port. -->
         <property name="port">
             <value-factory bean="ServiceBindingManager"
                 method="getIntBinding">
@@ -41,10 +37,11 @@
                 <parameter>Port</parameter>
             </value-factory>
         </property>
+        
         <!-- 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 -->
         <property name="bindAddress">${jboss.bind.address:localhost}</property>
+        
         <!-- The port of the RMI naming service, 0 == anonymous -->
         <property name="rmiPort">
             <value-factory bean="ServiceBindingManager" method="getIntBinding">
@@ -52,17 +49,20 @@
                 <parameter>RmiPort</parameter>
             </value-factory>
         </property>
-        <!-- The RMI service bind address. Empty == all addresses
-        -->
+        
+        <!-- The RMI service bind address. Empty == all addresses  -->
         <property name="rmiBindAddress">${jboss.bind.address:localhost}</property>
+        
         <!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
         <property name="enableRmiServerHostname">true</property>
+        
         <!-- The thread pool service used to control the bootstrap lookups -->
         <property name="lookupExector"><inject bean="LookupPool"/></property>
     </bean>
     
     <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>
+        
         <!-- The HANamingService service name -->
         <property name="HANamingService">jboss:service=HAJNDI</property>
     </bean>
@@ -70,9 +70,9 @@
     <!-- An obsolete bean only needed if using legacy detached invoker access,
         or the createAlias/removeAlias operations
     -->
-    <bean class="org.jboss.naming.NamingService"
-        name="NamingService">
+    <bean name="NamingService" class="org.jboss.naming.NamingService">
         <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NamingService", exposedInterface=org.jboss.naming.NamingServiceMBean, registerDirectly=true)</annotation>
+        
         <!--  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>

Added: trunk/server/src/etc/deploy-minimal/naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy-minimal/naming-jboss-beans.xml	                        (rev 0)
+++ trunk/server/src/etc/deploy-minimal/naming-jboss-beans.xml	2008-10-16 20:11:04 UTC (rev 79607)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+    
+    <!-- ==================================================================== -->
+    <!-- JNDI                                                                 -->
+    <!-- ==================================================================== -->
+    
+    <bean name="LookupPool">
+        <constructor factoryMethod="newFixedThreadPool"
+            factoryClass="java.util.concurrent.Executors">
+            <!-- At least 2 threads are required -->
+            <parameter>2</parameter>
+        </constructor>
+    </bean>
+    
+    <bean name="LocalNamingBean" class="org.jnp.server.NamingBeanImpl">
+        <!-- Install this bean as the global JVM NamingServer -->
+        <property name="installGlobalService">true</property>
+        <property name="useGlobalService">false</property>
+    </bean>
+    
+    <bean name="RemoteNamingBean" class="org.jnp.server.Main">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=Naming", exposedInterface=org.jnp.server.MainMBean, registerDirectly=true)</annotation>
+        
+        <property name="namingInfo"><inject bean="LocalNamingBean" /></property>
+        
+        <!-- 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. -->
+        <property name="callByValue">false</property>
+        
+        <!-- The listening port for the bootstrap JNP service. Set this to -1
+            to run the NamingService without the JNP invoker listening port. -->
+        <property name="port">1099</property>
+
+        <!-- The bootstrap JNP server bind address. This also sets the default
+            RMI service bind address. Empty == all addresses -->
+        <property name="bindAddress">${jboss.bind.address:localhost}</property>
+
+        <!-- The port of the RMI naming service, 0 == anonymous -->
+        <property name="rmiPort">1098</property>
+
+        <!-- The RMI service bind address. Empty == all addresses -->
+        <property name="rmiBindAddress">${jboss.bind.address:localhost}</property>
+        
+        <!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
+        <property name="enableRmiServerHostname">true</property>
+        
+        <!-- The thread pool service used to control the bootstrap lookups -->
+        <property name="lookupExector"><inject bean="LookupPool"/></property>
+    </bean>
+    
+</deployment>




More information about the jboss-cvs-commits mailing list