Author: manugeorge
Date: Sun Sep 16 10:39:40 2007
New Revision: 576134
URL: http://svn.apache.org/viewvc?rev=576134&view=rev
Log:
Fix for GERONIMO-3452. More Tests on the way
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/RmiIiopStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContainerTxStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/RmiIiopStatelessBean.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
Sun Sep 16 10:39:40 2007
@@ -24,6 +24,8 @@
import javax.ejb.AccessLocalException;
import javax.ejb.EJBAccessException;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.InterfaceType;
@@ -44,6 +46,7 @@
dispatchTable.put("remove", new Integer(4));
dispatchTable.put("getEJBHome", new Integer(5));
dispatchTable.put("getEJBLocalHome", new Integer(6));
+
}
public EjbObjectProxyHandler(DeploymentInfo deploymentInfo, Object pk,
InterfaceType interfaceType, List<Class> interfaces) {
@@ -61,8 +64,16 @@
logger.info("invoking method " + m.getName() + " on " +
deploymentID + " with identity " + primaryKey);
}
Integer operation = (Integer) dispatchTable.get(m.getName());
-
- if (operation == null || interfaceType.isBusiness()) {
+ if(operation != null){
+ if(operation.intValue() == 3){
+ if(m.getParameterTypes()[0] != EJBObject.class &&
m.getParameterTypes()[0] != EJBLocalObject.class ){
+ operation = null;
+ }
+ } else {
+ operation = (m.getParameterTypes().length ==
0)?operation:null;
+ }
+ }
+ if (operation == null || !interfaceType.isComponent() ) {
retValue = businessMethod(interfce, m, a, p);
} else {
switch (operation.intValue()) {
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
Sun Sep 16 10:39:40 2007
@@ -123,6 +123,10 @@
return (OperationsPolicy) allowedOperationsTable.get(methodName);
}
+ public String remove(String arg) {
+ return arg;
+ }
+
//
// Remote interface methods
//=============================
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
Sun Sep 16 10:39:40 2007
@@ -123,6 +123,10 @@
return (OperationsPolicy) allowedOperationsTable.get(methodName);
}
+
+ public String remove(String str){
+ return str;
+ }
//
// Remote interface methods
//=============================
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java
Sun Sep 16 10:39:40 2007
@@ -67,4 +67,6 @@
* @param methodName The method for which to get the allowed opperations
report
*/
public OperationsPolicy getAllowedOperationsReport(String methodName);
+
+ public String remove(String obj);
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java
Sun Sep 16 10:39:40 2007
@@ -64,4 +64,6 @@
* @param methodName The method for which to get the allowed opperations
report
*/
public OperationsPolicy getAllowedOperationsReport(String methodName)
throws RemoteException;
+
+ public String remove(String obj) throws RemoteException;
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java
Sun Sep 16 10:39:40 2007
@@ -110,4 +110,8 @@
public Object remove() {
return new String("Executed remove() Method");
}
+
+ public String remove(String arg) {
+ return arg;
+ }
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
Sun Sep 16 10:39:40 2007
@@ -175,7 +175,9 @@
return acct;
}
-
+ public String remove(String arg) {
+ return arg;
+ }
//
// Remote interface methods
//=============================
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
Sun Sep 16 10:39:40 2007
@@ -500,6 +500,10 @@
}
}
+
+ public String remove(String arg) {
+ return arg;
+ }
//
// Remote interface methods
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
Sun Sep 16 10:39:40 2007
@@ -330,4 +330,8 @@
public void setSessionContext(SessionContext sessionContext) throws
EJBException, RemoteException {
}
+
+ public String remove(String arg) {
+ return arg;
+ }
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java
Sun Sep 16 10:39:40 2007
@@ -45,6 +45,10 @@
public void remove(){
}
+ public String remove(String arg) {
+ return arg;
+ }
+
public void testPersistenceContext() throws TestFailureException {
try{
try{
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/RmiIiopStatefulBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/RmiIiopStatefulBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/RmiIiopStatefulBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/RmiIiopStatefulBean.java
Sun Sep 16 10:39:40 2007
@@ -405,6 +405,11 @@
public ObjectGraph[] returnObjectGraphArray(ObjectGraph[] data) {
return data;
}
+
+ public String remove(String arg) {
+ return arg;
+ }
+
//
// Remote interface methods
//=============================
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
Sun Sep 16 10:39:40 2007
@@ -540,4 +540,8 @@
public void setSessionContext(SessionContext sessionContext) throws
EJBException, RemoteException {
}
+
+ public String remove(String arg) {
+ return arg;
+ }
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
Sun Sep 16 10:39:40 2007
@@ -113,6 +113,10 @@
public OperationsPolicy getAllowedOperationsReport(String methodName) {
return (OperationsPolicy) allowedOperationsTable.get(methodName);
}
+
+ public String remove(String str){
+ return str;
+ }
//
// Remote interface methods
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java
Sun Sep 16 10:39:40 2007
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.test.stateless;
+import java.rmi.RemoteException;
import java.util.Properties;
import org.apache.openejb.test.ApplicationException;
@@ -73,4 +74,6 @@
* @param name the name used to notify via the TimerSyncBean
*/
public void scheduleTimer(String name);
+
+ public String remove(String obj);
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java
Sun Sep 16 10:39:40 2007
@@ -73,4 +73,6 @@
* @param name the name used to notify via the TimerSyncBean
*/
public void scheduleTimer(String name) throws RemoteException;
+
+ public String remove(String obj) throws RemoteException;
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
Sun Sep 16 10:39:40 2007
@@ -98,4 +98,8 @@
public Object remove() {
return new String("Executed remove() Method");
}
+
+ public String remove(String arg) {
+ return arg;
+ }
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
Sun Sep 16 10:39:40 2007
@@ -206,4 +206,7 @@
// SessionBean interface methods
//==================================
+ public String remove(String arg) {
+ return arg;
+ }
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContainerTxStatelessBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContainerTxStatelessBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContainerTxStatelessBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContainerTxStatelessBean.java
Sun Sep 16 10:39:40 2007
@@ -188,5 +188,9 @@
//
// SessionBean interface methods
//==================================
+ public String remove(String arg) {
+ return arg;
+ }
+
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
Sun Sep 16 10:39:40 2007
@@ -478,4 +478,8 @@
//
// SessionBean interface methods
//================================
+
+ public String remove(String arg) {
+ return arg;
+ }
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
Sun Sep 16 10:39:40 2007
@@ -538,4 +538,7 @@
//
// SessionBean interface methods
//================================
+ public String remove(String arg) {
+ return arg;
+ }
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
Sun Sep 16 10:39:40 2007
@@ -309,4 +309,8 @@
public void setSessionContext(SessionContext sessionContext) throws
EJBException, RemoteException {
}
+
+ public String remove(String arg) {
+ return arg;
+ }
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/RmiIiopStatelessBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/RmiIiopStatelessBean.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/RmiIiopStatelessBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/RmiIiopStatelessBean.java
Sun Sep 16 10:39:40 2007
@@ -406,6 +406,11 @@
public ObjectGraph[] returnObjectGraphArray(ObjectGraph[] data) {
return data;
}
+
+ public String remove(String arg) {
+ return arg;
+ }
+
//
// Remote interface methods
//=============================
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
Sun Sep 16 10:39:40 2007
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.test.stateful;
+import java.rmi.RemoteException;
+
import javax.ejb.EJBHome;
/**
@@ -96,7 +98,21 @@
fail("A RuntimeException should have been thrown.");
}
+ //
+ // Test ejb remoce methods
+ //===============================
public void test05_remove(){
+ String str = null;
+ try {
+ str = ejbObject.remove("Hello");
+ } catch (RemoteException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ assertEquals("Hello",str);
+ }
+
+ public void test06_remove(){
try{
ejbObject.remove();
try{
@@ -110,9 +126,6 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
- //
- // Test ejb object methods
- //===============================
-
+
}
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java?rev=576134&r1=576133&r2=576134&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java
Sun Sep 16 10:39:40 2007
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.test.stateless;
+import java.rmi.RemoteException;
+
import javax.ejb.EJBHome;
/**
@@ -113,4 +115,14 @@
//
// Test ejb object methods
//===============================
+ public void test06_remove(){
+ String str = null;
+ try {
+ str = ejbObject.remove("Hello");
+ } catch (RemoteException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ assertEquals("Hello",str);
+ }
}
