[jboss-cvs] JBossAS SVN: r65250 - in branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test: clusteredsession/unit and 1 other directory.

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

Author: bdecoste
Date: 2007-09-07 20:22:09 -0400 (Fri, 07 Sep 2007)
New Revision: 65250

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java
Log:
rolled back last changes ...

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java	2007-09-07 22:32:56 UTC (rev 65249)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java	2007-09-08 00:22:09 UTC (rev 65250)
@@ -21,7 +21,7 @@
  */
 package org.jboss.ejb3.test.clusteredentity.unit;
 
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import javax.management.MBeanServerConnection;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -59,7 +59,7 @@
    
    private void redeploy() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       undeploy(adaptors[1], getEarName() + ".ear");
       
       sleep(2000);

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java	2007-09-07 22:32:56 UTC (rev 65249)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java	2007-09-08 00:22:09 UTC (rev 65250)
@@ -22,7 +22,8 @@
 
 package org.jboss.ejb3.test.clusteredsession.unit;
 
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
 
 import junit.framework.Test;
 
@@ -96,7 +97,7 @@
 
    private void cleanDeployments() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       if (deployed0)
       {
@@ -113,7 +114,7 @@
    
    private void deployJars() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       deploy(adaptors[0], "clusteredsession-local.jar");
       deployed0 = true;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java	2007-09-07 22:32:56 UTC (rev 65249)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java	2007-09-08 00:22:09 UTC (rev 65250)
@@ -25,7 +25,7 @@
 import java.rmi.dgc.VMID;
 import java.util.Properties;
 
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import javax.management.MBeanServerConnection;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
@@ -82,7 +82,7 @@
    {
       super.setUp();
       
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       if (!deployed0)
       {
          deploy(adaptors[0], deployment);
@@ -173,7 +173,7 @@
    
    private void undeploy() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       undeploy(adaptors[1], deployment);
       getLog().debug("Undeployed " + deployment + " on server1");
@@ -184,7 +184,7 @@
    
    private void deploy() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       deploy(adaptors[1], deployment);
       getLog().debug("Deployed " + deployment + " on server1");

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java	2007-09-07 22:32:56 UTC (rev 65249)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java	2007-09-08 00:22:09 UTC (rev 65250)
@@ -25,7 +25,7 @@
 import java.rmi.dgc.VMID;
 import java.util.Properties;
 
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import javax.management.MBeanServerConnection;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
@@ -72,7 +72,7 @@
    {
       super.setUp();
       
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       if (!deployed0)
       {
          deploy(adaptors[0], deployment);
@@ -182,7 +182,7 @@
    
    private void redeploy() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       undeploy(adaptors[1], deployment);
       getLog().debug("Undeployed " + deployment + " on server1");