[jboss-cvs] JBossAS SVN: r80132 - in projects/ejb3/trunk/testsuite/src/test: resources/test/naming/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 28 02:31:14 EDT 2008
Author: ALRubinger
Date: 2008-10-28 02:31:13 -0400 (Tue, 28 Oct 2008)
New Revision: 80132
Modified:
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/NamingTestCase.java
projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/ejb-jar.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss1.xml
Log:
[EJBTHREE-1241] Fix deployment failures in "naming" tests
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java 2008-10-28 06:21:08 UTC (rev 80131)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java 2008-10-28 06:31:13 UTC (rev 80132)
@@ -59,7 +59,7 @@
client.setSimple("jduke", "theduke");
client.login();
- TestENC bean = (TestENC)getInitialContext().lookup("ENCBean");
+ TestENC bean = (TestENC)getInitialContext().lookup("ENCBeanJndiName");
getLog().debug("Created ENCBean");
bean.accessENC();
bean.remove();
@@ -76,7 +76,7 @@
client.setSimple("jduke", "theduke");
client.login();
- TestENC bean = (TestENC)getInitialContext().lookup("ENCBean0");
+ TestENC bean = (TestENC)getInitialContext().lookup("ENCBean0JndiName");
getLog().debug("Created ENCBean0");
bean.accessENC();
bean.remove();
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/NamingTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/NamingTestCase.java 2008-10-28 06:21:08 UTC (rev 80131)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/NamingTestCase.java 2008-10-28 06:31:13 UTC (rev 80132)
@@ -22,13 +22,11 @@
package org.jboss.ejb3.test.naming.unit;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.jboss.ejb3.test.naming.Stateful;
import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.naming.Stateful;
-
/**
* @version <tt>$Revision$</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/ejb-jar.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/ejb-jar.xml 2008-10-28 06:21:08 UTC (rev 80131)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/ejb-jar.xml 2008-10-28 06:31:13 UTC (rev 80132)
@@ -13,7 +13,7 @@
<session>
<description>A session bean on looks up stuff in the ENC</description>
<ejb-name>ENCBean</ejb-name>
- <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+ <business-remote>org.jboss.ejb3.test.naming.TestENC</business-remote>
<ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
@@ -165,7 +165,7 @@
<session>
<description>Referenced Bean0 Create by TestENCHome2</description>
<ejb-name>ENCBean0</ejb-name>
- <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+ <business-remote>org.jboss.ejb3.test.naming.TestENC</business-remote>
<ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
@@ -179,7 +179,7 @@
<session>
<description>Referenced Bean1</description>
<ejb-name>ENCBean1</ejb-name>
- <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+ <business-remote>org.jboss.ejb3.test.naming.TestENC</business-remote>
<ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
@@ -194,7 +194,7 @@
<description>A bean with a JNDI name that cannot be used in a JMX
ObjectName</description>
<ejb-name>ENCBean2</ejb-name>
- <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+ <business-remote>org.jboss.ejb3.test.naming.TestENC</business-remote>
<ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
@@ -208,7 +208,7 @@
<session>
<description>A deployment that is secured</description>
<ejb-name>SecuredENCBean</ejb-name>
- <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+ <business-remote>org.jboss.ejb3.test.naming.TestENC</business-remote>
<ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss1.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss1.xml 2008-10-28 06:21:08 UTC (rev 80131)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss1.xml 2008-10-28 06:31:13 UTC (rev 80132)
@@ -8,7 +8,7 @@
<enterprise-beans>
<session>
<ejb-name>ENCBean</ejb-name>
- <jndi-name>ENCBean</jndi-name>
+ <jndi-name>ENCBeanJndiName</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>ENCBean0JndiName</jndi-name>
</session>
<session>
<ejb-name>ENCBean1</ejb-name>
More information about the jboss-cvs-commits
mailing list