[jboss-cvs] JBossAS SVN: r74042 - in branches/JBPAPP_4_2_0_GA_CP/ejb3: src/test/org/jboss/ejb3/test/clusteredentity/unit and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 3 18:19:42 EDT 2008
Author: galder.zamarreno at jboss.com
Date: 2008-06-03 18:19:42 -0400 (Tue, 03 Jun 2008)
New Revision: 74042
Modified:
branches/JBPAPP_4_2_0_GA_CP/ejb3/.classpath
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java
Log:
[JBPAPP-865] Changed all references from RMIAdaptor to MBeanServerConnection in tests that extended JBossClusteredTestCase and removed exclusions in Eclipse classpath to classes that depended on JBossClusteredTestCase.
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/.classpath 2008-06-03 22:10:55 UTC (rev 74041)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/.classpath 2008-06-03 22:19:42 UTC (rev 74042)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry excluding="org/jboss/ejb3/MC*|org/jboss/ejb3/client/|org/jboss/ejb3/clientmodule/|org/jboss/ejb3/deployers/|org/jboss/ejb3/embedded/" kind="src" path="src/main"/>
<classpathentry kind="src" path="docs/tutorial/ssl/src"/>
- <classpathentry excluding="org/jboss/ejb3/test/**/*EmbeddedTest.java|org/jboss/ejb3/test/appclient/|org/jboss/ejb3/test/clusteredentity/unit/*Test*.java|org/jboss/ejb3/test/clusteredservice/|org/jboss/ejb3/test/clusteredsession/unit/|org/jboss/ejb3/test/ejbthree921/unit/|org/jboss/ejb3/test/jaxws/|org/jboss/ejb3/test/standalone/|org/jboss/ejb3/test/webservices/" kind="src" output="output/eclipse-test-classes" path="src/test"/>
+ <classpathentry excluding="org/jboss/ejb3/test/**/*EmbeddedTest.java|org/jboss/ejb3/test/appclient/|org/jboss/ejb3/test/jaxws/|org/jboss/ejb3/test/standalone/|org/jboss/ejb3/test/webservices/" kind="src" output="output/eclipse-test-classes" path="src/test"/>
<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/advanced-deployment/archive/src"/>
<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/advanced-deployment/archive-by-resource/src"/>
<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/advanced-deployment/deploy-dir/src"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java 2008-06-03 22:10:55 UTC (rev 74041)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java 2008-06-03 22:19:42 UTC (rev 74042)
@@ -27,6 +27,8 @@
import org.jboss.ejb3.test.DBSetup;
import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import javax.management.MBeanServerConnection;
+
/**
* Tests EJB redeployment when entities with @Lob fields are stored
* in the second level cache.
@@ -58,7 +60,7 @@
private void redeploy() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
undeploy(adaptors[1], getEarName() + ".ear");
sleep(2000);
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java 2008-06-03 22:10:55 UTC (rev 74041)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java 2008-06-03 22:19:42 UTC (rev 74042)
@@ -28,6 +28,8 @@
import junit.framework.Test;
+import javax.management.MBeanServerConnection;
+
/**
* @author Brian Stansberry
*/
@@ -98,7 +100,7 @@
private void cleanDeployments() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
if (deployed0)
{
@@ -115,7 +117,7 @@
private void deployJars() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
deploy(adaptors[0], "clusteredsession-local.jar");
deployed0 = true;
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java 2008-06-03 22:10:55 UTC (rev 74041)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java 2008-06-03 22:19:42 UTC (rev 74042)
@@ -33,6 +33,9 @@
import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
+import javax.management.MBeanServerConnection;
+
+
/**
* @author Brian Stansberry
*/
@@ -54,7 +57,7 @@
{
super.setUp();
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
setPartitionName(adaptors[0], "DefaultPartition");
setPartitionName(adaptors[1], getPartitionName());
}
@@ -65,7 +68,7 @@
{
super.tearDown();
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
clearPartitionName(adaptors[0]);
clearPartitionName(adaptors[1]);
}
@@ -114,14 +117,14 @@
protected abstract String getPartitionName();
- private void setPartitionName(RMIAdaptor adaptor, String partitionName) throws Exception
+ private void setPartitionName(MBeanServerConnection adaptor, String partitionName) throws Exception
{
Object[] args = { PARTITION_NAME_PROPERTY, partitionName };
String[] sig = { String.class.getName(), String.class.getName() };
adaptor.invoke(new ObjectName(PROPERTIES_SERVICE), "set", args, sig);
}
- private void clearPartitionName(RMIAdaptor adaptor) throws Exception
+ private void clearPartitionName(MBeanServerConnection adaptor) throws Exception
{
setPartitionName(adaptor, "DefaultPartition");
Object[] args = { PARTITION_NAME_PROPERTY };
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java 2008-06-03 22:10:55 UTC (rev 74041)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java 2008-06-03 22:19:42 UTC (rev 74042)
@@ -38,6 +38,8 @@
import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
+import javax.management.MBeanServerConnection;
+
/**
* Tests that the list of remote targets in downloaded clustered bean
* proxies are correct.
@@ -82,7 +84,7 @@
{
super.setUp();
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
if (!deployed0)
{
deploy(adaptors[0], deployment);
@@ -173,7 +175,7 @@
private void undeploy() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
undeploy(adaptors[1], deployment);
getLog().debug("Undeployed " + deployment + " on server1");
@@ -184,7 +186,7 @@
private void deploy() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
deploy(adaptors[1], deployment);
getLog().debug("Deployed " + deployment + " on server1");
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java 2008-06-03 22:10:55 UTC (rev 74041)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java 2008-06-03 22:19:42 UTC (rev 74042)
@@ -37,6 +37,8 @@
import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
+import javax.management.MBeanServerConnection;
+
/**
* Tests redeployment and state transfer.
*
@@ -72,7 +74,7 @@
{
super.setUp();
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
if (!deployed0)
{
deploy(adaptors[0], deployment);
@@ -182,7 +184,7 @@
private void redeploy() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
undeploy(adaptors[1], deployment);
getLog().debug("Undeployed " + deployment + " on server1");
More information about the jboss-cvs-commits
mailing list