[jboss-cvs] JBossAS SVN: r69956 - in projects/ejb3/trunk/core/src/test: resources/test/reference21_30/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 19 19:21:17 EST 2008
Author: bdecoste
Date: 2008-02-19 19:21:17 -0500 (Tue, 19 Feb 2008)
New Revision: 69956
Modified:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session21Bean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session30Bean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test3Bean.java
projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference.xml
projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml
projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss2.xml
Log:
fixed tests
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session21Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session21Bean.java 2008-02-19 23:14:30 UTC (rev 69955)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session21Bean.java 2008-02-20 00:21:17 UTC (rev 69956)
@@ -23,6 +23,8 @@
import javax.ejb.SessionContext;
import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+
import org.jboss.ejb3.Container;
import org.jboss.logging.Logger;
@@ -43,6 +45,13 @@
{
try {
InitialContext jndiContext = new InitialContext();
+
+ lookup(jndiContext, "");
+ lookup(jndiContext, "Session30");
+ lookup(jndiContext, "java:comp");
+ lookup(jndiContext, "java:comp/env");
+
+
Session30 session = (Session30)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/Session30");
return session.access();
} catch (Exception e)
@@ -52,11 +61,25 @@
}
}
+ private void lookup(InitialContext jndiContext, String name)
+ {
+ log.info("!!!!!lookup " + name);
+ try {
+ NamingEnumeration names = jndiContext.list(name);
+ if (names != null){
+ while (names.hasMore()){
+ log.info(" " + names.next());
+ }
+ }
+ } catch (Exception e){
+ }
+ }
+
public String globalAccess30()
{
try {
InitialContext jndiContext = new InitialContext();
- Session30 session = (Session30)jndiContext.lookup("GlobalSession30Remote");
+ Session30RemoteBusiness session = (Session30RemoteBusiness)jndiContext.lookup("GlobalSession30Remote");
return session.access();
} catch (Exception e)
{
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session30Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session30Bean.java 2008-02-19 23:14:30 UTC (rev 69955)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session30Bean.java 2008-02-20 00:21:17 UTC (rev 69956)
@@ -30,7 +30,9 @@
import org.jboss.ejb3.Container;
import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.LocalHomeBinding;
import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteHomeBinding;
import org.jboss.logging.Logger;
/**
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java 2008-02-19 23:14:30 UTC (rev 69955)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java 2008-02-20 00:21:17 UTC (rev 69956)
@@ -23,6 +23,7 @@
import javax.ejb.SessionContext;
import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
import org.jboss.logging.Logger;
@@ -39,6 +40,12 @@
public void testAccess() throws Exception
{
InitialContext jndiContext = new InitialContext();
+
+ lookup(jndiContext, "");
+ lookup(jndiContext, "java:comp");
+ lookup(jndiContext, "java:comp/env");
+ lookup(jndiContext, "java:comp/env/ejb");
+
Test3 session = (Test3)jndiContext.lookup("java:comp/env/ejb/Test3");
session.testAccess();
@@ -47,6 +54,20 @@
session.testAccess();
}
+ private void lookup(InitialContext jndiContext, String name)
+ {
+ log.info("!!!!!lookup " + name);
+ try {
+ NamingEnumeration names = jndiContext.list(name);
+ if (names != null){
+ while (names.hasMore()){
+ log.info(" " + names.next());
+ }
+ }
+ } catch (Exception e){
+ }
+ }
+
public void ejbCreate()
{
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test3Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test3Bean.java 2008-02-19 23:14:30 UTC (rev 69955)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test3Bean.java 2008-02-20 00:21:17 UTC (rev 69956)
@@ -30,6 +30,7 @@
import org.jboss.ejb3.Container;
import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
import org.jboss.logging.Logger;
/**
@@ -38,7 +39,7 @@
*/
@Stateless(name="Test3")
@Remote({Test3.class, Test3Business.class})
- at RemoteBinding(jndiBinding="Test3Remote")
+ at RemoteBindings({@RemoteBinding(jndiBinding="Test3Remote"), at RemoteBinding(jndiBinding="Test3/remote")})
@RemoteHome(Test3Home.class)
@EJBs({@EJB(name="injected/Test2", mappedName="Test2")})
public class Test3Bean
Modified: projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference.xml 2008-02-19 23:14:30 UTC (rev 69955)
+++ projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference.xml 2008-02-20 00:21:17 UTC (rev 69956)
@@ -8,7 +8,7 @@
<enterprise-beans>
<session>
<ejb-name>Session21</ejb-name>
- <jndi-name>Session21</jndi-name>
+ <jndi-name>Session21Remote</jndi-name>
</session>
</enterprise-beans>
</jboss>
Modified: projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml 2008-02-19 23:14:30 UTC (rev 69955)
+++ projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml 2008-02-20 00:21:17 UTC (rev 69956)
@@ -8,7 +8,7 @@
<enterprise-beans>
<session>
<ejb-name>Session21</ejb-name>
- <jndi-name>Session21</jndi-name>
+ <jndi-name>Session21Remote</jndi-name>
</session>
<session>
<ejb-name>Session30</ejb-name>
Modified: projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss2.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss2.xml 2008-02-19 23:14:30 UTC (rev 69955)
+++ projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss2.xml 2008-02-20 00:21:17 UTC (rev 69956)
@@ -11,11 +11,11 @@
<jndi-name>Test2</jndi-name>
<ejb-ref>
<ejb-ref-name>ejb/Test3Home</ejb-ref-name>
- <jndi-name>Test3Home</jndi-name>
+ <jndi-name>Test3/home</jndi-name>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/Test3</ejb-ref-name>
- <jndi-name>Test3</jndi-name>
+ <jndi-name>Test3Remote</jndi-name>
</ejb-ref>
</session>
</enterprise-beans>
More information about the jboss-cvs-commits
mailing list