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

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

Author: emuckenhuber
Date: 2010-01-05 05:22:25 -0500 (Tue, 05 Jan 2010)
New Revision: 99020

Modified:
   trunk/server/src/etc/deploy/transaction-jboss-beans.xml
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
Log:
[JBAS-7275] update the profileservice integration for TM statistics

Modified: trunk/server/src/etc/deploy/transaction-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-jboss-beans.xml	2010-01-05 08:15:04 UTC (rev 99019)
+++ trunk/server/src/etc/deploy/transaction-jboss-beans.xml	2010-01-05 10:22:25 UTC (rev 99020)
@@ -149,7 +149,6 @@
 
     <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="jbossXATerminator"><inject bean="XATerminator"/></property>
         <property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
@@ -174,6 +173,7 @@
     <bean name="TransactionStatistics" class="com.arjuna.ats.arjuna.coordinator.TxStats">
 
         <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=TransactionStatistics", exposedInterface=com.arjuna.ats.arjuna.coordinator.TxStatsMBean.class, registerDirectly=true)</annotation>
+        <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionStatistics",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.arjuna.coordinator.TxStatsMBean.class)</annotation>
 
         <constructor factoryClass="com.arjuna.ats.arjuna.coordinator.TxStats" factoryMethod="getInstance"/>
     </bean>

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java	2010-01-05 08:15:04 UTC (rev 99019)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java	2010-01-05 10:22:25 UTC (rev 99020)
@@ -21,22 +21,18 @@
  */
 package org.jboss.test.profileservice.test;
 
-import java.net.InetAddress;
-import java.net.URL;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
 import javax.naming.InitialContext;
 
-import org.jboss.deployers.spi.management.KnownComponentTypes;
 import org.jboss.deployers.spi.management.ManagementView;
 import org.jboss.managed.api.ComponentType;
 import org.jboss.managed.api.ManagedComponent;
 import org.jboss.managed.api.ManagedDeployment;
 import org.jboss.managed.api.ManagedOperation;
 import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.RunState;
 import org.jboss.managed.plugins.ManagedOperationMatcher;
 import org.jboss.metatype.api.types.EnumMetaType;
 import org.jboss.metatype.api.types.MetaType;
@@ -45,7 +41,6 @@
 import org.jboss.metatype.api.values.EnumValueSupport;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.SimpleValue;
-import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.profileservice.management.matchers.AliasMatcher;
 import org.jboss.profileservice.spi.ProfileService;
 import org.jboss.test.JBossTestCase;
@@ -215,27 +210,27 @@
    {
       ManagementView mgtView = getManagementView();
       ComponentType type = new ComponentType("MCBean", "JTA");
-      ManagedComponent mc = mgtView.getComponent("TransactionManager", type);
+      ManagedComponent mc = mgtView.getComponent("TransactionStatistics", type);
       assertNotNull(mc);
       Map<String, ManagedProperty> props = mc.getProperties();
       getLog().info(props);
 
-      ManagedProperty transactionCount = props.get("transactionCount");
+      ManagedProperty transactionCount = props.get("numberOfTransactions");
       assertNotNull(transactionCount);
       getLog().info("transactionCount, "+transactionCount.getValue());
-      ManagedProperty commitCount = props.get("commitCount");
+      ManagedProperty commitCount = props.get("numberOfCommittedTransactions");
       assertNotNull(commitCount);
       getLog().info("commitCount, "+commitCount.getValue());
-      ManagedProperty runningTransactionCount = props.get("runningTransactionCount");
-      assertNotNull(runningTransactionCount);
-      getLog().info("runningTransactionCount, "+runningTransactionCount.getValue());
-      ManagedProperty rollbackCount = props.get("rollbackCount");
+      // ManagedProperty runningTransactionCount = props.get("runningTransactionCount");
+      // assertNotNull(runningTransactionCount);
+      // getLog().info("runningTransactionCount, "+runningTransactionCount.getValue());
+      ManagedProperty rollbackCount = props.get("numberOfAbortedTransactions");
       assertNotNull(rollbackCount);
       getLog().info("rollbackCount, "+rollbackCount.getValue());
-      ManagedProperty transactionTimeout = props.get("transactionTimeout");
-      assertNotNull(transactionTimeout);
-      getLog().info("transactionTimeout, "+transactionTimeout.getValue());
-      ManagedProperty timedoutCount = props.get("timedoutCount");
+      // ManagedProperty transactionTimeout = props.get("transactionTimeout");
+      // assertNotNull(transactionTimeout);
+      // getLog().info("transactionTimeout, "+transactionTimeout.getValue());
+      ManagedProperty timedoutCount = props.get("numberOfTimedOutTransactions");
       assertNotNull(timedoutCount);
       getLog().info("timedoutCount, "+timedoutCount.getValue());