[jboss-cvs] JBossAS SVN: r68372 - in trunk: profileservice/src/main/org/jboss/profileservice/management and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-12-18 02:44:59 -0500 (Tue, 18 Dec 2007)
New Revision: 68372

Modified:
   trunk/build/build-thirdparty.xml
   trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
   trunk/tomcat/src/resources/jboss-structure.xml
Log:
Update to mc 2.0.0.Beta8

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-12-18 07:07:47 UTC (rev 68371)
+++ trunk/build/build-thirdparty.xml	2007-12-18 07:44:59 UTC (rev 68372)
@@ -107,7 +107,7 @@
     <componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
     <componentref name="jboss/messaging" version="1.4.0.SP1-brew"/>
     <componentref name="jboss/metadata" version="1.0.0.Beta4"/>
-    <componentref name="jboss/microcontainer" version="2.0.0.Beta7"/>
+    <componentref name="jboss/microcontainer" version="2.0.0.Beta8"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
     <componentref name="jboss/remoting" version="2.2.2.SP3-brew"/>
     <componentref name="jboss/serialization" version="1.0.3.GA"/>

Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java	2007-12-18 07:07:47 UTC (rev 68371)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java	2007-12-18 07:44:59 UTC (rev 68372)
@@ -65,8 +65,10 @@
 import org.jboss.managed.plugins.ManagedObjectImpl;
 import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
 import org.jboss.metatype.api.types.ArrayMetaType;
+import org.jboss.metatype.api.types.CollectionMetaType;
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.values.ArrayValue;
+import org.jboss.metatype.api.values.CollectionValue;
 import org.jboss.metatype.api.values.GenericValue;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.SimpleValue;
@@ -311,6 +313,26 @@
                   processGenericValue((GenericValue) avalue.getValue(n), md);
             }
          }
+         else if (propType.isCollection())
+         {
+            CollectionMetaType amt = (CollectionMetaType) propType;
+            MetaType etype = amt.getElementType();
+            if (etype == AbstractManagedObjectFactory.MANAGED_OBJECT_META_TYPE)
+            {
+               CollectionValue avalue = (CollectionValue) prop.getValue();
+               if(avalue != null)
+               {
+                  MetaValue[] elements = avalue.getElements();
+                  for(int n = 0; n < avalue.getSize(); n ++)
+                  {
+                     GenericValue gv = (GenericValue) elements[n];
+                     ManagedObject propMO = (ManagedObject) gv.getValue();
+                     if(propMO != null)
+                        processManagedObject(propMO, md);
+                  }
+               }
+            }
+         }
       }
    }
 

Modified: trunk/tomcat/src/resources/jboss-structure.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-structure.xml	2007-12-18 07:07:47 UTC (rev 68371)
+++ trunk/tomcat/src/resources/jboss-structure.xml	2007-12-18 07:44:59 UTC (rev 68372)
@@ -2,13 +2,9 @@
 <structure>
     <context>
         <path name=""/>
-        <metaDataPath name="META-INF" />
-<!-- Uncomment this after the MC update -->
-<!--
         <metaDataPath>
-           <path name="META-INF"/>
-        </metaDataPath>
--->
+            <path name="META-INF"/>
+        </metaDataPath>        
         <classpath>
             <path name=""/>
             <path name="" suffixes=".jar" />