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

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

Author: alesj
Date: 2011-02-04 11:03:32 -0500 (Fri, 04 Feb 2011)
New Revision: 110542

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/conf/all/bootstrap/aop.xml
   trunk/server/src/etc/conf/all/bootstrap/classloader.xml
   trunk/server/src/etc/conf/all/bootstrap/jmx.xml
   trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
Log:
Fix Reflect and bootstrap config, so Javassist usage work OOTB.


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2011-02-04 15:59:11 UTC (rev 110541)
+++ trunk/component-matrix/pom.xml	2011-02-04 16:03:32 UTC (rev 110542)
@@ -122,7 +122,7 @@
     <version.org.jboss.mx>6.0.0.GA</version.org.jboss.mx>
     <version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
     <version.org.jboss.profileservice>0.2.2</version.org.jboss.profileservice>
-    <version.org.jboss.reflect>2.2.0.GA</version.org.jboss.reflect>
+    <version.org.jboss.reflect>2.2.1.GA</version.org.jboss.reflect>
     <version.org.jboss.reloaded.naming>0.3.0</version.org.jboss.reloaded.naming>
     <version.org.jboss.resteasy>2.1.0.GA</version.org.jboss.resteasy>
     <version.org.jboss.remoting>2.5.3</version.org.jboss.remoting>

Modified: trunk/server/src/etc/conf/all/bootstrap/aop.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/aop.xml	2011-02-04 15:59:11 UTC (rev 110541)
+++ trunk/server/src/etc/conf/all/bootstrap/aop.xml	2011-02-04 16:03:32 UTC (rev 110542)
@@ -16,15 +16,6 @@
       <root>${jboss.lib.url}jboss-classpool-jbosscl-as.jar</root>
    </classloader>
 
-   <!--
-      AS > 6.0.0.M3 installs this as part of its bootstrap 
-    -->
-   <bean name="JBossClClassPoolConfig" class="org.jboss.classpool.plugins.jbosscl.JBossClClassPoolConfig">
-      <constructor factoryMethod="getInstance"/>
-      <property name="classLoading"><inject bean="ClassLoading"/></property>
-   </bean>   
-
-
    <!-- Integration -->
    <!--  
       It now wraps and delegates to the plain VFSClassLoaderDomainRegistry provided by AS

Modified: trunk/server/src/etc/conf/all/bootstrap/classloader.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/classloader.xml	2011-02-04 15:59:11 UTC (rev 110541)
+++ trunk/server/src/etc/conf/all/bootstrap/classloader.xml	2011-02-04 16:03:32 UTC (rev 110542)
@@ -5,8 +5,6 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <classloader><inject bean="bootstrap-classloader:0.0.0"/></classloader>
-
    <!--
       The classloader implementation
    -->
@@ -40,9 +38,20 @@
       <uncallback method="removeModule" state="Configured"/>
    </bean>
 
-   <classloader name="bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
-      <!-- System -->
-      <root>${jboss.lib.url}jboss-system.jar</root>
-   </classloader>
-   
+   <!--
+      Javassist setup - we can set the repo anyway, even though we don't actually use JavassistTIF
+    -->
+   <bean name="JBossClClassPoolConfig" class="org.jboss.classpool.plugins.jbosscl.JBossClClassPoolConfig">
+      <classloader><null/></classloader>
+      <constructor factoryMethod="getInstance"/>
+      <property name="classLoading"><inject bean="ClassLoading"/></property>
+   </bean>
+
+   <bean name="JavassistInitializer" class="org.jboss.reflect.plugins.javassist.JavassistInitializer">
+      <classloader><null/></classloader>
+      <constructor>
+         <parameter><inject bean="JBossClClassPoolConfig" property="classPoolRepository"/></parameter>
+      </constructor>
+   </bean>
+
 </deployment>

Modified: trunk/server/src/etc/conf/all/bootstrap/jmx.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/jmx.xml	2011-02-04 15:59:11 UTC (rev 110541)
+++ trunk/server/src/etc/conf/all/bootstrap/jmx.xml	2011-02-04 16:03:32 UTC (rev 110542)
@@ -13,6 +13,7 @@
       <root>${jboss.lib.url}jboss-mbeans.jar</root>
       <root>${jboss.lib.url}jboss-mbeanserver.jar</root>
       <root>${jboss.lib.url}jboss-jmx.jar</root>
+      <root>${jboss.lib.url}jboss-system.jar</root>
       <root>${jboss.lib.url}jboss-system-jmx.jar</root>
       <root>${jboss.lib.url}jboss-jmx-mc-int.jar</root>
       <root>${jboss.lib.url}jboss-deployers-jmx.jar</root>

Modified: trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml	2011-02-04 15:59:11 UTC (rev 110541)
+++ trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml	2011-02-04 16:03:32 UTC (rev 110542)
@@ -12,6 +12,9 @@
 
   <bean name="ResourceErrorHandler" class="org.jboss.scanning.plugins.visitor.IgnoreSetErrorHandler">
      <install method="addIgnored">
+         <parameter>javassist.NotFoundException</parameter>
+     </install>
+     <install method="addIgnored">
          <parameter>java.lang.NoClassDefFoundError</parameter>
      </install>
      <install method="addIgnored">
@@ -36,6 +39,9 @@
          <parameter>java.lang.NoClassDefFoundError</parameter>
      </uninstall>
      <uninstall method="removeIgnored">
+         <parameter>javassist.NotFoundException</parameter>
+     </uninstall>
+     <uninstall method="removeIgnored">
          <parameter>java.lang.TypeNotPresentException</parameter>
      </uninstall>
      <uninstall method="removeIgnored">