[jboss-cvs] JBossAS SVN: r103751 - in trunk: server/src/etc/conf/all/bootstrap and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2010-04-09 08:00:57 -0400 (Fri, 09 Apr 2010)
New Revision: 103751

Removed:
   trunk/server/src/etc/conf/osgi/bootstrap/
Modified:
   trunk/build/build.xml
   trunk/server/src/etc/conf/all/bootstrap/deployers.xml
Log:
[JBAS-7909] Restore (harmless) workaround in deployers.xml
This needs to be there for users that run the jbosgi installer against 'default' or 'all'
Can be removed when JBAS-7909 gets resolved.


Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-04-09 11:38:54 UTC (rev 103750)
+++ trunk/build/build.xml	2010-04-09 12:00:57 UTC (rev 103751)
@@ -368,11 +368,7 @@
     <copy todir="${install.osgi.conf}">
       <fileset dir="${install.default.conf}">
         <include name="**"/>
-        <exclude name="bootstrap/deployers.xml"/>
       </fileset>
-      <fileset dir="${server.module.output}/etc/conf/osgi">
-        <include name="bootstrap/deployers.xml"/>
-      </fileset>
     </copy>
     <copy todir="${install.osgi.deployers}">
       <fileset dir="${install.all.deployers}">

Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml	2010-04-09 11:38:54 UTC (rev 103750)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml	2010-04-09 12:00:57 UTC (rev 103751)
@@ -23,6 +23,10 @@
       <root>${jboss.lib.url}jaxb-impl.jar</root>
       <!-- STAX2 impl here, api is in endorsed -->
       <root>${jboss.lib.url}wstx-lgpl.jar</root>
+      
+      <!-- [JBAS-7909] AOPClassLoaderDeployer breaks OSGi integration -->
+      <root>${jboss.lib.url}jboss-as-osgi-integration.jar</root>
+      <root>${jboss.lib.url}jboss-osgi-framework-metadata.jar</root>
    </classloader>
 
   <!-- use legacy ordering -->
@@ -169,7 +173,8 @@
    <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
       <constructor><parameter>0</parameter></constructor>
    </bean>
-   <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
+   <!-- bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer" -->
+   <bean name="AOPClassLoaderDeployer" class="org.jboss.osgi.integration.jbossas.AOPClassLoaderDeployerJBAS7909">
       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
    </bean>
    <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">