[jboss-cvs] JBossAS SVN: r88771 - in branches/Branch_5_x: testsuite/src/main/org/jboss/test/profileservice/test and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2009-05-12 21:50:52 -0400 (Tue, 12 May 2009)
New Revision: 88771

Modified:
   branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java
Log:
JBAS-6622, Add a WebHost mapping

Modified: branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml	2009-05-13 01:37:15 UTC (rev 88770)
+++ branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml	2009-05-13 01:50:52 UTC (rev 88771)
@@ -192,14 +192,19 @@
         <property name="metaValueFactory"><inject bean="MetaValueFactory"/></property>
     </bean>
 
-    <bean name="SimpleMBeanDeploymentNameBuilder"
+    <!-- A MBeanDeploymentNameBuilder that just uses the name key as the name -->
+    <bean name="NameKeyMBeanDeploymentNameBuilder"
         class="org.jboss.profileservice.management.mbean.SimpleMBeanDeploymentNameBuilder">
         <property name="keyName">name</property>
     </bean>
+    <bean name="HostMBeanDeploymentNameBuilder"
+        class="org.jboss.profileservice.management.mbean.SimpleMBeanDeploymentNameBuilder">
+        <property name="keyName">host</property>
+    </bean>
+    <!-- A MBeanDeploymentNameBuilder that combines the host,path keys as the name -->
     <bean name="WarManagerMBeanDeploymentNameBuilder"
         class="org.jboss.profileservice.management.mbean.ComplexMBeanDeploymentNameBuilder">
         <property name="prefix">//</property>
-        <property name="separator"></property>
         <property name="keyNames">
             <list elementClass="java.lang.String">
                 <value>host</value>
@@ -207,6 +212,11 @@
             </list>
         </property>
     </bean>
+    <!-- A deployment for the following mbean patterns:
+        jboss.web:host=localhost,path=/jmx-console,type=Manager
+        jboss.web:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule,name=*
+        +- all servlets attribute names
+    -->
     <bean name="WarManagedDeploymentFactory"
         class="org.jboss.profileservice.management.ProxyManagedDeploymentFactory">
         <property name="factoryName">War</property>
@@ -229,7 +239,7 @@
                     <property name="compSubtype">WebApplication</property>
                     <property name="pattern">jboss.web:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule,*</property>
                     <property name="nameBuilder">
-                        <inject bean="SimpleMBeanDeploymentNameBuilder"/>
+                        <inject bean="NameKeyMBeanDeploymentNameBuilder"/>
                     </property>
                     <property name="componentInfo">
                         <map keyClass="java.lang.String" valueClass="java.lang.String">
@@ -244,4 +254,24 @@
             </set>
         </property>
     </bean>
+    <!-- jboss.web:host=*,type=Host -->
+    <bean name="WebHostsManagedDeploymentFactory"
+        class="org.jboss.profileservice.management.ProxyManagedDeploymentFactory">
+        <property name="factoryName">WebHost</property>
+        
+        <property name="defaultViewUse">STATISTIC</property>
+        <property name="rootMOPatterns">
+            <set elementClass="org.jboss.profileservice.management.ProxyDeploymentInfo">
+                <!-- Manager -->
+                <bean class="org.jboss.profileservice.management.ProxyDeploymentInfo">
+                    <property name="compType">MBean</property>
+                    <property name="compSubtype">WebHost</property>
+                    <property name="pattern">jboss.web:type=Host,*</property>
+                    <property name="nameBuilder">
+                        <inject bean="HostMBeanDeploymentNameBuilder"/>
+                    </property>
+                </bean>
+            </set>
+        </property>
+    </bean>
 </deployment>

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java	2009-05-13 01:37:15 UTC (rev 88770)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java	2009-05-13 01:50:52 UTC (rev 88771)
@@ -101,5 +101,20 @@
       fail("Could not find jmx-console Web Application");
    }
 
+   public void testWebHost() throws Exception
+   {
+      ManagementView mgtView = getManagementView();
+      mgtView.load();
+      Set<ManagedComponent> comps = mgtView.getComponentsForType(new ComponentType("MBean", "WebHost"));
+      for (ManagedComponent comp : comps)
+      {
+         if ("jboss.web:host=localhost,type=Host".equals(comp.getName()))
+         {
+            assertEquals("localhost", ((SimpleValue)comp.getProperty("name").getValue()).getValue());
+            return;
+         }
+      }
 
+      fail("Could not find localhost Host");
+   }
 }
\ No newline at end of file