You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2006/11/02 10:30:56 UTC
svn commit: r470287 - in /incubator/openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/alt/config/
container/openejb-core/src/main/java/org/apache/openejb/core/stateful/
container/openejb-core/src/main/java/org/apache/opene...
Author: jlaskowski
Date: Thu Nov 2 01:30:55 2006
New Revision: 470287
URL: http://svn.apache.org/viewvc?view=rev&rev=470287
Log:
OPENEJB-282 Both EJBHome and EJBLocalHome remove(Object primaryKey) methods should throw javax.ejb.RemoveException when used with Sessions beans
Submitted by: Mohammad Nour
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java
incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java
incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java
incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java
incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalHomeTests.java
incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java
incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java
incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java
incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalHomeTests.java
incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatefulEJBHomeHandler.java
incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBHomeHandler.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java Thu Nov 2 01:30:55 2006
@@ -145,7 +145,7 @@
/*------------------------------------------------------*/
/**
- * Deploy EJBs from jarLocation (be it a jar file or a unpacked directory
+ * Deploy EJBs from path (be it a jar file or a unpacked directory)
*/
public void deploy(String path) throws OpenEJBException {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java Thu Nov 2 01:30:55 2006
@@ -16,16 +16,17 @@
*/
package org.apache.openejb.core.stateful;
+import java.lang.reflect.Method;
+
+import javax.ejb.RemoveException;
+
+import org.apache.openejb.InterfaceType;
import org.apache.openejb.ProxyInfo;
import org.apache.openejb.RpcContainer;
-import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-
public class StatefulEjbHomeHandler extends EjbHomeProxyHandler {
public StatefulEjbHomeHandler(RpcContainer container, Object pk, Object depID, InterfaceType interfaceType) {
@@ -47,7 +48,7 @@
}
protected Object removeByPrimaryKey(Method method, Object[] args, Object proxy) throws Throwable {
- throw new RemoteException("Session objects are private resources and do not have primary keys");
+ throw new RemoveException("Session objects are private resources and do not have primary keys");
}
protected EjbObjectProxyHandler newEjbObjectHandler(RpcContainer container, Object pk, Object depID, InterfaceType interfaceType) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java Thu Nov 2 01:30:55 2006
@@ -16,17 +16,18 @@
*/
package org.apache.openejb.core.stateless;
-import org.apache.openejb.RpcContainer;
+import java.lang.reflect.Method;
+
+import javax.ejb.RemoveException;
+
import org.apache.openejb.InterfaceType;
+import org.apache.openejb.RpcContainer;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.core.ivm.IntraVmHandle;
import org.apache.openejb.util.proxy.ProxyManager;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-
public class StatelessEjbHomeHandler extends EjbHomeProxyHandler {
public StatelessEjbHomeHandler(RpcContainer container, Object pk, Object depID, InterfaceType interfaceType) {
@@ -38,7 +39,7 @@
}
protected Object removeByPrimaryKey(Method method, Object[] args, Object proxy) throws Throwable {
- throw new RemoteException("Session objects are private resources and do not have primary keys");
+ throw new RemoveException("Session objects are private resources and do not have primary keys");
}
/*
Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java (original)
+++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java Thu Nov 2 01:30:55 2006
@@ -17,6 +17,7 @@
package org.apache.openejb.test.stateful;
import javax.ejb.EJBMetaData;
+import javax.ejb.RemoveException;
/**
* [3] Should be run as the third test suite of the BasicStatefulTestClients
@@ -89,13 +90,13 @@
public void test03_removeByPrimaryKey(){
try{
ejbHome.remove("primaryKey");
- } catch (java.rmi.RemoteException e){
+ } catch (RemoveException e){
assertTrue( true );
return;
} catch (Exception e){
- fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ fail("Received Exception " + e.getClass() + " instead of javax.ejb.RemoveException : " + e.getMessage());
}
- assertTrue("java.rmi.RemoteException should have been thrown", false );
+ assertTrue("javax.ejb.RemoveException should have been thrown", false );
}
//
// Test ejb home methods
Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java (original)
+++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java Thu Nov 2 01:30:55 2006
@@ -37,12 +37,11 @@
suite.addTest(new StatefulJndiTests());
suite.addTest(new StatefulPojoLocalJndiTests());
suite.addTest(new StatefulHomeIntfcTests());
- suite.addTest(new StatefulPojoHomeIntfcTests());
suite.addTest(new StatefulPojoLocalHomeIntfcTests());
suite.addTest(new StatefulLocalBusinessIntfcTests());
+ // MNour: Why we put this remote test into the suite for local tests ???
suite.addTest(new StatefulRemoteBusinessIntfcTests());
suite.addTest(new StatefulEjbHomeTests());
- suite.addTest(new StatefulPojoEjbHomeTests());
suite.addTest(new StatefulPojoEjbLocalHomeTests());
suite.addTest(new StatefulEjbObjectTests());
suite.addTest(new StatefulRemoteIntfcTests());
Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java (original)
+++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java Thu Nov 2 01:30:55 2006
@@ -17,6 +17,7 @@
package org.apache.openejb.test.stateful;
import javax.ejb.EJBMetaData;
+import javax.ejb.RemoveException;
/**
* [3] Should be run as the third test suite of the BasicStatefulTestClients
@@ -92,13 +93,13 @@
public void test03_removeByPrimaryKey(){
try{
ejbHome.remove("primaryKey");
- } catch (java.rmi.RemoteException e){
+ } catch (RemoveException e){
assertTrue( true );
return;
} catch (Exception e){
- fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ fail("Received Exception " + e.getClass() + " instead of javax.ejb.RemoveException : " + e.getMessage());
}
- assertTrue("java.rmi.RemoteException should have been thrown", false );
+ assertTrue("javax.ejb.RemoveException should have been thrown", false );
}
//
// Test ejb home methods
Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalHomeTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalHomeTests.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalHomeTests.java (original)
+++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalHomeTests.java Thu Nov 2 01:30:55 2006
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.stateful;
-import javax.ejb.EJBException;
+import javax.ejb.RemoveException;
/**
* [3] Should be run as the third test suite of the BasicStatefulTestClients
@@ -73,13 +73,13 @@
public void test03_removeByPrimaryKey(){
try{
ejbLocalHome.remove("primaryKey");
- } catch (EJBException e){
+ } catch (RemoveException e){
assertTrue( true );
return;
} catch (Exception e){
- fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ fail("Received Exception " + e.getClass() + " instead of javax.ejb.RemoveException : " + e.getMessage());
}
- assertTrue("javx.ejb.EJBException should have been thrown", false );
+ assertTrue("javax.ejb.RemoveException should have been thrown", false );
}
//
// Test ejb home methods
Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java (original)
+++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java Thu Nov 2 01:30:55 2006
@@ -17,6 +17,7 @@
package org.apache.openejb.test.stateless;
import javax.ejb.EJBMetaData;
+import javax.ejb.RemoveException;
/**
* [3] Should be run as the third test suite of the BasicStatelessTestClients
@@ -89,13 +90,13 @@
public void test03_removeByPrimaryKey(){
try{
ejbHome.remove("primaryKey");
- } catch (java.rmi.RemoteException e){
+ } catch (RemoveException e){
assertTrue( true );
return;
} catch (Exception e){
- fail("Received "+e.getClass()+" instead of java.rmi.RemoteException");
+ fail("Received Exception " + e.getClass() + " instead of javax.ejb.RemoveException : " + e.getMessage());
}
- assertTrue("java.rmi.RemoteException should have been thrown", false );
+ assertTrue("javax.ejb.RemoveException should have been thrown", false );
}
//
// Test ejb home methods
Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java (original)
+++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessLocalTestSuite.java Thu Nov 2 01:30:55 2006
@@ -34,14 +34,13 @@
public static junit.framework.Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(new StatelessJndiTests());
- suite.addTest(new StatelessPojoRemoteJndiTests());
suite.addTest(new StatelessPojoLocalJndiTests());
suite.addTest(new StatelessHomeIntfcTests());
suite.addTest(new StatelessPojoLocalHomeIntfcTests());
suite.addTest(new StatelessLocalBusinessIntfcTests());
+ // MNour: Why we put this remote test into this suite of local tests ???
suite.addTest(new StatelessRemoteBusinessIntfcTests());
suite.addTest(new StatelessEjbHomeTests() );
- suite.addTest(new StatelessPojoEjbHomeTests() );
suite.addTest(new StatelessPojoEjbLocalHomeTests() );
suite.addTest(new StatelessEjbObjectTests());
suite.addTest(new StatelessRemoteIntfcTests());
Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java (original)
+++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java Thu Nov 2 01:30:55 2006
@@ -17,6 +17,7 @@
package org.apache.openejb.test.stateless;
import javax.ejb.EJBMetaData;
+import javax.ejb.RemoveException;
/**
* [3] Should be run as the third test suite of the BasicStatelessTestClients
@@ -92,13 +93,13 @@
public void test03_removeByPrimaryKey(){
try{
ejbHome.remove("primaryKey");
- } catch (java.rmi.RemoteException e){
+ } catch (RemoveException e){
assertTrue( true );
return;
} catch (Exception e){
- fail("Received "+e.getClass()+" instead of java.rmi.RemoteException");
+ fail("Received Exception " + e.getClass() + " instead of javax.ejb.RemoveException : " + e.getMessage());
}
- assertTrue("java.rmi.RemoteException should have been thrown", false );
+ assertTrue("javax.ejb.RemoveException should have been thrown", false );
}
//
// Test ejb home methods
Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalHomeTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalHomeTests.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalHomeTests.java (original)
+++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalHomeTests.java Thu Nov 2 01:30:55 2006
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.stateless;
-import javax.ejb.EJBException;
+import javax.ejb.RemoveException;
/**
@@ -75,13 +75,13 @@
public void test03_removeByPrimaryKey(){
try{
ejbLocalHome.remove("primaryKey");
- } catch (EJBException e){
+ } catch (RemoveException e){
assertTrue( true );
return;
} catch (Exception e){
- fail("Received "+e.getClass()+" instead of javax.ejb.EJBException");
+ fail("Received Exception " + e.getClass() + " instead of javax.ejb.RemoveException : " + e.getMessage());
}
- assertTrue("javax.ejb.EJBException should have been thrown", false );
+ assertTrue("javax.ejb.RemoveException should have been thrown", false );
}
//
// Test ejb local-home methods
Modified: incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatefulEJBHomeHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatefulEJBHomeHandler.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatefulEJBHomeHandler.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatefulEJBHomeHandler.java Thu Nov 2 01:30:55 2006
@@ -17,7 +17,8 @@
package org.apache.openejb.client;
import java.lang.reflect.Method;
-import java.rmi.RemoteException;
+
+import javax.ejb.RemoveException;
public class StatefulEJBHomeHandler extends EJBHomeHandler {
@@ -33,7 +34,7 @@
}
protected Object removeByPrimaryKey(Method method, Object[] args, Object proxy) throws Throwable {
- throw new RemoteException("Session objects are private resources and do not have primary keys");
+ throw new RemoveException("Session objects are private resources and do not have primary keys");
}
protected Object removeWithHandle(Method method, Object[] args, Object proxy) throws Throwable {
Modified: incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBHomeHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBHomeHandler.java?view=diff&rev=470287&r1=470286&r2=470287
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBHomeHandler.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBHomeHandler.java Thu Nov 2 01:30:55 2006
@@ -17,7 +17,8 @@
package org.apache.openejb.client;
import java.lang.reflect.Method;
-import java.rmi.RemoteException;
+
+import javax.ejb.RemoveException;
public class StatelessEJBHomeHandler extends EJBHomeHandler {
@@ -33,7 +34,7 @@
}
protected Object removeByPrimaryKey(Method method, Object[] args, Object proxy) throws Throwable {
- throw new RemoteException("Session objects are private resources and do not have primary keys");
+ throw new RemoveException("Session objects are private resources and do not have primary keys");
}
/*