[jboss-cvs] JBossAS SVN: r71583 - in projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30: unit and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 2 04:11:11 EDT 2008
Author: ALRubinger
Date: 2008-04-02 04:11:11 -0400 (Wed, 02 Apr 2008)
New Revision: 71583
Modified:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.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/Session30LocalHome.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.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/unit/ReferenceTestCase.java
Log:
[EJBTHREE-1245] reference21_30 Regressions
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java 2008-04-02 07:35:37 UTC (rev 71582)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java 2008-04-02 08:11:11 UTC (rev 71583)
@@ -35,7 +35,7 @@
@Stateless(name="GlobalSession30")
@Remote(Session30RemoteBusiness.class)
@RemoteBinding(jndiBinding = "GlobalSession30Remote")
-public class GlobalSession30Bean
+public class GlobalSession30Bean implements Session30RemoteBusiness
{
private static final Logger log = Logger.getLogger(GlobalSession30Bean.class);
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-04-02 07:35:37 UTC (rev 71582)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session30Bean.java 2008-04-02 08:11:11 UTC (rev 71583)
@@ -24,12 +24,15 @@
import javax.ejb.EJB;
import javax.ejb.EJBs;
import javax.ejb.Local;
+import javax.ejb.LocalHome;
import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
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.logging.Logger;
@@ -42,12 +45,14 @@
@Local({LocalSession30.class, LocalSession30Business.class})
@RemoteBinding(jndiBinding = "Session30Remote")
@LocalBinding(jndiBinding = "LocalSession30")
+ at RemoteHome(Session30Home.class)
+ at LocalHome(Session30LocalHome.class)
+ at LocalHomeBinding(jndiBinding = Session30LocalHome.JNDI_NAME_SESSION_30)
@EJBs({@EJB(name="injected", beanInterface=org.jboss.ejb3.test.reference21_30.Session21.class, beanName="Session21")})
+
public class Session30Bean implements Session30RemoteBusiness, LocalSession30Business
{
private static final Logger log = Logger.getLogger(Session30Bean.class);
-
- @EJB(mappedName="Session21") Object testMappedName;
public String access()
{
@@ -62,8 +67,7 @@
return session.access();
} catch (Exception e)
{
- e.printStackTrace();
- return null;
+ throw new RuntimeException(e);
}
}
@@ -76,8 +80,7 @@
return session.access();
} catch (Exception e)
{
- e.printStackTrace();
- return null;
+ throw new RuntimeException(e);
}
}
@@ -90,8 +93,7 @@
return localSession.getLocalValue();
} catch (Exception e)
{
- e.printStackTrace();
- return null;
+ throw new RuntimeException(e);
}
}
@@ -118,8 +120,7 @@
return localSession.getLocalValue();
} catch (Exception e)
{
- e.printStackTrace();
- return null;
+ throw new RuntimeException(e);
}
}
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java 2008-04-02 07:35:37 UTC (rev 71582)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java 2008-04-02 08:11:11 UTC (rev 71583)
@@ -21,8 +21,7 @@
*/
package org.jboss.ejb3.test.reference21_30;
-import javax.ejb.*;
-import java.rmi.*;
+import javax.ejb.EJBLocalHome;
/**
* @version <tt>$Revision$</tt>
@@ -30,6 +29,8 @@
*/
public interface Session30LocalHome extends EJBLocalHome
{
- public LocalSession30 create() throws javax.ejb.CreateException;
+ String JNDI_NAME_SESSION_30 = "Session30/localHome";
+
+ public LocalSession30 create() throws javax.ejb.CreateException;
}
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java 2008-04-02 07:35:37 UTC (rev 71582)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java 2008-04-02 08:11:11 UTC (rev 71583)
@@ -24,7 +24,9 @@
import javax.annotation.PreDestroy;
import javax.ejb.Init;
import javax.ejb.Local;
+import javax.ejb.LocalHome;
import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
import javax.ejb.Stateful;
import javax.naming.InitialContext;
@@ -41,6 +43,8 @@
@Remote({StatefulSession30.class,StatefulSession30RemoteBusiness.class})
@RemoteBinding(jndiBinding = "StatefulSession30Remote")
@LocalBinding(jndiBinding = "LocalStatefulSession30")
+ at RemoteHome(StatefulSession30Home.class)
+ at LocalHome(StatefulSession30LocalHome.class)
public class StatefulSession30Bean implements java.io.Serializable, StatefulSession30RemoteBusiness
{
private static final long serialVersionUID = -8986168637251530390L;
@@ -73,13 +77,13 @@
{
try {
InitialContext jndiContext = new InitialContext();
- Session30LocalHome localHome = (Session30LocalHome)jndiContext.lookup("Session30/localHome");
+ Session30LocalHome localHome = (Session30LocalHome) jndiContext
+ .lookup(Session30LocalHome.JNDI_NAME_SESSION_30);
LocalSession30 localSession = localHome.create();
return localSession.access();
} catch (Exception e)
{
- e.printStackTrace();
- return null;
+ throw new RuntimeException(e);
}
}
@@ -94,8 +98,7 @@
return session.getLocalValue();
} catch (Exception e)
{
- e.printStackTrace();
- return null;
+ throw new RuntimeException(e);
}
}
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-04-02 07:35:37 UTC (rev 71582)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java 2008-04-02 08:11:11 UTC (rev 71583)
@@ -23,7 +23,6 @@
import javax.ejb.SessionContext;
import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
import org.jboss.logging.Logger;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java 2008-04-02 07:35:37 UTC (rev 71582)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java 2008-04-02 08:11:11 UTC (rev 71583)
@@ -84,16 +84,16 @@
{
InitialContext jndiContext = new InitialContext();
- Session30 session = (Session30) jndiContext.lookup("Session30Remote");
+ Session30RemoteBusiness session = (Session30RemoteBusiness) jndiContext.lookup("Session30Remote");
assertNotNull(session);
String access = session.access();
assertEquals("Session30", access);
Session30Home home = (Session30Home) jndiContext.lookup("Session30/home");
assertNotNull(home);
- session = (Session30)home.create();
- assertNotNull(session);
- access = session.access();
+ Session30 sessionRemote = (Session30)home.create();
+ assertNotNull(sessionRemote);
+ access = sessionRemote.access();
assertEquals("Session30", access);
}
@@ -286,7 +286,7 @@
EJBMetaData metadata = home.getEJBMetaData();
assertNotNull(metadata);
- assertEquals("org.jboss.ejb3.test.reference21_30.StatefulSession30",metadata.getRemoteInterfaceClass().getName());
+ assertEquals(StatefulSession30.class,metadata.getRemoteInterfaceClass());
HomeHandle homeHandle = home.getHomeHandle();
assertNotNull(homeHandle);
@@ -295,7 +295,7 @@
assertNotNull(ejbHome);
metadata = ejbHome.getEJBMetaData();
assertNotNull(metadata);
- assertEquals("org.jboss.ejb3.test.reference21_30.StatefulSession30",metadata.getRemoteInterfaceClass().getName());
+ assertEquals(StatefulSession30.class,metadata.getRemoteInterfaceClass());
StatefulSession30 session = (StatefulSession30)home.create();
assertNotNull(session);
More information about the jboss-cvs-commits
mailing list