[jboss-cvs] JBossAS SVN: r78895 - in projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain: unit and 1 other directory.

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

Author: wolfc
Date: 2008-09-26 11:04:12 -0400 (Fri, 26 Sep 2008)
New Revision: 78895

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java
Log:
EJBTHREE-1201: make sure there are no jndi overlaps

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java	2008-09-26 14:56:32 UTC (rev 78894)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java	2008-09-26 15:04:12 UTC (rev 78895)
@@ -27,7 +27,6 @@
 import org.jboss.ejb3.annotation.Cache;
 import org.jboss.ejb3.annotation.CacheConfig;
 import org.jboss.ejb3.annotation.Pool;
-import org.jboss.ejb3.annotation.RemoteBinding;
 import org.jboss.logging.Logger;
 
 /**
@@ -38,7 +37,6 @@
  */
 @Stateful(name="DeploymentDescriptorStateful")
 @Remote(org.jboss.ejb3.test.aspectdomain.Stateful.class)
- at RemoteBinding(jndiBinding = "DeploymentDescriptorStateful")
 @Pool(value="ThreadlocalPool", maxSize=30, timeout=10000)
 @Cache("StatefulTreeCache")
 @CacheConfig(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/StatefulBean.java	2008-09-26 14:56:32 UTC (rev 78894)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/StatefulBean.java	2008-09-26 15:04:12 UTC (rev 78895)
@@ -28,7 +28,6 @@
 import org.jboss.ejb3.annotation.Cache;
 import org.jboss.ejb3.annotation.CacheConfig;
 import org.jboss.ejb3.annotation.Pool;
-import org.jboss.ejb3.annotation.RemoteBinding;
 import org.jboss.logging.Logger;
 
 /**
@@ -39,7 +38,6 @@
  */
 @Stateful(name="Stateful")
 @Remote(org.jboss.ejb3.test.aspectdomain.Stateful.class)
- at RemoteBinding(jndiBinding = "Stateful")
 @AspectDomain("Test Aspect Domain")
 @Pool(value="ThreadlocalPool", maxSize=30, timeout=10000)
 @Cache("StatefulTreeCache")

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java	2008-09-26 14:56:32 UTC (rev 78894)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java	2008-09-26 15:04:12 UTC (rev 78895)
@@ -21,11 +21,11 @@
  */
 package org.jboss.ejb3.test.aspectdomain.unit;
 
+import junit.framework.Test;
+
 import org.jboss.ejb3.test.aspectdomain.Stateful;
-
 import org.jboss.logging.Logger;
 import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
 
 /**
  * Comment
@@ -45,14 +45,14 @@
    
    public void testAspectDomain() throws Exception
    {
-     Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
+     Stateful stateful = (Stateful)getInitialContext().lookup("Stateful/remote");
      String result = stateful.test();
      assertEquals("TestInterceptor", result);
    }
    
    public void testDeploymentDescriptorAspectDomain() throws Exception
    {
-     Stateful stateful = (Stateful)getInitialContext().lookup("DeploymentDescriptorStateful");
+     Stateful stateful = (Stateful)getInitialContext().lookup("DeploymentDescriptorStateful/remote");
      String result = stateful.test();
      assertEquals("TestInterceptor", result);
    }