[jboss-cvs] JBossAS SVN: r85204 - in branches/Branch_5_x: server/src/etc/deploy and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2009-03-04 01:25:35 -0500 (Wed, 04 Mar 2009)
New Revision: 85204

Modified:
   branches/Branch_5_x/server/.classpath
   branches/Branch_5_x/server/build.xml
   branches/Branch_5_x/server/src/etc/deploy/transaction-jboss-beans.xml
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
Log:
JBAS-5529, annotate the TransactionManger for management.

Modified: branches/Branch_5_x/server/.classpath
===================================================================
--- branches/Branch_5_x/server/.classpath	2009-03-04 06:24:03 UTC (rev 85203)
+++ branches/Branch_5_x/server/.classpath	2009-03-04 06:25:35 UTC (rev 85204)
@@ -22,5 +22,9 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-man/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/jboss-man/lib/jboss-managed-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-man/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/jboss-man/lib/jboss-metatype-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar" sourcepath="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossts/lib/jbossjts-integration.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/Branch_5_x/server/build.xml
===================================================================
--- branches/Branch_5_x/server/build.xml	2009-03-04 06:24:03 UTC (rev 85203)
+++ branches/Branch_5_x/server/build.xml	2009-03-04 06:25:35 UTC (rev 85204)
@@ -91,6 +91,7 @@
       <path refid="jboss.jboss.cl.classpath"/>
       <path refid="jboss.jboss.man.classpath"/>
       <path refid="jboss.jboss.mdr.classpath"/>
+      <path refid="jboss.jbossts.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
       <path refid="jboss.jboss.jpa.deployers.classpath"/>
       <path refid="jboss.jboss.vfs.classpath"/>

Modified: branches/Branch_5_x/server/src/etc/deploy/transaction-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/deploy/transaction-jboss-beans.xml	2009-03-04 06:24:03 UTC (rev 85203)
+++ branches/Branch_5_x/server/src/etc/deploy/transaction-jboss-beans.xml	2009-03-04 06:25:35 UTC (rev 85204)
@@ -3,6 +3,7 @@
 
     <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
         <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager", exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation>
+        <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionManager",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class)</annotation>
 
         <property name="transactionTimeout">300</property>
         <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java	2009-03-04 06:24:03 UTC (rev 85203)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java	2009-03-04 06:25:35 UTC (rev 85204)
@@ -164,6 +164,41 @@
     * 
     * @throws Exception
     */
+   public void testTransactionManager()
+      throws Exception
+   {
+      ManagementView mgtView = getManagementView();
+      ComponentType type = new ComponentType("MCBean", "JTA");
+      ManagedComponent mc = mgtView.getComponent("TransactionManager", type);
+      assertNotNull(mc);
+      Map<String, ManagedProperty> props = mc.getProperties();
+      getLog().info(props);
+
+      ManagedProperty transactionCount = props.get("transactionCount");
+      assertNotNull(transactionCount);
+      getLog().info("transactionCount, "+transactionCount.getValue());
+      ManagedProperty commitCount = props.get("commitCount");
+      assertNotNull(commitCount);
+      getLog().info("commitCount, "+commitCount.getValue());
+      ManagedProperty runningTransactionCount = props.get("runningTransactionCount");
+      assertNotNull(runningTransactionCount);
+      getLog().info("runningTransactionCount, "+runningTransactionCount.getValue());
+      ManagedProperty rollbackCount = props.get("rollbackCount");
+      assertNotNull(rollbackCount);
+      getLog().info("rollbackCount, "+rollbackCount.getValue());
+      ManagedProperty transactionTimeout = props.get("transactionTimeout");
+      assertNotNull(transactionTimeout);
+      getLog().info("transactionTimeout, "+transactionTimeout.getValue());
+      ManagedProperty timedoutCount = props.get("timedoutCount");
+      assertNotNull(timedoutCount);
+      getLog().info("timedoutCount, "+timedoutCount.getValue());
+      
+   }
+
+   /**
+    * 
+    * @throws Exception
+    */
    public void testServerConfig()
       throws Exception
    {