[jboss-cvs] JBossAS SVN: r66072 - in trunk/ejb3/src: resources/test/securitydomain/META-INF and 2 other directories.

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

Author: ALRubinger
Date: 2007-10-12 01:52:40 -0400 (Fri, 12 Oct 2007)
New Revision: 66072

Modified:
   trunk/ejb3/src/resources/test/naming/META-INF/jboss1.xml
   trunk/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml
   trunk/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
Log:
Resolved JNDI Naming conflicts introduced by resolution of EJBTHREE-1062

Modified: trunk/ejb3/src/resources/test/naming/META-INF/jboss1.xml
===================================================================
--- trunk/ejb3/src/resources/test/naming/META-INF/jboss1.xml	2007-10-12 05:49:42 UTC (rev 66071)
+++ trunk/ejb3/src/resources/test/naming/META-INF/jboss1.xml	2007-10-12 05:52:40 UTC (rev 66072)
@@ -8,7 +8,7 @@
     <enterprise-beans>
         <session>
             <ejb-name>ENCBean</ejb-name>
-            <jndi-name>ENCBean</jndi-name>
+            <jndi-name>ENCBean/remote</jndi-name>
 
             <resource-ref>
                 <res-ref-name>jdbc/DefaultDS</res-ref-name>
@@ -36,7 +36,7 @@
         </session>
          <session>
             <ejb-name>ENCBean0</ejb-name>
-            <jndi-name>ENCBean0</jndi-name>
+            <jndi-name>ENCBean0/remote</jndi-name>
         </session>
         <session>
             <ejb-name>ENCBean1</ejb-name>

Modified: trunk/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml
===================================================================
--- trunk/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml	2007-10-12 05:49:42 UTC (rev 66071)
+++ trunk/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml	2007-10-12 05:52:40 UTC (rev 66072)
@@ -9,7 +9,7 @@
    <enterprise-beans>
       <session>
          <ejb-name>SecurityDomainTest</ejb-name>
-         <jndi-name>SecurityDomainTest</jndi-name>
+         <jndi-name>SecurityDomainTest/remote</jndi-name>
       </session>
    </enterprise-beans>
 </jboss>

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java	2007-10-12 05:49:42 UTC (rev 66071)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java	2007-10-12 05:52:40 UTC (rev 66072)
@@ -55,7 +55,7 @@
       SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
       SecurityAssociation.setCredential("theduke".toCharArray());
       
-      TestENC bean = (TestENC)getInitialContext().lookup("ENCBean");
+      TestENC bean = (TestENC)getInitialContext().lookup("ENCBean/remote");
       getLog().debug("Created ENCBean");
       bean.accessENC();
       bean.remove();
@@ -71,7 +71,7 @@
       SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
       SecurityAssociation.setCredential("theduke".toCharArray());
       
-      TestENC bean = (TestENC)getInitialContext().lookup("ENCBean0");
+      TestENC bean = (TestENC)getInitialContext().lookup("ENCBean0/remote");
       getLog().debug("Created ENCBean0");
       bean.accessENC();
       bean.remove();

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java	2007-10-12 05:49:42 UTC (rev 66071)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java	2007-10-12 05:52:40 UTC (rev 66072)
@@ -41,7 +41,7 @@
 
    public void testJBossSecurityDomain() throws Exception
    {
-      SecurityDomainTest test = (SecurityDomainTest)getInitialContext().lookup("SecurityDomainTest");
+      SecurityDomainTest test = (SecurityDomainTest)getInitialContext().lookup("SecurityDomainTest/remote");
       assertNotNull(test);
       
       try