[jboss-cvs] JBossAS SVN: r73018 - in trunk: system/src/main/org/jboss/aop/deployers/temp and 1 other directory.

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

Author: alesj
Date: 2008-05-02 09:18:00 -0400 (Fri, 02 May 2008)
New Revision: 73018

Modified:
   trunk/component-matrix/pom.xml
   trunk/system/src/main/org/jboss/aop/deployers/temp/Hack.java
Log:
Update of MDR, VFS, MC, CL, Deployers.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-05-02 12:36:49 UTC (rev 73017)
+++ trunk/component-matrix/pom.xml	2008-05-02 13:18:00 UTC (rev 73018)
@@ -37,12 +37,14 @@
     <version.jboss.messaging>1.4.1.CR1</version.jboss.messaging>
     <version.jboss.web>2.1.1.CR1</version.jboss.web>
     <version.org.jboss.aop>2.0.0.CR8</version.org.jboss.aop>
-    <version.org.jboss.cl>2.0.0.Beta11</version.org.jboss.cl>
+    <version.org.jboss.mdr>2.0.0.Beta15</version.org.jboss.mdr>
+    <version.org.jboss.vfs>2.0.0.Beta11</version.org.jboss.vfs>
+    <version.org.jboss.cl>2.0.0.Beta12</version.org.jboss.cl>
     <version.org.jboss.cluster>1.1.0.Beta1</version.org.jboss.cluster>
-    <version.org.jboss.deployers>2.0.0-SNAPSHOT</version.org.jboss.deployers>
+    <version.org.jboss.deployers>2.0.0.Beta15</version.org.jboss.deployers>
     <version.org.jboss.integration>5.0.0.Beta4</version.org.jboss.integration>
     <version.org.jboss.man>2.0.0.Beta12</version.org.jboss.man>
-    <version.org.jboss.microcontainer>2.0.0.Beta13</version.org.jboss.microcontainer>
+    <version.org.jboss.microcontainer>2.0.0.Beta14</version.org.jboss.microcontainer>
     <version.org.jboss.security>2.0.2.Beta7</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
     <version.suffix.org.jboss.javaee>.CR1</version.suffix.org.jboss.javaee>
@@ -996,7 +998,7 @@
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-mdr</artifactId>
-        <version>2.0.0.Beta14</version>
+        <version>${version.org.jboss.mdr}</version>
       </dependency>
       
       <dependency>
@@ -1020,7 +1022,7 @@
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-vfs</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>${version.org.jboss.vfs}</version>
         <exclusions>
           <exclusion>
             <groupId>jboss</groupId>

Modified: trunk/system/src/main/org/jboss/aop/deployers/temp/Hack.java
===================================================================
--- trunk/system/src/main/org/jboss/aop/deployers/temp/Hack.java	2008-05-02 12:36:49 UTC (rev 73017)
+++ trunk/system/src/main/org/jboss/aop/deployers/temp/Hack.java	2008-05-02 13:18:00 UTC (rev 73018)
@@ -21,7 +21,6 @@
 */
 package org.jboss.aop.deployers.temp;
 
-import org.jboss.aop.microcontainer.beans.xml.AOPBeansSchemaInitializer;
 import org.jboss.kernel.Kernel;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
@@ -30,7 +29,7 @@
  * This is a hack to fix the problems caused
  * by aop-mc-int not being in the same classloader
  * as the mc and jbossxb.
- * 
+ *
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
@@ -39,7 +38,7 @@
    public Hack(Kernel kernel) throws Exception
    {
       DefaultSchemaResolver resolver = (DefaultSchemaResolver) SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
-      resolver.addSchemaInitializer("urn:jboss:aop-beans:1.0", new AOPBeansSchemaInitializer());
+      resolver.addClassBinding("urn:jboss:aop-beans:1.0", "org.jboss.aop.microcontainer.beans.metadata.AOPDeployment");
       resolver.addSchemaParseAnnotations("urn:jboss:aop-beans:1.0", Boolean.FALSE);
    }
 }