[jboss-cvs] JBossAS SVN: r81293 - trunk/server/src/etc/conf/default/bootstrap.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 19 10:38:33 EST 2008
Author: adrian at jboss.org
Date: 2008-11-19 10:38:33 -0500 (Wed, 19 Nov 2008)
New Revision: 81293
Modified:
trunk/server/src/etc/conf/default/bootstrap/aop.xml
trunk/server/src/etc/conf/default/bootstrap/classloader.xml
trunk/server/src/etc/conf/default/bootstrap/deployers.xml
trunk/server/src/etc/conf/default/bootstrap/jmx.xml
trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml
trunk/server/src/etc/conf/default/bootstrap/profile.xml
Log:
[JBAS-5535] - Move the jars to the correct classloader in the bootstrap
Modified: trunk/server/src/etc/conf/default/bootstrap/aop.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/aop.xml 2008-11-19 15:27:08 UTC (rev 81292)
+++ trunk/server/src/etc/conf/default/bootstrap/aop.xml 2008-11-19 15:38:33 UTC (rev 81293)
@@ -75,36 +75,4 @@
-->
</bean>
- <!-- Support for @JMX -->
- <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
- name="JMXRegistrationAdvice"
- class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
- </lifecycle-configure>
- <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
- name="JMXCreateDestroyAdvice"
- class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
- </lifecycle-create>
- <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
- name="JMXStartStopAdvice"
- class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
- </lifecycle-install>
-
- <!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
- <bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="aspectManager"><inject bean="AspectManager" property="delegate"/></property>
- </bean>
-
</deployment>
Modified: trunk/server/src/etc/conf/default/bootstrap/classloader.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/classloader.xml 2008-11-19 15:27:08 UTC (rev 81292)
+++ trunk/server/src/etc/conf/default/bootstrap/classloader.xml 2008-11-19 15:38:33 UTC (rev 81293)
@@ -25,29 +25,8 @@
</bean>
<classloader name="bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <!-- FIXME Move to Deployers -->
- <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-core.jar</root>
- <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-client.jar</root>
- <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
- <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
<!-- System -->
<root>${jboss.lib.url}jboss-system.jar</root>
- <root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
- <!-- FIXME Move to JMX -->
- <root>${jboss.lib.url}jboss-j2se.jar</root>
- <root>${jboss.lib.url}jboss-mbeans.jar</root>
- <root>${jboss.lib.url}jboss-jmx.jar</root>
- <root>${jboss.lib.url}jboss-system-jmx.jar</root>
- <root>${jboss.lib.url}dom4j.jar</root>
- <!-- JAXB impl here, api is in endorsed -->
- <root>${jboss.lib.url}jaxb-impl.jar</root>
- <!-- STAX2 impl here, api is in endorsed -->
- <root>${jboss.lib.url}wstx.jar</root>
</classloader>
</deployment>
Modified: trunk/server/src/etc/conf/default/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/deployers.xml 2008-11-19 15:27:08 UTC (rev 81292)
+++ trunk/server/src/etc/conf/default/bootstrap/deployers.xml 2008-11-19 15:38:33 UTC (rev 81293)
@@ -8,8 +8,6 @@
<classloader><inject bean="deployers-classloader:0.0.0"/></classloader>
<classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <!-- FIXME
- <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
<root>${jboss.lib.url}jboss-deployers-core.jar</root>
<root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
<root>${jboss.lib.url}jboss-deployers-client.jar</root>
@@ -18,7 +16,11 @@
<root>${jboss.lib.url}jboss-deployers-impl.jar</root>
<root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
<root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
- -->
+
+ <!-- JAXB impl here, api is in endorsed -->
+ <root>${jboss.lib.url}jaxb-impl.jar</root>
+ <!-- STAX2 impl here, api is in endorsed -->
+ <root>${jboss.lib.url}wstx.jar</root>
</classloader>
<!-- use legacy ordering -->
Modified: trunk/server/src/etc/conf/default/bootstrap/jmx.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/jmx.xml 2008-11-19 15:27:08 UTC (rev 81292)
+++ trunk/server/src/etc/conf/default/bootstrap/jmx.xml 2008-11-19 15:38:33 UTC (rev 81293)
@@ -8,13 +8,14 @@
<classloader><inject bean="jmx-classloader:0.0.0"/></classloader>
<classloader name="jmx-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <!-- FIXME
<root>${jboss.lib.url}jboss-j2se.jar</root>
<root>${jboss.lib.url}jboss-mbeans.jar</root>
<root>${jboss.lib.url}jboss-jmx.jar</root>
<root>${jboss.lib.url}jboss-system-jmx.jar</root>
<root>${jboss.lib.url}dom4j.jar</root>
- -->
+
+ <!-- FIXME ServiceController uses DeploymentException -->
+ <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
</classloader>
<bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
@@ -28,4 +29,36 @@
<property name="serverInfo"><inject bean="ServerInfo"/></property>
</bean>
+ <!-- Support for @JMX -->
+ <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ name="JMXRegistrationAdvice"
+ class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+ manager-bean="AspectManager"
+ manager-property="aspectManager">
+ <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+ </lifecycle-configure>
+ <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
+ name="JMXCreateDestroyAdvice"
+ class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+ manager-bean="AspectManager"
+ manager-property="aspectManager">
+ <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+ </lifecycle-create>
+ <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
+ name="JMXStartStopAdvice"
+ class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+ manager-bean="AspectManager"
+ manager-property="aspectManager">
+ <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+ </lifecycle-install>
+
+ <!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
+ <bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="aspectManager"><inject bean="AspectManager" property="delegate"/></property>
+ </bean>
+
</deployment>
Modified: trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml 2008-11-19 15:27:08 UTC (rev 81292)
+++ trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml 2008-11-19 15:38:33 UTC (rev 81293)
@@ -7,7 +7,9 @@
<classloader><inject bean="profile-classloader:0.0.0"/></classloader>
- <classloader name="profile-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+ <classloader name="profile-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
+ </classloader>
<!-- The file repository profile service which provides full
support ProfileService spi.
Modified: trunk/server/src/etc/conf/default/bootstrap/profile.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/profile.xml 2008-11-19 15:27:08 UTC (rev 81292)
+++ trunk/server/src/etc/conf/default/bootstrap/profile.xml 2008-11-19 15:38:33 UTC (rev 81293)
@@ -7,7 +7,9 @@
<classloader><inject bean="profile-classloader:0.0.0"/></classloader>
- <classloader name="profile-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+ <classloader name="profile-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
+ </classloader>
<!-- The basic profile service which relies on vfs scanners
to determine the profile deployments. This version does not
More information about the jboss-cvs-commits
mailing list