[jboss-cvs] JBossAS SVN: r71919 - in trunk: cluster and 3 other directories.

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

Author: adrian at jboss.org
Date: 2008-04-10 09:54:31 -0400 (Thu, 10 Apr 2008)
New Revision: 71919

Modified:
   trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml
   trunk/cluster/build.xml
   trunk/component-matrix/pom.xml
   trunk/security/build.xml
   trunk/system-jmx/src/main/org/jboss/system/ServiceController.java
Log:
[JBAS-5121] - Update to latest MC betas and the latest JBossXB

Modified: trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml
===================================================================
--- trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml	2008-04-10 13:34:31 UTC (rev 71918)
+++ trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml	2008-04-10 13:54:31 UTC (rev 71919)
@@ -11,13 +11,13 @@
    </bean>
 
    <!-- Add the JMX -->
-   <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+   <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
                name="JMXAdvice"
                class="org.jboss.system.microcontainer.jmx.ServiceControllerLifecycleCallback"
                classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
                manager-bean="AspectManager"
                manager-property="aspectManager">
       <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
-   </aop:lifecycle-configure>
+   </lifecycle-configure>
 
 </deployment>

Modified: trunk/cluster/build.xml
===================================================================
--- trunk/cluster/build.xml	2008-04-10 13:34:31 UTC (rev 71918)
+++ trunk/cluster/build.xml	2008-04-10 13:54:31 UTC (rev 71919)
@@ -84,6 +84,7 @@
       <path refid="jboss.remoting.classpath"/>
       <path refid="jboss.metadata.classpath"/>      
       <path refid="jboss.jboss.deployers.classpath"/>      
+      <path refid="jboss.jboss.mdr.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
       <path refid="jboss.integration.classpath"/>
       <path refid="jboss.jboss.javaee.classpath"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-04-10 13:34:31 UTC (rev 71918)
+++ trunk/component-matrix/pom.xml	2008-04-10 13:54:31 UTC (rev 71919)
@@ -38,10 +38,10 @@
     <version.jboss.web>2.1.0.GA</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.deployers>2.0.0.Beta11</version.org.jboss.deployers>
+    <version.org.jboss.deployers>2.0.0.Beta13</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.Beta11</version.org.jboss.microcontainer>
+    <version.org.jboss.microcontainer>2.0.0.Beta13</version.org.jboss.microcontainer>
     <version.org.jboss.security>2.0.2.Beta5</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
     <version.suffix.org.jboss.javaee>-SNAPSHOT</version.suffix.org.jboss.javaee>
@@ -820,7 +820,7 @@
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-mdr</artifactId>
-        <version>2.0.0.Beta12</version>
+        <version>2.0.0.Beta14</version>
       </dependency>
       <dependency>
         <groupId>org.jboss</groupId>
@@ -852,7 +852,7 @@
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jbossxb</artifactId>
-        <version>2.0.0.CR7</version>
+        <version>2.0.0.CR8</version>
         <exclusions>
           <exclusion>
             <groupId>jboss</groupId>

Modified: trunk/security/build.xml
===================================================================
--- trunk/security/build.xml	2008-04-10 13:34:31 UTC (rev 71918)
+++ trunk/security/build.xml	2008-04-10 13:54:31 UTC (rev 71919)
@@ -95,6 +95,7 @@
       <path refid="jboss.jboss.jaspi.api.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>
       <path refid="jboss.jboss.deployers.classpath"/>
+      <path refid="jboss.jboss.mdr.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
       <path refid="jboss.naming.classpath"/>
       <path refid="jboss.jboss.security.spi.classpath"/>

Modified: trunk/system-jmx/src/main/org/jboss/system/ServiceController.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/ServiceController.java	2008-04-10 13:34:31 UTC (rev 71918)
+++ trunk/system-jmx/src/main/org/jboss/system/ServiceController.java	2008-04-10 13:54:31 UTC (rev 71919)
@@ -704,7 +704,7 @@
       boolean first = true;
       
       StringBuilder builder = new StringBuilder();
-      for (DependencyItem item : context.getDependencyInfo().getUnresolvedDependencies())
+      for (DependencyItem item : context.getDependencyInfo().getUnresolvedDependencies(null))
       {
          if (item.isResolved() == false && item.getWhenRequired() == state)
          {