[jboss-cvs] JBossAS SVN: r80183 - in projects/demos/microcontainer/trunk: ioc/src/main/java/org/jboss/demos/ioc/classloader and 1 other directories.

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

Author: alesj
Date: 2008-10-29 07:38:11 -0400 (Wed, 29 Oct 2008)
New Revision: 80183

Modified:
   projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java
   projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/classloader-beans.xml
   projects/demos/microcontainer/trunk/pom.xml
Log:
Use Deployers 2.2.0-SNAPSHOT.
Enable custom classloader.

Modified: projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java	2008-10-29 11:35:50 UTC (rev 80182)
+++ projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java	2008-10-29 11:38:11 UTC (rev 80183)
@@ -40,7 +40,7 @@
       if (pattern == null || pattern.matcher(name).matches())
          return super.loadClass(name);
       else
-         throw new ClassNotFoundException("Name doesn't match pattern: " + pattern);
+         throw new ClassNotFoundException("Name '" + name + "' doesn't match pattern: " + pattern);
    }
 
    public void setPattern(String regexp)

Modified: projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/classloader-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/classloader-beans.xml	2008-10-29 11:35:50 UTC (rev 80182)
+++ projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/classloader-beans.xml	2008-10-29 11:38:11 UTC (rev 80183)
@@ -1,26 +1,20 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-  <!-- TODO - fix me -->
+  <classloader><inject bean="custom-classloader:0.0.0"/></classloader>
 
-  <!--<classloader><inject bean="custom-classloader:0.0.0"/></classloader>-->
-
   <classloader name="custom-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
 
-<!--
   <bean name="CustomCL" class="org.jboss.demos.ioc.classloader.CustomClassLoader">
     <constructor>
       <parameter><inject bean="custom-classloader:0.0.0"/></parameter>
     </constructor>
-    <property name="pattern">[.]+</property>
+    <property name="pattern">org\.jboss\.demos\.ioc\..+</property>
   </bean>
--->
 
   <bean name="CB1" class="org.jboss.demos.ioc.classloader.CustomBean"/>
 
-<!--
   <bean name="CB2" class="org.jboss.demos.ioc.classloader.CustomBean">
     <classloader><inject bean="CustomCL"/></classloader>
   </bean>
--->
 
 </deployment>

Modified: projects/demos/microcontainer/trunk/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/pom.xml	2008-10-29 11:35:50 UTC (rev 80182)
+++ projects/demos/microcontainer/trunk/pom.xml	2008-10-29 11:38:11 UTC (rev 80183)
@@ -36,7 +36,7 @@
     <version.jboss.man>2.0.0.CR2</version.jboss.man>
     <version.jboss.mdr>2.0.0.GA</version.jboss.mdr>
     <version.jboss.microcontainer>2.2.0-SNAPSHOT</version.jboss.microcontainer>
-    <version.jboss.deployers>2.0.0.CR3</version.jboss.deployers>
+    <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers>
     <version.jboss.classloader>2.0.0.CR4</version.jboss.classloader>
     <version.jboss.common.core>2.2.8.GA</version.jboss.common.core>
     <version.jboss.common.logging.spi>2.0.5.GA</version.jboss.common.logging.spi>