[embjopr-commits] EMBJOPR SVN: r708 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: util and 1 other directory.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-08-27 21:19:39 -0400 (Thu, 27 Aug 2009)
New Revision: 708

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
 * EJTT: EJB 2 JMX name changed, now using uid. Trying "...,*".

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java	2009-08-28 00:25:07 UTC (rev 707)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java	2009-08-28 01:19:39 UTC (rev 708)
@@ -54,7 +54,7 @@
 
 
 			static{
-				EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule";
+				EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule,*";
 				EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%1$s,jar=%1$s,service=EJB3";
 			}
 

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-08-28 00:25:07 UTC (rev 707)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-08-28 01:19:39 UTC (rev 708)
@@ -2203,11 +2203,15 @@
 			ObjectName objName =	new ObjectName(mBeanName);
 			MBeanServer jmxServer = MBeanServerLocator.locateJBoss();
 			Set mBeans = jmxServer.queryNames(objName, null);
-			if (mBeans.size() != 1) {
+			if (mBeans.size() == 0) {
 				log.info(mBeanName+" not found.");
 				return false;
 			}
 			ObjectName deploymentMBean = (ObjectName) mBeans.iterator().next();
+			if (mBeans.size() > 1) {
+				log.warn("Found "+mBeans.size()+" matching MBeans, using the first: "+deploymentMBean.getCanonicalName());
+			}
+
 			// Returns org.jboss.deployers.spi.DeploymentState.
 			Object state = jmxServer.getAttribute(deploymentMBean, "State");
 			log.info("State is '"+state.toString()+"'.");