[jboss-cvs] JBossAS SVN: r88782 - 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: jason.greene at jboss.com
Date: 2009-05-13 03:43:19 -0400 (Wed, 13 May 2009)
New Revision: 88782

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:
Add support for connectors


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 07:31:12 UTC (rev 88781)
+++ branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml	2009-05-13 07:43:19 UTC (rev 88782)
@@ -274,4 +274,32 @@
             </set>
         </property>
     </bean>
+    <!-- jboss.web:name=*,type=GlobalRequestProcessor/ThreadPool -->
+    <bean name="ConnectorManagedDeploymentFactory"
+        class="org.jboss.profileservice.management.ProxyManagedDeploymentFactory">
+        <property name="factoryName">Connector</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">WebRequestProcessor</property>
+                    <property name="pattern">jboss.web:type=GlobalRequestProcessor,*</property>
+                    <property name="nameBuilder">
+                        <inject bean="NameKeyMBeanDeploymentNameBuilder"/>
+                    </property>
+                </bean>
+                <bean class="org.jboss.profileservice.management.ProxyDeploymentInfo">
+                    <property name="compType">MBean</property>
+                    <property name="compSubtype">WebThreadPool</property>
+                    <property name="pattern">jboss.web:type=ThreadPool,*</property>
+                    <property name="nameBuilder">
+                        <inject bean="NameKeyMBeanDeploymentNameBuilder"/>
+                    </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 07:31:12 UTC (rev 88781)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java	2009-05-13 07:43:19 UTC (rev 88782)
@@ -117,4 +117,25 @@
 
       fail("Could not find localhost Host");
    }
+   
+   public void testConnector() throws Exception
+   {
+      ManagementView mgtView = getManagementView();
+      mgtView.load();
+      Set<ManagedComponent> comps = mgtView.getComponentsForType(new ComponentType("MBean", "WebRequestProcessor"));
+      for (ManagedComponent comp : comps)
+      {
+         if (comp.getName().startsWith("jboss.web:name=http-"))
+         {
+            // Statistic
+            int requests = (Integer)((SimpleValue)comp.getProperty("requestCount").getValue()).getValue();
+            new URL("http://" + getServerHost() + ":8080/").openStream().close();
+            assertEquals(requests + 1, ((SimpleValue)comp.getProperty("requestCount").getValue()).getValue());
+            return;
+         }
+      }
+
+      fail("Could not find HtmlAdapor servlet");
+   }
+   
 }
\ No newline at end of file