[jboss-cvs] JBossAS SVN: r73317 - projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 12 18:02:59 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-05-12 18:02:59 -0400 (Mon, 12 May 2008)
New Revision: 73317
Modified:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java
Log:
Revert revision 73172; jar name not needed in JNDI lookup
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java 2008-05-12 22:01:40 UTC (rev 73316)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java 2008-05-12 22:02:59 UTC (rev 73317)
@@ -78,25 +78,25 @@
public void testBasic()
throws Exception
{
- basicTest("clusteredsession-test/testStateful/remote");
+ basicTest("testStateful/remote");
}
public void testBasicWithoutAnnotation()
throws Exception
{
- basicTest("clusteredsession-test/NonAnnotationStateful/remote");
+ basicTest("NonAnnotationStateful/remote");
}
public void testBasicWithXMLOverride()
throws Exception
{
- basicTest("clusteredsession-test/OverrideAnnotationStateful/remote");
+ basicTest("OverrideAnnotationStateful/remote");
}
public void testBasicWithEjbJarXMLOverride()
throws Exception
{
- basicTest("clusteredsession-test/EjbJarOverrideAnnotationStateful/remote");
+ basicTest("EjbJarOverrideAnnotationStateful/remote");
}
private void basicTest(String jndiBinding) throws Exception
@@ -129,25 +129,25 @@
public void testStatefulBeanCounterFailover()
throws Exception
{
- statefulBeanCounterFailoverTest("clusteredsession-test/testStateful/remote");
+ statefulBeanCounterFailoverTest("testStateful/remote");
}
public void testStatefulBeanCounterFailoverWithoutAnnotation()
throws Exception
{
- statefulBeanCounterFailoverTest("clusteredsession-test/NonAnnotationStateful/remote");
+ statefulBeanCounterFailoverTest("NonAnnotationStateful/remote");
}
public void testStatefulBeanCounterFailoverWithXMLOverride()
throws Exception
{
- statefulBeanCounterFailoverTest("clusteredsession-test/OverrideAnnotationStateful/remote");
+ statefulBeanCounterFailoverTest("OverrideAnnotationStateful/remote");
}
public void testStatefulBeanCounterFailoverWithEjbJarXMLOverride()
throws Exception
{
- statefulBeanCounterFailoverTest("clusteredsession-test/EjbJarOverrideAnnotationStateful/remote");
+ statefulBeanCounterFailoverTest("EjbJarOverrideAnnotationStateful/remote");
}
private void statefulBeanCounterFailoverTest(String jndiBinding)
@@ -194,25 +194,25 @@
public void testStatefulBeanFailover()
throws Exception
{
- statefulBeanFailoverTest("clusteredsession-test/testStateful/remote");
+ statefulBeanFailoverTest("testStateful/remote");
}
public void testStatefulBeanFailoverWithoutAnnotation()
throws Exception
{
- statefulBeanFailoverTest("clusteredsession-test/NonAnnotationStateful/remote");
+ statefulBeanFailoverTest("NonAnnotationStateful/remote");
}
public void testStatefulBeanFailoverWithXMLOverride()
throws Exception
{
- statefulBeanFailoverTest("clusteredsession-test/OverrideAnnotationStateful/remote");
+ statefulBeanFailoverTest("OverrideAnnotationStateful/remote");
}
public void testStatefulBeanFailoverWithEjbJarXMLOverride()
throws Exception
{
- statefulBeanFailoverTest("clusteredsession-test/EjbJarOverrideAnnotationStateful/remote");
+ statefulBeanFailoverTest("EjbJarOverrideAnnotationStateful/remote");
}
private void statefulBeanFailoverTest(String jndiBinding)
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java 2008-05-12 22:01:40 UTC (rev 73316)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java 2008-05-12 22:02:59 UTC (rev 73317)
@@ -75,7 +75,7 @@
getLog().debug("==================================");
getLog().debug(++PassivationUnitTestCase.test +"- "
+"Looking up testStateful...");
- StatefulRemote remote = (StatefulRemote) ctx.lookup("clusteredsession-test/testStateful/remote");
+ StatefulRemote remote = (StatefulRemote) ctx.lookup("testStateful/remote");
int invCount = 0;
@@ -112,7 +112,7 @@
getLog().debug("==================================");
getLog().debug(++PassivationUnitTestCase.test +"- "
+"Looking up testIgnoreReplicationStateful...");
- StatefulRemote remote = (StatefulRemote) ctx.lookup("clusteredsession-test/testIgnoreReplicationStateful/remote");
+ StatefulRemote remote = (StatefulRemote) ctx.lookup("testIgnoreReplicationStateful/remote");
remote.reset();
remote.setState("hello");
@@ -140,7 +140,7 @@
getLog().debug("==================================");
getLog().debug(++PassivationUnitTestCase.test +"- "
+"Looking up testOptimizedStateful...");
- StatefulRemote remote = (StatefulRemote) ctx.lookup("clusteredsession-test/testOptimizedStateful/remote");
+ StatefulRemote remote = (StatefulRemote) ctx.lookup("testOptimizedStateful/remote");
int invCount = 0;
remote.reset();
@@ -178,7 +178,7 @@
getLog().debug("==================================");
getLog().debug(++PassivationUnitTestCase.test +"- "
+"Looking up testStateful...");
- StatefulRemote stateful = (StatefulRemote) ctx.lookup("clusteredsession-test/testStateful/remote");
+ StatefulRemote stateful = (StatefulRemote) ctx.lookup("testStateful/remote");
stateful.reset();
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java 2008-05-12 22:01:40 UTC (rev 73316)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java 2008-05-12 22:02:59 UTC (rev 73317)
@@ -22,14 +22,12 @@
package org.jboss.ejb3.test.clusteredsession.unit;
-import java.rmi.dgc.VMID;
import java.util.Properties;
import javax.management.MBeanServerConnection;
import javax.naming.Context;
import javax.naming.InitialContext;
-import junit.framework.Assert;
import junit.framework.Test;
import org.jboss.ejb3.test.clusteredsession.ClusteredStatelessRemote;
@@ -115,49 +113,49 @@
getLog().debug("================================================");
getLog().debug("Checking ClusteredStatelessRemote on node 0");
- ClusteredStatelessRemote csr = (ClusteredStatelessRemote) getInitialContext(0).lookup("clusteredsession-test/clusteredStateless/remote");
+ ClusteredStatelessRemote csr = (ClusteredStatelessRemote) getInitialContext(0).lookup("clusteredStateless/remote");
confirmTargetCount(getFamilyName(SLSB), 2);
getLog().debug("Checking ClusteredStatelessRemote on node 1");
- csr = (ClusteredStatelessRemote) getInitialContext(1).lookup("clusteredsession-test/clusteredStateless/remote");
+ csr = (ClusteredStatelessRemote) getInitialContext(1).lookup("clusteredStateless/remote");
confirmTargetCount(getFamilyName(SLSB), 2);
getLog().debug("Checking StatefulRemote on node 0");
- StatefulRemote sr = (StatefulRemote) getInitialContext(0).lookup("clusteredsession-test/testStateful/remote");
+ StatefulRemote sr = (StatefulRemote) getInitialContext(0).lookup("testStateful/remote");
confirmTargetCount(getFamilyName(SFSB), 2);
getLog().debug("Checking StatefulRemote on node 1");
- sr = (StatefulRemote) getInitialContext(1).lookup("clusteredsession-test/testStateful/remote");
+ sr = (StatefulRemote) getInitialContext(1).lookup("testStateful/remote");
confirmTargetCount(getFamilyName(SFSB), 2);
// Undeploy on node 1
undeploy();
getLog().debug("Checking ClusteredStatelessRemote on node 0 after undeploy");
- csr = (ClusteredStatelessRemote) getInitialContext(0).lookup("clusteredsession-test/clusteredStateless/remote");
+ csr = (ClusteredStatelessRemote) getInitialContext(0).lookup("clusteredStateless/remote");
confirmTargetCount(getFamilyName(SLSB), 1);
getLog().debug("Checking StatefulRemote on node 0 after undeploy");
- sr = (StatefulRemote) getInitialContext(0).lookup("clusteredsession-test/testStateful/remote");
+ sr = (StatefulRemote) getInitialContext(0).lookup("testStateful/remote");
confirmTargetCount(getFamilyName(SFSB), 1);
// Redeploy on node1
deploy();
getLog().debug("Checking ClusteredStatelessRemote on node 0 after redeploy");
- csr = (ClusteredStatelessRemote) getInitialContext(0).lookup("clusteredsession-test/clusteredStateless/remote");
+ csr = (ClusteredStatelessRemote) getInitialContext(0).lookup("clusteredStateless/remote");
confirmTargetCount(getFamilyName(SLSB), 2);
getLog().debug("Checking ClusteredStatelessRemote on node 1 after redeploy");
- csr = (ClusteredStatelessRemote) getInitialContext(1).lookup("clusteredsession-test/clusteredStateless/remote");
+ csr = (ClusteredStatelessRemote) getInitialContext(1).lookup("clusteredStateless/remote");
confirmTargetCount(getFamilyName(SLSB), 2);
getLog().debug("Checking StatefulRemote on node 0 after redeploy");
- sr = (StatefulRemote) getInitialContext(0).lookup("clusteredsession-test/testStateful/remote");
+ sr = (StatefulRemote) getInitialContext(0).lookup("testStateful/remote");
confirmTargetCount(getFamilyName(SFSB), 2);
getLog().debug("Checking StatefulRemote on node 1 after redeploy");
- sr = (StatefulRemote) getInitialContext(1).lookup("clusteredsession-test/testStateful/remote");
+ sr = (StatefulRemote) getInitialContext(1).lookup("testStateful/remote");
confirmTargetCount(getFamilyName(SFSB), 2);
getLog().debug("ok");
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java 2008-05-12 22:01:40 UTC (rev 73316)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java 2008-05-12 22:02:59 UTC (rev 73317)
@@ -136,7 +136,7 @@
// VMIDTrackerBean is not clustered, so once we have it's VMID
// we can keep creating SFSBs until we get one we want
getLog().debug("Looking up VMTrackerBean...");
- VMTracker tracker = (VMTracker) getInitialContext(0).lookup("clusteredsession-test/VMTrackerBean/remote");
+ VMTracker tracker = (VMTracker) getInitialContext(0).lookup("VMTrackerBean/remote");
VMID monitorVM = tracker.getVMID();
NodeAnswer node0 = null;
@@ -144,7 +144,7 @@
for (int i = 0; i < 10 && !vmMatch; i++)
{
getLog().debug("Looking up testStateful/remote... Attempt " + i +1);
- stateful = (StatefulRemote) ctx.lookup("clusteredsession-test/testStateful/remote");
+ stateful = (StatefulRemote) ctx.lookup("testStateful/remote");
node0 = stateful.getNodeState();
vmMatch = monitorVM.equals(node0.getNodeId());
More information about the jboss-cvs-commits
mailing list