User: schaefera
Date: 02/04/12 16:54:12
Added: src/main/org/jboss/test Tag: Branch_2_4 JBossTestCase.java
JBossTestServices.java JBossTestSetup.java
Log:
Backport of the JBoss 3.0 stress tests w/o JMS and deadlock tests.
Revision Changes Path
No revision
No revision
1.11.2.1 +3 -3 jbosstest/src/main/org/jboss/test/JBossTestCase.java
Index: JBossTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/JBossTestCase.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- JBossTestCase.java 16 Feb 2002 11:26:57 -0000 1.11
+++ JBossTestCase.java 12 Apr 2002 23:54:12 -0000 1.11.2.1
@@ -30,7 +30,7 @@
import org.apache.log4j.Category;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import org.jboss.jmx.interfaces.JMXConnector;
/**
* This is the standard base test case for jboss junit test cases. It supplies
@@ -42,7 +42,7 @@
* ../lib).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.11.2.1 $
*/
public class JBossTestCase
extends TestCase
@@ -129,7 +129,7 @@
*
* @return The Server value
*/
- protected RMIAdaptor getServer() throws Exception
+ protected JMXConnector getServer() throws Exception
{
return delegate.getServer();
}
1.11.2.1 +11 -7 jbosstest/src/main/org/jboss/test/JBossTestServices.java
Index: JBossTestServices.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/JBossTestServices.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- JBossTestServices.java 25 Feb 2002 19:49:52 -0000 1.11
+++ JBossTestServices.java 12 Apr 2002 23:54:12 -0000 1.11.2.1
@@ -30,7 +30,8 @@
import org.apache.log4j.Category;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import org.jboss.jmx.interfaces.JMXConnector;
+import org.jboss.jmx.client.RMIClientConnectorImpl;
/**
* This is provides services for jboss junit test cases and TestSetups. It supplies
@@ -46,7 +47,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Christoph G. Jung</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.11.2.1 $
*/
public class JBossTestServices
{
@@ -55,14 +56,15 @@
//private final static String serviceDeployerName =
"jboss.system:service=ServiceDeployer";
//private final static String j2eeDeployerName =
"jboss.j2ee:service=J2eeDeployer";
- private final static String DEPLOYER_NAME = "jboss.system:service=MainDeployer";
+// private final static String DEPLOYER_NAME =
"jboss.system:service=MainDeployer";
+ private final static String DEPLOYER_NAME = "J2EE:service=J2eeDeployer";
private final static int DEFAULT_THREADCOUNT = 10;
private final static int DEFAULT_ITERATIONCOUNT = 1000;
private final static int DEFAULT_BEANCOUNT = 100;
// Attributes ----------------------------------------------------
- private RMIAdaptor server;
+ private JMXConnector server;
private Category log;
private InitialContext initialContext;
@@ -128,7 +130,7 @@
*
* @return The Server value
*/
- RMIAdaptor getServer() throws Exception
+ JMXConnector getServer() throws Exception
{
init();
return server;
@@ -181,7 +183,7 @@
String deployDir = System.getProperty("jbosstest.deploy.dir");
if (deployDir == null)
{
- deployDir = "../lib";
+ deployDir = "../../build/deploy";
}
String url = deployDir + "/" + filename;
//try to canonicalize the strings a bit.
@@ -340,7 +342,9 @@
{
serverName = InetAddress.getLocalHost().getHostName();
}
- server = (RMIAdaptor)initialContext.lookup("jmx:" + serverName + ":rmi");
+//AS server = (RMIAdaptor)initialContext.lookup("jmx:" + serverName +
":rmi");
+ RMIClientConnectorImpl lConnector = new
org.jboss.jmx.client.RMIClientConnectorImpl( serverName );
+ server = lConnector;
}
}
1.8.2.1 +3 -3 jbosstest/src/main/org/jboss/test/JBossTestSetup.java
Index: JBossTestSetup.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/JBossTestSetup.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- JBossTestSetup.java 29 Jan 2002 21:59:58 -0000 1.8
+++ JBossTestSetup.java 12 Apr 2002 23:54:12 -0000 1.8.2.1
@@ -32,7 +32,7 @@
import org.apache.log4j.Category;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import org.jboss.jmx.interfaces.JMXConnector;
/**
* This is a TestSetup class for jboss junit test cases that provides the
@@ -49,7 +49,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Christoph G. Jung</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.8.2.1 $
*/
public class JBossTestSetup
extends TestSetup
@@ -120,7 +120,7 @@
*
* @return The Server value
*/
- protected RMIAdaptor getServer() throws Exception
+ protected JMXConnector getServer() throws Exception
{
return delegate.getServer();
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
