[jboss-cvs] JBoss Messaging SVN: r7941 - in branches/Branch_1_4: integration/EAP5/tests-src/org/jboss/test/messaging/tools/container and 1 other directories.

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

Author: gaohoward
Date: 2010-02-08 22:03:35 -0500 (Mon, 08 Feb 2010)
New Revision: 7941

Modified:
   branches/Branch_1_4/integration/EAP5/.classpath
   branches/Branch_1_4/integration/EAP5/tests-src/org/jboss/test/messaging/tools/container/ServiceContainer.java
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container/MockJBossSecurityManager.java
Log:
JBMESSAGING-1787
Fix test build issue


Modified: branches/Branch_1_4/integration/EAP5/.classpath
===================================================================
--- branches/Branch_1_4/integration/EAP5/.classpath	2010-02-08 17:54:00 UTC (rev 7940)
+++ branches/Branch_1_4/integration/EAP5/.classpath	2010-02-09 03:03:35 UTC (rev 7941)
@@ -123,5 +123,6 @@
 	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-managed.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/jboss-man/lib/jboss-managed.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/jboss-man/lib/jboss-metatype.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-mbeans.jar"/>
 	<classpathentry kind="output" path="tests/output/classes"/>
 </classpath>

Modified: branches/Branch_1_4/integration/EAP5/tests-src/org/jboss/test/messaging/tools/container/ServiceContainer.java
===================================================================
--- branches/Branch_1_4/integration/EAP5/tests-src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2010-02-08 17:54:00 UTC (rev 7940)
+++ branches/Branch_1_4/integration/EAP5/tests-src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2010-02-09 03:03:35 UTC (rev 7941)
@@ -1136,12 +1136,13 @@
    private void startCachedConnectionManager(ObjectName on) throws Exception
    {
       CachedConnectionManager ccm = new CachedConnectionManager();
+      
+      TransactionManager txmgr = (TransactionManager)mbeanServer.getAttribute(TRANSACTION_MANAGER_OBJECT_NAME, "TransactionManager");
+      
+      ccm.setTransactionManager(txmgr);
 
-      // dependencies
-      ccm.setTransactionManagerServiceName(TRANSACTION_MANAGER_OBJECT_NAME);
-
       mbeanServer.registerMBean(ccm, on);
-      mbeanServer.invoke(on, "start", new Object[0], new String[0]);
+      
       log.debug("started " + on);
    }
 

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container/MockJBossSecurityManager.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container/MockJBossSecurityManager.java	2010-02-08 17:54:00 UTC (rev 7940)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container/MockJBossSecurityManager.java	2010-02-09 03:03:35 UTC (rev 7941)
@@ -25,6 +25,7 @@
 import java.security.acl.Group;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 import javax.security.auth.Subject;
@@ -349,4 +350,10 @@
 
    }
 
+   public Principal getTargetPrincipal(Principal arg0, Map<String, Object> arg1)
+   {
+      return null;
+   }
+
+
 }
\ No newline at end of file