[jboss-cvs] JBossAS SVN: r68825 - in trunk: server/src/etc/conf/default and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 10 10:20:38 EST 2008
Author: adrian at jboss.org
Date: 2008-01-10 10:20:36 -0500 (Thu, 10 Jan 2008)
New Revision: 68825
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/server/src/etc/conf/default/bootstrap-beans.xml
Log:
JBAS-5119 - Update configuration to the new classloader
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-01-10 15:14:19 UTC (rev 68824)
+++ trunk/build/build-distr.xml 2008-01-10 15:20:36 UTC (rev 68825)
@@ -1800,6 +1800,9 @@
<fileset dir="${jboss.jboss.vfs.lib}">
<include name="jboss-vfs.jar"/>
</fileset>
+ <fileset dir="${osgi.osgi.lib}">
+ <include name="osgi.core.jar"/>
+ </fileset>
<fileset dir="${trove.trove.lib}">
<include name="trove.jar"/>
</fileset>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2008-01-10 15:14:19 UTC (rev 68824)
+++ trunk/build/build-thirdparty.xml 2008-01-10 15:20:36 UTC (rev 68825)
@@ -108,7 +108,7 @@
<componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
<componentref name="jboss/messaging" version="1.4.0.SP3"/>
<componentref name="jboss/metadata" version="1.0.0.Beta4"/>
- <componentref name="jboss/microcontainer" version="2.0.0.Beta9"/>
+ <componentref name="jboss/microcontainer" version="snapshot"/>
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
<componentref name="jboss/remoting" version="2.2.2.SP3-brew"/>
<componentref name="jboss/serialization" version="1.0.3.GA"/>
@@ -123,6 +123,7 @@
<componentref name="objectweb-joramtests" version="1.5"/>
<componentref name="odmg" version="3.0"/>
<componentref name="opensaml" version="1.1b"/>
+ <componentref name="osgi" version="4.0"/>
<componentref name="oswego-concurrent" version="1.3.4-jboss-update1"/>
<componentref name="qdox" version="1.6.1-brew"/>
<componentref name="quartz" version="1.5.2-brew"/>
Modified: trunk/server/src/etc/conf/default/bootstrap-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-beans.xml 2008-01-10 15:14:19 UTC (rev 68824)
+++ trunk/server/src/etc/conf/default/bootstrap-beans.xml 2008-01-10 15:20:36 UTC (rev 68825)
@@ -21,6 +21,7 @@
<!-- ClassLoader -->
<value>${jboss.lib.url}/jboss-classloading-spi.jar</value>
<value>${jboss.lib.url}/jboss-classloader.jar</value>
+ <value>${jboss.lib.url}/osgi.core.jar</value>
<!-- Deployers -->
<value>${jboss.lib.url}/jboss-metatype.jar</value>
<value>${jboss.lib.url}/jboss-managed.jar</value>
@@ -85,14 +86,14 @@
<bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="serverImpl"><inject bean="JBossServer"/></property>
- <property name="oldClassLoader">true</property>
+ <property name="oldClassLoader">false</property>
</bean>
<!-- Repository classloader -->
- <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss4.RepositoryClassLoaderScopingPolicy"/>
+ <!--bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss4.RepositoryClassLoaderScopingPolicy"/-->
<!-- VFS ClassLoader -->
- <!-- bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/-->
+ <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
<!-- Integration -->
<bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
@@ -271,12 +272,12 @@
</bean>
<!-- UnifiedClassLoader -->
- <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer">
+ <!--bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer">
<constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
- </bean>
+ </bean-->
<!-- VFS ClassLoader -->
- <!--bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
+ <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
<constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
</bean>
<bean name="ClassLoading" class="org.jboss.deployers.plugins.classloading.ClassLoading"/>
@@ -287,7 +288,7 @@
<property name="classLoading"><inject bean="ClassLoading"/></property>
<property name="system"><inject bean="ClassLoaderSystem"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean-->
+ </bean>
<!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
<bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
More information about the jboss-cvs-commits
mailing list