[jboss-cvs] JBossAS SVN: r96504 - in trunk: server/src/etc/conf/standard and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 18 14:01:10 EST 2009
Author: scott.stark at jboss.org
Date: 2009-11-18 14:01:09 -0500 (Wed, 18 Nov 2009)
New Revision: 96504
Added:
trunk/server/src/etc/deploy/legacy-conf-service.xml
trunk/server/src/etc/deploy/naming-jboss-beans.xml
trunk/server/src/etc/deployers/core-naming-jboss-beans.xml
Modified:
trunk/server/src/etc/conf/all/jboss-service.xml
trunk/server/src/etc/conf/standard/jboss-service.xml
trunk/server/src/etc/conf/web/jboss-service.xml
trunk/server/src/main/java/org/jboss/naming/NamingService.java
trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/StaticProfileFactory.java
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JBossMessagingAdmin.java
trunk/varia/src/resources/beanvalidation/bv-core-jboss-beans.xml
trunk/varia/src/resources/services/invoker/http/jboss-service.xml
trunk/varia/src/resources/services/invoker/http/web.xml
trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml
trunk/varia/src/resources/services/invoker/httpha/web.xml
Log:
JBAS-7457, JBAS-6948 move all services out of the conf/jboss-service.xml bootstrap descriptor
Modified: trunk/server/src/etc/conf/all/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/all/jboss-service.xml 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/server/src/etc/conf/all/jboss-service.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -11,270 +11,9 @@
<!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
the shared JBOSS_HOME/common/lib directory. This can be restricted to
specific jars by specifying them in the archives attribute.
+ TODO: Move this configuration elsewhere
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
<classpath codebase="${jboss.common.lib.url}" archives="*"/>
- <!-- ==================================================================== -->
- <!-- Main Deployer -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.deployment.MainDeployer"
- name="jboss.system:service=MainDeployer">
- <!-- This is used to delegate the deployment handling -->
- <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute>
- <!-- This is used to validate incomplete deployments -->
- <attribute name="Controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- XMBean Persistence -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.system.pm.AttributePersistenceService"
- name="jboss:service=AttributePersistenceService"
- xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
- <!-- the AttributePersistenceService is persistent, itself -->
-
- <!--
- <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
- <attribute name="AttributePersistenceManagerConfig">
- <data-directory>data/xmbean-attrs</data-directory>
- </attribute>
- <attribute name="ApmDestroyOnServiceStop">false</attribute>
- <attribute name="VersionTag"></attribute>
- -->
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Active Alarm Table -->
- <!-- ==================================================================== -->
-
- <!--
- | The ActiveAlarmTable service is a simple JMX notification listener
- | that maintains a table with the received notifications (alarms).
- | The alarms can be acknowledged through the jmx or the web console.
- | Modify the SubscriptionList below to subscribe for any notification
- | in the system and treat it as an alarm.
- | The JMXNotificationAppender is a log4j Appender that can be configured
- | in log4j.xml, that trasforms logging events to JMX notification so they
- | can be fed back into the table. By storing the WARN or higher level logging
- | events you can have a quick view of important system faults.
- |
- | The following attributes may be set:
- |
- | MaxTableSize (default 1000)
- | - set an upper limit to the number of stored alarms
- | LogLevel (default DEBUG)
- | - the log level to use for received notification, can be set to NONE
- | ServerId (default jboss)
- | - used to construct unique alarm ids
- | SubscriptionList
- | - subscribe for the notifications to be stored in the table
-
- <mbean code="org.jboss.monitor.services.ActiveAlarmTable"
- name="jboss.monitor:service=ActiveAlarmTable">
- <attribute name="SubscriptionList">
- <subscription-list>
- <mbean name="jboss.monitor:*">
- <notification type="jboss.alarm"/>
- <notification type="JBOSS_MONITOR_NOTIFICATION"/>
- </mbean>
- <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
- </subscription-list>
- </attribute>
- </mbean>
- -->
-
- <!-- ==================================================================== -->
- <!-- JBoss RMI Classloader - only install when available -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
- name="jboss.rmi:type=RMIClassLoader">
- <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
- <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Class Loading -->
- <!-- ==================================================================== -->
-
- <!-- A mini webserver used for dynamic and class and resource loading -->
- <mbean code="org.jboss.web.WebService"
- name="jboss:service=WebService">
- <!-- The Bind address and Port -->
- <attribute name="BindAddress">
- <!-- Get the interface to use from ServiceBindingManager. -->
- <value-factory bean="ServiceBindingManager" method="getStringBinding" parameter="jboss:service=WebService"/>
- </attribute>
- <attribute name="Port">
- <!-- Get the port to use from ServiceBindingManager. -->
- <value-factory bean="ServiceBindingManager" method="getIntBinding" parameter="jboss:service=WebService"/>
- </attribute>
- <!-- The address to use for the host portion of the RMI codebase URL -->
- <attribute name="Host">${java.rmi.server.hostname}</attribute>
- <!-- Should non-EJB .class files be downloadable -->
- <attribute name="DownloadServerClasses">true</attribute>
- <!-- Should resources other than .class files be downloadable. Both
- DownloadServerClasses and DownloadResources must be true for resources
- to be downloadable. This is false by default because its generally a
- bad idea as server configuration files that container security
- information can be accessed.
- -->
- <attribute name="DownloadResources">false</attribute>
-
- <!-- Use the default thread pool for dynamic class loading -->
- <attribute name="Executor">
- <inject bean="ThreadPool"/>
- </attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- 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.
- -->
- <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"
- 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.
- -->
- <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.
- -->
- <attribute name="Port">
- <value-factory bean="ServiceBindingManager" method="getIntBinding">
- <parameter>jboss:service=Naming</parameter>
- <parameter>Port</parameter>
- </value-factory>
- </attribute>
-
- <!-- The bootstrap JNP server bind address. This also sets the default
- RMI service bind address. Empty == all addresses
- -->
- <attribute name="BindAddress">
- <value-factory bean="ServiceBindingManager" method="getStringBinding">
- <parameter>jboss:service=Naming</parameter>
- <parameter>Port</parameter>
- <parameter><null/></parameter>
- </value-factory>
- </attribute>
-
- <!-- The port of the RMI naming service, 0 == anonymous -->
- <attribute name="RmiPort">
- <value-factory bean="ServiceBindingManager" method="getIntBinding">
- <parameter>jboss:service=Naming</parameter>
- <parameter>RmiPort</parameter>
- </value-factory>
- </attribute>
- <!-- The RMI service bind address. Empty == all addresses -->
- <attribute name="RmiBindAddress">
- <value-factory bean="ServiceBindingManager" method="getStringBinding">
- <parameter>jboss:service=Naming</parameter>
- <parameter>RmiPort</parameter>
- <parameter><null/></parameter>
- </value-factory>
- </attribute>
-
- <!-- The thread pool service used to control the bootstrap lookups -->
- <attribute name="LookupPool">
- <inject bean="LongRunningTasksThreadPool"/>
- </attribute>
- <!-- 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>
-
- <!-- Writes the bootstrap URL for the NamingService in a known location,
- so tools (e.g. Jopr) can use it as a java.naming.provider.url.
- -->
- <mbean code="org.jboss.naming.NamingProviderURLWriter"
- name="jboss:service=NamingProviderURLWriter"
- xmbean-dd="resource:xmdesc/NamingProviderURLWriter-xmbean.xml">
-
- <attribute name="Server"><inject bean="JBossServer"/></attribute>
- <attribute name="BootstrapAddress"><inject bean="jboss:service=Naming" property="bindAddress"/></attribute>
- <attribute name="BootstrapPort"><inject bean="jboss:service=Naming" property="port"/></attribute>
- </mbean>
-
- <mbean code="org.jboss.naming.JNDIView"
- name="jboss:service=JNDIView"
- xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
- <!-- The HANamingService service name -->
- <attribute name="HANamingService">jboss:service=HAJNDI</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Security -->
- <!-- ==================================================================== -->
-
- <!-- JAAS security manager and realm mapping -->
- <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
- name="jboss.security:service=JaasSecurityManager">
- <!-- A flag which indicates whether the SecurityAssociation server mode
- is set on service creation. This is true by default since the
- SecurityAssociation should be thread local for multi-threaded server
- operation.
- -->
- <attribute name="ServerMode">true</attribute>
- <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
- <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
- <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
- in seconds.
- If you want to disable caching of security credentials, set this to 0 to
- force authentication to occur every time. This has no affect if the
- AuthenticationCacheJndiName has been changed from the default value.
- -->
- <attribute name="DefaultCacheTimeout">1800</attribute>
- <!-- DefaultCacheResolution: Specifies the default timed cache policy
- resolution in seconds. This controls the interval at which the cache
- current timestamp is updated and should be less than the DefaultCacheTimeout
- in order for the timeout to be meaningful. This has no affect if the
- AuthenticationCacheJndiName has been changed from the default value.
- -->
- <attribute name="DefaultCacheResolution">60</attribute>
- <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the
- security managers to be deep copies that makes copies of the subject
- principals and credentials if they are cloneable. It should be set to
- true if subject include mutable content that can be corrupted when
- multiple threads have the same identity and cache flushes/logout clearing
- the subject in one thread results in subject references affecting other
- threads.
- -->
- <attribute name="DeepCopySubjectMode">false</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Monitoring and Management -->
- <!-- ==================================================================== -->
-
- <!-- Uncomment to enable JMX monitoring of the bean cache
- <mbean code="org.jboss.monitor.BeanCacheMonitor"
- name="jboss.monitor:name=BeanCacheMonitor"/>
- -->
-
- <!-- Uncomment to enable JMX monitoring of the entity bean locking
- <mbean code="org.jboss.monitor.EntityLockMonitor"
- name="jboss.monitor:name=EntityLockMonitor"/>
- -->
-
- <!-- ==================================================================== -->
- <!-- An MBean that is a registry for JDBC type-mapping metadata -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
- name="jboss.jdbc:service=metadata"/>
-
</server>
Modified: trunk/server/src/etc/conf/standard/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/standard/jboss-service.xml 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/server/src/etc/conf/standard/jboss-service.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -7,127 +7,18 @@
<!-- ===================================================================== -->
<server>
-
+
<!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
- the shared JBOSS_HOME/common/lib directory. This can be restricted to
- specific jars by specifying them in the archives attribute.
+ the shared JBOSS_HOME/common/lib directory. This can be restricted to
+ specific jars by specifying them in the archives attribute.
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
<classpath codebase="${jboss.common.lib.url}" archives="*"/>
-
+
<!-- ==================================================================== -->
- <!-- Main Deployer -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.deployment.MainDeployer"
- name="jboss.system:service=MainDeployer">
- <!-- This is used to delegate the deployment handling -->
- <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute>
- <!-- This is used to validate incomplete deployments -->
- <attribute name="Controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- XMBean Persistence -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.system.pm.AttributePersistenceService"
- name="jboss:service=AttributePersistenceService"
- xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
- <!-- the AttributePersistenceService is persistent, itself -->
-
- <!--
- <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
- <attribute name="AttributePersistenceManagerConfig">
- <data-directory>data/xmbean-attrs</data-directory>
- </attribute>
- <attribute name="ApmDestroyOnServiceStop">false</attribute>
- <attribute name="VersionTag"></attribute>
- -->
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Active Alarm Table -->
- <!-- ==================================================================== -->
-
- <!--
- | The ActiveAlarmTable service is a simple JMX notification listener
- | that maintains a table with the received notifications (alarms).
- | The alarms can be acknowledged through the jmx or the web console.
- | Modify the SubscriptionList below to subscribe for any notification
- | in the system and treat it as an alarm.
- | The JMXNotificationAppender is a log4j Appender that can be configured
- | in log4j.xml, that trasforms logging events to JMX notification so they
- | can be fed back into the table. By storing the WARN or higher level logging
- | events you can have a quick view of important system faults.
- |
- | The following attributes may be set:
- |
- | MaxTableSize (default 1000)
- | - set an upper limit to the number of stored alarms
- | LogLevel (default DEBUG)
- | - the log level to use for received notification, can be set to NONE
- | ServerId (default jboss)
- | - used to construct unique alarm ids
- | SubscriptionList
- | - subscribe for the notifications to be stored in the table
-
- <mbean code="org.jboss.monitor.services.ActiveAlarmTable"
- name="jboss.monitor:service=ActiveAlarmTable">
- <attribute name="SubscriptionList">
- <subscription-list>
- <mbean name="jboss.monitor:*">
- <notification type="jboss.alarm"/>
- <notification type="JBOSS_MONITOR_NOTIFICATION"/>
- </mbean>
- <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
- </subscription-list>
- </attribute>
- </mbean>
- -->
-
- <!-- ==================================================================== -->
- <!-- JBoss RMI Classloader - only install when available -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
- name="jboss.rmi:type=RMIClassLoader">
- <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
- <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Class Loading -->
- <!-- ==================================================================== -->
-
- <!-- A mini webserver used for dynamic and class and resource loading -->
- <mbean code="org.jboss.web.WebService"
- name="jboss:service=WebService">
- <!-- The Bind address and Port -->
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
- <attribute name="Port">
- <!-- Get the port to use from ServiceBindingManager. -->
- <value-factory bean="ServiceBindingManager" method="getIntBinding" parameter="jboss:service=WebService"/>
- </attribute>
- <!-- The address to use for the host portion of the RMI codebase URL -->
- <attribute name="Host">${java.rmi.server.hostname}</attribute>
- <!-- Should non-EJB .class files be downloadable -->
- <attribute name="DownloadServerClasses">true</attribute>
- <!-- Should resources other than .class files be downloadable. Both
- DownloadServerClasses and DownloadResources must be true for resources
- to be downloadable. This is false by default because its generally a
- bad idea as server configuration files that container security
- information can be accessed.
- -->
- <attribute name="DownloadResources">false</attribute>
-
- <!-- Use the default thread pool for dynamic class loading -->
- <attribute name="Executor">
- <inject bean="ThreadPool"/>
- </attribute>
- </mbean>
-
- <!-- ==================================================================== -->
<!-- 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.
@@ -143,7 +34,7 @@
<!-- 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.
-->
- <attribute name="CallByValue">true</attribute>
+ <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.
@@ -158,7 +49,14 @@
<!-- The bootstrap JNP server bind address. This also sets the default
RMI service bind address. Empty == all addresses
-->
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="BindAddress">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>Port</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </attribute>
+
<!-- The port of the RMI naming service, 0 == anonymous -->
<attribute name="RmiPort">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
@@ -166,9 +64,15 @@
<parameter>RmiPort</parameter>
</value-factory>
</attribute>
- <!-- The RMI service bind address. Empty == all addresses
- -->
- <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+ <!-- The RMI service bind address. Empty == all addresses -->
+ <attribute name="RmiBindAddress">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>RmiPort</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </attribute>
+
<!-- The thread pool service used to control the bootstrap lookups -->
<attribute name="LookupPool">
<inject bean="LongRunningTasksThreadPool"/>
@@ -180,9 +84,9 @@
<depends optional-attribute-name="Naming"
proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
</mbean>
-
+
<!-- Writes the bootstrap URL for the NamingService in a known location,
- so tools (e.g. Jopr) can use it as a java.naming.provider.url.
+ so tools (e.g. Jopr) can use it as a java.naming.provider.url.
-->
<mbean code="org.jboss.naming.NamingProviderURLWriter"
name="jboss:service=NamingProviderURLWriter"
@@ -194,71 +98,10 @@
</mbean>
<mbean code="org.jboss.naming.JNDIView"
- name="jboss:service=JNDIView"
- xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
- <!-- The HANamingService service name -->
- <attribute name="HANamingService">jboss:service=HAJNDI</attribute>
+ name="jboss:service=JNDIView"
+ xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
+ <!-- The HANamingService service name -->
+ <attribute name="HANamingService">jboss:service=HAJNDI</attribute>
</mbean>
-
- <!-- ==================================================================== -->
- <!-- Security -->
- <!-- ==================================================================== -->
-
- <!-- JAAS security manager and realm mapping -->
- <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
- name="jboss.security:service=JaasSecurityManager">
- <!-- A flag which indicates whether the SecurityAssociation server mode
- is set on service creation. This is true by default since the
- SecurityAssociation should be thread local for multi-threaded server
- operation.
- -->
- <attribute name="ServerMode">true</attribute>
- <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
- <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
- <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
- in seconds.
- If you want to disable caching of security credentials, set this to 0 to
- force authentication to occur every time. This has no affect if the
- AuthenticationCacheJndiName has been changed from the default value.
- -->
- <attribute name="DefaultCacheTimeout">1800</attribute>
- <!-- DefaultCacheResolution: Specifies the default timed cache policy
- resolution in seconds. This controls the interval at which the cache
- current timestamp is updated and should be less than the DefaultCacheTimeout
- in order for the timeout to be meaningful. This has no affect if the
- AuthenticationCacheJndiName has been changed from the default value.
- -->
- <attribute name="DefaultCacheResolution">60</attribute>
- <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the
- security managers to be deep copies that makes copies of the subject
- principals and credentials if they are cloneable. It should be set to
- true if subject include mutable content that can be corrupted when
- multiple threads have the same identity and cache flushes/logout clearing
- the subject in one thread results in subject references affecting other
- threads.
- -->
- <attribute name="DeepCopySubjectMode">false</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Monitoring and Management -->
- <!-- ==================================================================== -->
-
- <!-- Uncomment to enable JMX monitoring of the bean cache
- <mbean code="org.jboss.monitor.BeanCacheMonitor"
- name="jboss.monitor:name=BeanCacheMonitor"/>
- -->
-
- <!-- Uncomment to enable JMX monitoring of the entity bean locking
- <mbean code="org.jboss.monitor.EntityLockMonitor"
- name="jboss.monitor:name=EntityLockMonitor"/>
- -->
-
- <!-- ==================================================================== -->
- <!-- An MBean that is a registry for JDBC type-mapping metadata -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
- name="jboss.jdbc:service=metadata"/>
-
+
</server>
Modified: trunk/server/src/etc/conf/web/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/web/jboss-service.xml 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/server/src/etc/conf/web/jboss-service.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -7,96 +7,18 @@
<!-- ===================================================================== -->
<server>
-
+
<!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
- the shared JBOSS_HOME/common/lib directory. This can be restricted to
- specific jars by specifying them in the archives attribute.
+ the shared JBOSS_HOME/common/lib directory. This can be restricted to
+ specific jars by specifying them in the archives attribute.
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
<classpath codebase="${jboss.common.lib.url}" archives="*"/>
-
+
<!-- ==================================================================== -->
- <!-- Main Deployer -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.deployment.MainDeployer"
- name="jboss.system:service=MainDeployer">
- <!-- This is used to delegate the deployment handling -->
- <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute>
- <!-- This is used to validate incomplete deployments -->
- <attribute name="Controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- XMBean Persistence -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.system.pm.AttributePersistenceService"
- name="jboss:service=AttributePersistenceService"
- xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
- <!-- the AttributePersistenceService is persistent, itself -->
-
- <!--
- <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
- <attribute name="AttributePersistenceManagerConfig">
- <data-directory>data/xmbean-attrs</data-directory>
- </attribute>
- <attribute name="ApmDestroyOnServiceStop">false</attribute>
- <attribute name="VersionTag"></attribute>
- -->
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Active Alarm Table -->
- <!-- ==================================================================== -->
-
- <!--
- | The ActiveAlarmTable service is a simple JMX notification listener
- | that maintains a table with the received notifications (alarms).
- | The alarms can be acknowledged through the jmx or the web console.
- | Modify the SubscriptionList below to subscribe for any notification
- | in the system and treat it as an alarm.
- | The JMXNotificationAppender is a log4j Appender that can be configured
- | in log4j.xml, that trasforms logging events to JMX notification so they
- | can be fed back into the table. By storing the WARN or higher level logging
- | events you can have a quick view of important system faults.
- |
- | The following attributes may be set:
- |
- | MaxTableSize (default 1000)
- | - set an upper limit to the number of stored alarms
- | LogLevel (default DEBUG)
- | - the log level to use for received notification, can be set to NONE
- | ServerId (default jboss)
- | - used to construct unique alarm ids
- | SubscriptionList
- | - subscribe for the notifications to be stored in the table
-
- <mbean code="org.jboss.monitor.services.ActiveAlarmTable"
- name="jboss.monitor:service=ActiveAlarmTable">
- <attribute name="SubscriptionList">
- <subscription-list>
- <mbean name="jboss.monitor:*">
- <notification type="jboss.alarm"/>
- <notification type="JBOSS_MONITOR_NOTIFICATION"/>
- </mbean>
- <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
- </subscription-list>
- </attribute>
- </mbean>
- -->
-
- <!-- ==================================================================== -->
- <!-- JBoss RMI Classloader - only install when available -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
- name="jboss.rmi:type=RMIClassLoader">
- <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
- <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
<!-- 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.
@@ -117,12 +39,24 @@
<!-- The listening port for the bootstrap JNP service. Set this to -1
to run the NamingService without the JNP invoker listening port.
-->
- <attribute name="Port">-1</attribute>
+ <attribute name="Port">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>Port</parameter>
+ </value-factory>
+ </attribute>
<!-- The bootstrap JNP server bind address. This also sets the default
RMI service bind address. Empty == all addresses
-->
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="BindAddress">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>Port</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </attribute>
+
<!-- The port of the RMI naming service, 0 == anonymous -->
<attribute name="RmiPort">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
@@ -130,9 +64,15 @@
<parameter>RmiPort</parameter>
</value-factory>
</attribute>
- <!-- The RMI service bind address. Empty == all addresses
- -->
- <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+ <!-- The RMI service bind address. Empty == all addresses -->
+ <attribute name="RmiBindAddress">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>RmiPort</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </attribute>
+
<!-- The thread pool service used to control the bootstrap lookups -->
<attribute name="LookupPool">
<inject bean="LongRunningTasksThreadPool"/>
@@ -144,9 +84,9 @@
<depends optional-attribute-name="Naming"
proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
</mbean>
-
+
<!-- Writes the bootstrap URL for the NamingService in a known location,
- so tools (e.g. Jopr) can use it as a java.naming.provider.url.
+ so tools (e.g. Jopr) can use it as a java.naming.provider.url.
-->
<mbean code="org.jboss.naming.NamingProviderURLWriter"
name="jboss:service=NamingProviderURLWriter"
@@ -158,57 +98,10 @@
</mbean>
<mbean code="org.jboss.naming.JNDIView"
- name="jboss:service=JNDIView"
- xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
- <!-- The HANamingService service name -->
- <attribute name="HANamingService">jboss:service=HAJNDI</attribute>
+ name="jboss:service=JNDIView"
+ xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
+ <!-- The HANamingService service name -->
+ <attribute name="HANamingService">jboss:service=HAJNDI</attribute>
</mbean>
-
- <!-- ==================================================================== -->
- <!-- Security -->
- <!-- ==================================================================== -->
-
- <!-- JAAS security manager and realm mapping -->
- <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
- name="jboss.security:service=JaasSecurityManager">
- <!-- A flag which indicates whether the SecurityAssociation server mode
- is set on service creation. This is true by default since the
- SecurityAssociation should be thread local for multi-threaded server
- operation.
- -->
- <attribute name="ServerMode">true</attribute>
- <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
- <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
- <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
- in seconds.
- If you want to disable caching of security credentials, set this to 0 to
- force authentication to occur every time. This has no affect if the
- AuthenticationCacheJndiName has been changed from the default value.
- -->
- <attribute name="DefaultCacheTimeout">1800</attribute>
- <!-- DefaultCacheResolution: Specifies the default timed cache policy
- resolution in seconds. This controls the interval at which the cache
- current timestamp is updated and should be less than the DefaultCacheTimeout
- in order for the timeout to be meaningful. This has no affect if the
- AuthenticationCacheJndiName has been changed from the default value.
- -->
- <attribute name="DefaultCacheResolution">60</attribute>
- <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the
- security managers to be deep copies that makes copies of the subject
- principals and credentials if they are cloneable. It should be set to
- true if subject include mutable content that can be corrupted when
- multiple threads have the same identity and cache flushes/logout clearing
- the subject in one thread results in subject references affecting other
- threads.
- -->
- <attribute name="DeepCopySubjectMode">false</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- An MBean that is a registry for JDBC type-mapping metadata -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
- name="jboss.jdbc:service=metadata"/>
-
+
</server>
Added: trunk/server/src/etc/deploy/legacy-conf-service.xml
===================================================================
--- trunk/server/src/etc/deploy/legacy-conf-service.xml (rev 0)
+++ trunk/server/src/etc/deploy/legacy-conf-service.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: jboss-service.xml 77499 2008-08-26 18:38:57Z dimitris at jboss.org $ -->
+
+<!-- ===================================================================== -->
+<!-- JBoss Server Configuration -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Main Deployer -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.deployment.MainDeployer"
+ name="jboss.system:service=MainDeployer">
+ <!-- This is used to delegate the deployment handling -->
+ <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute>
+ <!-- This is used to validate incomplete deployments -->
+ <attribute name="Controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></attribute>
+ </mbean>
+
+ <!-- ==================================================================== -->
+ <!-- XMBean Persistence -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.system.pm.AttributePersistenceService"
+ name="jboss:service=AttributePersistenceService"
+ xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
+ <!-- the AttributePersistenceService is persistent, itself -->
+
+ <!--
+ <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
+ <attribute name="AttributePersistenceManagerConfig">
+ <data-directory>data/xmbean-attrs</data-directory>
+ </attribute>
+ <attribute name="ApmDestroyOnServiceStop">false</attribute>
+ <attribute name="VersionTag"></attribute>
+ -->
+ </mbean>
+
+ <!-- ==================================================================== -->
+ <!-- JBoss RMI Classloader - only install when available -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
+ name="jboss.rmi:type=RMIClassLoader">
+ <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
+ <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
+ </mbean>
+
+ <!-- ==================================================================== -->
+ <!-- Class Loading -->
+ <!-- ==================================================================== -->
+
+ <!-- A mini webserver used for dynamic and class and resource loading -->
+ <mbean code="org.jboss.web.WebService"
+ name="jboss:service=WebService">
+ <!-- The Bind address and Port -->
+ <attribute name="BindAddress">
+ <!-- Get the interface to use from ServiceBindingManager. -->
+ <value-factory bean="ServiceBindingManager" method="getStringBinding" parameter="jboss:service=WebService"/>
+ </attribute>
+ <attribute name="Port">
+ <!-- Get the port to use from ServiceBindingManager. -->
+ <value-factory bean="ServiceBindingManager" method="getIntBinding" parameter="jboss:service=WebService"/>
+ </attribute>
+ <!-- The address to use for the host portion of the RMI codebase URL -->
+ <attribute name="Host">${java.rmi.server.hostname}</attribute>
+ <!-- Should non-EJB .class files be downloadable -->
+ <attribute name="DownloadServerClasses">true</attribute>
+ <!-- Should resources other than .class files be downloadable. Both
+ DownloadServerClasses and DownloadResources must be true for resources
+ to be downloadable. This is false by default because its generally a
+ bad idea as server configuration files that container security
+ information can be accessed.
+ -->
+ <attribute name="DownloadResources">false</attribute>
+
+ <!-- Use the default thread pool for dynamic class loading -->
+ <attribute name="Executor">
+ <inject bean="ThreadPool"/>
+ </attribute>
+ </mbean>
+
+ <!-- ==================================================================== -->
+ <!-- Security -->
+ <!-- ==================================================================== -->
+
+ <!-- JAAS security manager and realm mapping -->
+ <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
+ name="jboss.security:service=JaasSecurityManager">
+ <!-- A flag which indicates whether the SecurityAssociation server mode
+ is set on service creation. This is true by default since the
+ SecurityAssociation should be thread local for multi-threaded server
+ operation.
+ -->
+ <attribute name="ServerMode">true</attribute>
+ <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
+ <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
+ <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
+ in seconds.
+ If you want to disable caching of security credentials, set this to 0 to
+ force authentication to occur every time. This has no affect if the
+ AuthenticationCacheJndiName has been changed from the default value.
+ -->
+ <attribute name="DefaultCacheTimeout">1800</attribute>
+ <!-- DefaultCacheResolution: Specifies the default timed cache policy
+ resolution in seconds. This controls the interval at which the cache
+ current timestamp is updated and should be less than the DefaultCacheTimeout
+ in order for the timeout to be meaningful. This has no affect if the
+ AuthenticationCacheJndiName has been changed from the default value.
+ -->
+ <attribute name="DefaultCacheResolution">60</attribute>
+ <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the
+ security managers to be deep copies that makes copies of the subject
+ principals and credentials if they are cloneable. It should be set to
+ true if subject include mutable content that can be corrupted when
+ multiple threads have the same identity and cache flushes/logout clearing
+ the subject in one thread results in subject references affecting other
+ threads.
+ -->
+ <attribute name="DeepCopySubjectMode">false</attribute>
+ </mbean>
+
+ <!-- ==================================================================== -->
+ <!-- An MBean that is a registry for JDBC type-mapping metadata -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
+ name="jboss.jdbc:service=metadata"/>
+
+</server>
Added: trunk/server/src/etc/deploy/naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/naming-jboss-beans.xml (rev 0)
+++ trunk/server/src/etc/deploy/naming-jboss-beans.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- JNDI util and legacy beans -->
+
+ <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>
+
+ <!-- An obsolete bean only needed if using legacy detached invoker access,
+ or the createAlias/removeAlias operations
+ -->
+ <bean name="NamingService" class="org.jboss.naming.NamingService">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NamingBeanImpl", 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>
+ -->
+ <property name="namingInfo"><inject bean="RemoteNamingBean"/></property>
+ </bean>
+
+</deployment>
Added: trunk/server/src/etc/deployers/core-naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/core-naming-jboss-beans.xml (rev 0)
+++ trunk/server/src/etc/deployers/core-naming-jboss-beans.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -0,0 +1,63 @@
+<?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">
+ <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>
\ No newline at end of file
Modified: trunk/server/src/main/java/org/jboss/naming/NamingService.java
===================================================================
--- trunk/server/src/main/java/org/jboss/naming/NamingService.java 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/server/src/main/java/org/jboss/naming/NamingService.java 2009-11-18 19:01:09 UTC (rev 96504)
@@ -315,7 +315,7 @@
}
if( proxyFactory != null )
namingMain.setNamingProxy(proxyFactory.getProxy());
- namingMain.start();
+ //namingMain.start();
// Build the Naming interface method map
HashMap tmpMap = new HashMap(13);
Modified: trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/StaticProfileFactory.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/StaticProfileFactory.java 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/StaticProfileFactory.java 2009-11-18 19:01:09 UTC (rev 96504)
@@ -162,8 +162,6 @@
public void create() throws Exception
{
// Sanity checks
- if(this.bootstrapURI == null)
- throw new IllegalStateException("Null bootstrap uri.");
if(this.deployersURI == null)
throw new IllegalStateException("Null deployers uri.");
if(this.applicationURIs == null)
@@ -194,14 +192,17 @@
addProfile(bindingsKey, bindings);
subprofileNames = new String[] { bindingsName };
}
- // Create bootstrap profile meta data
- ProfileKey bootstrapKey = new ProfileKey(bootstrapName);
- ProfileMetaData bootstrap = createProfileMetaData(bootstrapName, false,
- new URI[] { bootstrapURI }, subprofileNames );
- addProfile(bootstrapKey, bootstrap);
-
- subprofileNames = createSubprofileNames(subprofileNames, bootstrapName);
-
+ // Create bootstrap profile meta data if the bootstrapURI is defined
+ if(bootstrapURI != null)
+ {
+ ProfileKey bootstrapKey = new ProfileKey(bootstrapName);
+ ProfileMetaData bootstrap = createProfileMetaData(bootstrapName, false,
+ new URI[] { bootstrapURI }, subprofileNames );
+ addProfile(bootstrapKey, bootstrap);
+
+ subprofileNames = createSubprofileNames(subprofileNames, bootstrapName);
+ }
+
// Create deployers profile meta data
ProfileKey deployersKey = new ProfileKey(deployersName);
ProfileMetaData deployers = createProfileMetaData(
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JBossMessagingAdmin.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JBossMessagingAdmin.java 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JBossMessagingAdmin.java 2009-11-18 19:01:09 UTC (rev 96504)
@@ -53,9 +53,9 @@
{
try
{
- name = JBossMessagingAdmin.class.getName() ;
+ name = JBossMessagingAdmin.class.getName() ;
serverPeer = new ObjectName("jboss.messaging:service=ServerPeer");
- namingService = new ObjectName("jboss:service=Naming");
+ namingService = new ObjectName("jboss:service=NamingBeanImpl");
}
catch (Exception e)
{
Modified: trunk/varia/src/resources/beanvalidation/bv-core-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/beanvalidation/bv-core-jboss-beans.xml 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/varia/src/resources/beanvalidation/bv-core-jboss-beans.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -20,6 +20,8 @@
</bean>
<!-- Default JNDI name creator -->
- <bean name="DefaultJndiBinder" class="org.jboss.beanvalidation.util.DefaultJndiBinder" />
+ <bean name="DefaultJndiBinder" class="org.jboss.beanvalidation.util.DefaultJndiBinder">
+ <demand state="Instantiated">LocalNamingBean</demand>
+ </bean>
</deployment>
Modified: trunk/varia/src/resources/services/invoker/http/jboss-service.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/http/jboss-service.xml 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/varia/src/resources/services/invoker/http/jboss-service.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -28,7 +28,7 @@
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss:service=invoker,type=http,target=Naming">
<!-- The Naming service we are proxying -->
- <attribute name="InvokerName">jboss:service=Naming</attribute>
+ <attribute name="InvokerName">jboss:service=NamingBeanImpl</attribute>
<!-- Compose the invoker URL from the cluster node address -->
<attribute name="InvokerURLPrefix">http://</attribute>
<attribute name="InvokerURLSuffix">
@@ -57,7 +57,7 @@
-->
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss:service=invoker,type=http,target=Naming,readonly=true">
- <attribute name="InvokerName">jboss:service=Naming</attribute>
+ <attribute name="InvokerName">jboss:service=NamingBeanImpl</attribute>
<attribute name="InvokerURLPrefix">http://</attribute>
<attribute name="InvokerURLSuffix">
<!-- To get value, ask the ServiceBindingManager to do a string
Modified: trunk/varia/src/resources/services/invoker/http/web.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/http/web.xml 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/varia/src/resources/services/invoker/http/web.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -22,7 +22,7 @@
</init-param>
<init-param>
<param-name>invokerName</param-name>
- <param-value>jboss:service=Naming</param-value>
+ <param-value>jboss:service=NamingBeanImpl</param-value>
<description>The JMX ObjectName of the naming service mbean
</description>
</init-param>
Modified: trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -46,7 +46,7 @@
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss:service=invoker,type=http,target=Naming">
<!-- The Naming service we are proxying -->
- <attribute name="InvokerName">jboss:service=Naming</attribute>
+ <attribute name="InvokerName">jboss:service=NamingBeanImpl</attribute>
<!-- Compose the invoker URL from the cluster node address -->
<attribute name="InvokerURLPrefix">http://</attribute>
<attribute name="InvokerURLSuffix">
@@ -75,7 +75,7 @@
-->
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss:service=invoker,type=http,target=Naming,readonly=true">
- <attribute name="InvokerName">jboss:service=Naming</attribute>
+ <attribute name="InvokerName">jboss:service=NamingBeanImpl</attribute>
<attribute name="InvokerURLPrefix">http://</attribute>
<attribute name="InvokerURLSuffix">
<!-- To get value, ask the ServiceBindingManager to do a string
Modified: trunk/varia/src/resources/services/invoker/httpha/web.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/httpha/web.xml 2009-11-18 18:30:58 UTC (rev 96503)
+++ trunk/varia/src/resources/services/invoker/httpha/web.xml 2009-11-18 19:01:09 UTC (rev 96504)
@@ -22,7 +22,7 @@
</init-param>
<init-param>
<param-name>invokerName</param-name>
- <param-value>jboss:service=Naming</param-value>
+ <param-value>jboss:service=NamingBeanImpl</param-value>
<description>The JMX ObjectName of the naming service mbean
</description>
</init-param>
More information about the jboss-cvs-commits
mailing list