[jboss-cvs] JBossAS SVN: r104649 - in trunk/testsuite: src/main/org/jboss/test/aop/nonjunit and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 10 21:59:55 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-05-10 21:59:54 -0400 (Mon, 10 May 2010)
New Revision: 104649
Modified:
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/aop/nonjunit/StandaloneTest.java
trunk/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jmx/invoker/BadListener.java
trunk/testsuite/src/main/org/jboss/test/jmx/invoker/Listener.java
trunk/testsuite/src/main/org/jboss/test/jmx/invoker/RMIBadListener.java
trunk/testsuite/src/main/org/jboss/test/jmx/invoker/RMIListener.java
trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java
Log:
[JBAS-7563] Get the testsuite to compile
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-05-11 01:39:07 UTC (rev 104648)
+++ trunk/testsuite/build.xml 2010-05-11 01:59:54 UTC (rev 104649)
@@ -430,7 +430,6 @@
<fileset refid="org.jboss.security:jbosssx:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-security:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-server:jar:jboss"/>
- <fileset refid="org.jboss.jbossas:jboss-as-server:jar:jmx-adaptor-plugin"/>
<fileset refid="org.jboss.jbossas:jboss-as-main:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-api:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-api-as:jar"/>
Modified: trunk/testsuite/src/main/org/jboss/test/aop/nonjunit/StandaloneTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/nonjunit/StandaloneTest.java 2010-05-11 01:39:07 UTC (rev 104648)
+++ trunk/testsuite/src/main/org/jboss/test/aop/nonjunit/StandaloneTest.java 2010-05-11 01:59:54 UTC (rev 104649)
@@ -21,16 +21,11 @@
*/
package org.jboss.test.aop.nonjunit;
-import javax.naming.InitialContext;
-
-import org.jboss.test.JBossTestCase;
import junit.framework.Test;
-import java.net.InetAddress;
-import javax.management.ObjectName;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-import org.jboss.test.aop.bean.AOPTester;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
-import junit.framework.*;
+import org.jboss.test.aop.bean.AOPTester;
/**
* Sample client for the jboss container.
*
Modified: trunk/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java 2010-05-11 01:39:07 UTC (rev 104648)
+++ trunk/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java 2010-05-11 01:59:54 UTC (rev 104649)
@@ -38,7 +38,6 @@
import javax.naming.InitialContext;
import javax.sql.DataSource;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.services.deployment.MBeanData;
import org.jboss.test.JBossTestCase;
@@ -1274,7 +1273,7 @@
// Compare all of the changed attribute values to the actual values.
// They must all match for the test to pass.
InitialContext ic = new InitialContext();
- RMIAdaptor server = (RMIAdaptor) ic.lookup("jmx/invoker/RMIAdaptor");
+ MBeanServerConnection server = (MBeanServerConnection) ic.lookup("jmx/invoker/RMIAdaptor");
ObjectName objectName = new ObjectName(data.getName());
Properties attrs = data.getAttributes();
Enumeration keys = attrs.keys();
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/invoker/BadListener.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/invoker/BadListener.java 2010-05-11 01:39:07 UTC (rev 104648)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/invoker/BadListener.java 2010-05-11 01:59:54 UTC (rev 104649)
@@ -21,12 +21,8 @@
*/
package org.jboss.test.jmx.invoker;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
import javax.management.Notification;
import javax.management.NotificationListener;
-import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
-import org.jboss.net.sockets.TimeoutClientSocketFactory;
/** An RMI callback implementation used to receive remote JMX notifications
* that blocks in the handleNotification callback to validate that poorly
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/invoker/Listener.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/invoker/Listener.java 2010-05-11 01:39:07 UTC (rev 104648)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/invoker/Listener.java 2010-05-11 01:59:54 UTC (rev 104649)
@@ -21,11 +21,8 @@
*/
package org.jboss.test.jmx.invoker;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
import javax.management.Notification;
import javax.management.NotificationListener;
-import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
/** An RMI callback implementation used to receive remote JMX notifications
* @author Scott.Stark at jboss.org
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/invoker/RMIBadListener.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/invoker/RMIBadListener.java 2010-05-11 01:39:07 UTC (rev 104648)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/invoker/RMIBadListener.java 2010-05-11 01:59:54 UTC (rev 104649)
@@ -21,10 +21,13 @@
*/
package org.jboss.test.jmx.invoker;
+import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
+
import javax.management.Notification;
-import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
+import javax.management.NotificationListener;
+
import org.jboss.net.sockets.TimeoutClientSocketFactory;
/** An RMI callback implementation used to receive remote JMX notifications
@@ -35,7 +38,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class RMIBadListener implements RMINotificationListener
+public class RMIBadListener implements NotificationListener, Remote
{
int count;
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/invoker/RMIListener.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/invoker/RMIListener.java 2010-05-11 01:39:07 UTC (rev 104648)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/invoker/RMIListener.java 2010-05-11 01:59:54 UTC (rev 104649)
@@ -21,16 +21,17 @@
*/
package org.jboss.test.jmx.invoker;
+import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
import javax.management.Notification;
-import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
+import javax.management.NotificationListener;
/** An RMI callback implementation used to receive remote JMX notifications
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class RMIListener implements RMINotificationListener
+public class RMIListener implements NotificationListener, Remote
{
private int expectedCount;
private int count;
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java 2010-05-11 01:39:07 UTC (rev 104648)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java 2010-05-11 01:59:54 UTC (rev 104649)
@@ -22,7 +22,6 @@
package org.jboss.test.jmx.test;
import javax.management.Attribute;
-import javax.management.ListenerNotFoundException;
import javax.management.MBeanInfo;
import javax.management.MBeanServerConnection;
import javax.management.MalformedObjectNameException;
@@ -32,12 +31,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossTestCase;
import org.jboss.test.jmx.invoker.CustomClass;
import org.jboss.test.jmx.invoker.InvokerTestMBean;
-import org.jboss.test.jmx.invoker.RMIBadListener;
-import org.jboss.test.jmx.invoker.RMIListener;
/**
* Tests for the jmx invoker adaptor.
More information about the jboss-cvs-commits
mailing list