[jboss-cvs] JBossAS SVN: r98961 - in trunk: server/src/etc/deployers and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 31 15:40:06 EST 2009
Author: bstansberry at jboss.com
Date: 2009-12-31 15:40:06 -0500 (Thu, 31 Dec 2009)
New Revision: 98961
Modified:
trunk/server/src/etc/deploy/naming-jboss-beans.xml
trunk/server/src/etc/deployers/core-naming-jboss-beans.xml
trunk/testsuite/build.xml
Log:
[JBAS-7580] Move RemoteNamingBean to deploy
Modified: trunk/server/src/etc/deploy/naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/naming-jboss-beans.xml 2009-12-31 20:38:46 UTC (rev 98960)
+++ trunk/server/src/etc/deploy/naming-jboss-beans.xml 2009-12-31 20:40:06 UTC (rev 98961)
@@ -1,8 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- JNDI util and legacy beans: $Id:$ -->
+ <!-- ==================================================================== -->
+ <!-- Remote interface to JNDI, JNDI util and legacy beans: $Id:$ -->
+ <!-- ==================================================================== -->
+ <bean name="LookupPool">
+ <constructor factoryMethod="newFixedThreadPool"
+ factoryClass="java.util.concurrent.Executors">
+ <!-- At least 2 threads are required -->
+ <parameter>2</parameter>
+ </constructor>
+ </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">
+ <value-factory bean="ServiceBindingManager"
+ method="getIntBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>Port</parameter>
+ </value-factory>
+ </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">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>RmiPort</parameter>
+ </value-factory>
+ </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>
+
<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>
Modified: trunk/server/src/etc/deployers/core-naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/core-naming-jboss-beans.xml 2009-12-31 20:38:46 UTC (rev 98960)
+++ trunk/server/src/etc/deployers/core-naming-jboss-beans.xml 2009-12-31 20:40:06 UTC (rev 98961)
@@ -5,14 +5,6 @@
<!-- 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>
@@ -21,46 +13,5 @@
</bean>
<bean name="NameSpaces" class="org.jboss.reloaded.naming.service.NameSpaces"/>
-
- <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">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding">
- <parameter>jboss:service=Naming</parameter>
- <parameter>Port</parameter>
- </value-factory>
- </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">
- <value-factory bean="ServiceBindingManager" method="getIntBinding">
- <parameter>jboss:service=Naming</parameter>
- <parameter>RmiPort</parameter>
- </value-factory>
- </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>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-12-31 20:38:46 UTC (rev 98960)
+++ trunk/testsuite/build.xml 2009-12-31 20:40:06 UTC (rev 98961)
@@ -1307,6 +1307,13 @@
<server:stop name="all"/>
</target>
+ <target name="stress-tests"
+ description="A basic set of units tests which are run against the jboss all config" depends="init">
+ <server:start name="all"/>
+ <antcall target="tests-standard-stress" inheritRefs="true"/>
+ <server:stop name="all"/>
+ </target>
+
<target name="tests-profileservice" depends="init" description="Tests with the full featured profile service">
<create-profileservice-config baseconf="default" conf="profileservice"/>
<server:start name="profileservice"/>
@@ -1357,6 +1364,11 @@
<patternset>
<include name="conf/**"/>
<include name="deployers/**"/>
+ <include name="deploy/**"/>
+ <include name="lib/**"/>
+ <!-- Previous broken and fragile detailed listing of deploy content
+ <include name="conf/**"/>
+ <include name="deployers/**"/>
<include name="deploy/jbossweb.sar/**"/>
<include name="deploy/ROOT.war/**"/>
<include name="deploy/security/**"/>
@@ -1366,6 +1378,7 @@
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/transaction-jboss-beans.xml"/>
<include name="deploy/thread-pool-jboss-beans.xml"/>
+ -->
</patternset>
</create-config>
More information about the jboss-cvs-commits
mailing list