You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/12/11 07:39:17 UTC
svn commit: r485528 [1/2] - in /incubator/openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/
container/openejb-core/src/main/java/org/apache/openejb/core/
container/openejb-core/src/main/java/org/apache/op...
Author: dblevins
Date: Sun Dec 10 22:39:11 2006
New Revision: 485528
URL: http://svn.apache.org/viewvc?view=rev&rev=485528
Log:
Improved home support (OPENEJB-404, OPENEJB-405)
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/config/rules/Messages.properties
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpHome.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpHome.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulHome.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessHome.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbHomeTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbObjectTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHandleTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHomeIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRemoteIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbHomeTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbObjectTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHandleTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRemoteIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbHomeTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbObjectTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HandleTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RemoteIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHandleTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHandleTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/MiscEjbTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteIntrfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteIntfcTests.java
incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/EJBHomeHandler.java
incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/RequestMethods.java
incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java Sun Dec 10 22:39:11 2006
@@ -163,7 +163,7 @@
boolean hasCreateMethod = false;
for (int i = 0; i < homeMethods.length && !hasCreateMethod; i++) {
- hasCreateMethod = homeMethods[i].getName().equals("create");
+ hasCreateMethod = homeMethods[i].getName().startsWith("create");
}
if (!hasCreateMethod) {
@@ -186,11 +186,13 @@
Method[] beanMethods = bean.getMethods();
for (int i = 0; i < homeMethods.length; i++) {
- if (!homeMethods[i].getName().equals("create")) continue;
+ if (!homeMethods[i].getName().startsWith("create")) continue;
Method create = homeMethods[i];
- Method ejbCreate = null;
+
+ StringBuilder ejbCreateName = new StringBuilder(create.getName());
+ ejbCreateName.replace(0,1, "ejbC");
try {
- ejbCreate = bean.getMethod("ejbCreate", create.getParameterTypes());
+ bean.getMethod(ejbCreateName.toString(), create.getParameterTypes());
} catch (NoSuchMethodException e) {
result = false;
@@ -200,7 +202,7 @@
EntityBean entity = (EntityBean) b;
ValidationFailure failure = new ValidationFailure("entity.no.ejb.create");
- failure.setDetails(b.getEjbClass(), entity.getPrimaryKey(), paramString);
+ failure.setDetails(b.getEjbClass(), entity.getPrimaryKey(), ejbCreateName.toString(), paramString);
failure.setBean(b);
set.addFailure(failure);
@@ -208,7 +210,7 @@
} else {
ValidationFailure failure = new ValidationFailure("session.no.ejb.create");
- failure.setDetails(b.getEjbClass(), paramString);
+ failure.setDetails(b.getEjbClass(), ejbCreateName.toString(), paramString);
failure.setBean(b);
set.addFailure(failure);
@@ -229,18 +231,19 @@
Method[] beanMethods = bean.getMethods();
for (int i = 0; i < homeMethods.length; i++) {
- if (!homeMethods[i].getName().equals("create")) continue;
+ if (!homeMethods[i].getName().startsWith("create")) continue;
Method create = homeMethods[i];
- Method ejbCreate = null;
+ StringBuilder ejbPostCreateName = new StringBuilder(create.getName());
+ ejbPostCreateName.replace(0,1, "ejbPostC");
try {
- ejbCreate = bean.getMethod("ejbPostCreate", create.getParameterTypes());
+ bean.getMethod(ejbPostCreateName.toString(), create.getParameterTypes());
} catch (NoSuchMethodException e) {
result = false;
String paramString = getParameters(create);
ValidationFailure failure = new ValidationFailure("no.ejb.post.create");
- failure.setDetails(b.getEjbClass(), paramString);
+ failure.setDetails(b.getEjbClass(), ejbPostCreateName.toString(), paramString);
failure.setBean(b);
set.addFailure(failure);
@@ -258,18 +261,19 @@
Method[] beanMethods = bean.getMethods();
for (int i = 0; i < homeMethods.length; i++) {
- if (!beanMethods[i].getName().equals("ejbCreate")) continue;
+ if (!beanMethods[i].getName().startsWith("ejbCreate")) continue;
Method ejbCreate = beanMethods[i];
- Method create = null;
+ StringBuilder create = new StringBuilder(ejbCreate.getName());
+ create.replace(0,4, "c");
try {
- create = home.getMethod("create", ejbCreate.getParameterTypes());
+ home.getMethod(create.toString(), ejbCreate.getParameterTypes());
} catch (NoSuchMethodException e) {
result = false;
String paramString = getParameters(ejbCreate);
ValidationWarning warning = new ValidationWarning("unused.ejb.create");
- warning.setDetails(b.getEjbClass(), paramString, home.getName());
+ warning.setDetails(b.getEjbClass(), ejbCreate.getName(), create.toString(), paramString, home.getName());
warning.setBean(b);
set.addWarning(warning);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java Sun Dec 10 22:39:11 2006
@@ -649,15 +649,18 @@
try {
Method beanMethod = null;
- if (method.getName().equals("create")) {
- beanMethod = beanClass.getMethod("ejbCreate", method.getParameterTypes());
+ if (method.getName().startsWith("create")) {
+ StringBuilder ejbCreateName = new StringBuilder(method.getName());
+ ejbCreateName.replace(0,1, "ejbC");
+ beanMethod = beanClass.getMethod(ejbCreateName.toString(), method.getParameterTypes());
createMethod = beanMethod;
/*
Entity beans have a ejbCreate and ejbPostCreate methods with matching
parameters. This code maps that relationship.
*/
if (this.componentType == BeanType.BMP_ENTITY || this.componentType == BeanType.CMP_ENTITY) {
- Method postCreateMethod = beanClass.getMethod("ejbPostCreate", method.getParameterTypes());
+ ejbCreateName.insert(3, "Post");
+ Method postCreateMethod = beanClass.getMethod(ejbCreateName.toString(), method.getParameterTypes());
postCreateMethodMap.put(createMethod, postCreateMethod);
}
/*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Sun Dec 10 22:39:11 2006
@@ -216,14 +216,14 @@
if (EJBHome.class.isAssignableFrom(declaringClass) || EJBLocalHome.class.isAssignableFrom(declaringClass)) {
if (declaringClass != EJBHome.class && declaringClass != EJBLocalHome.class) {
- if (methodName.equals("create")) {
+ if (methodName.startsWith("create")) {
return createEJBObject(callMethod, args, callContext);
} else if (methodName.equals("findByPrimaryKey")) {
return findByPrimaryKey(callMethod, args, callContext);
} else if (methodName.startsWith("find")) {
return findEJBObject(callMethod, args, callContext);
} else {
- throw new InvalidateReferenceException(new RemoteException("Invalid method " + methodName + " only find<METHOD>( ) and create( ) method are allowed in EJB 1.1 container-managed persistence"));
+ return homeMethod(callMethod, args, callContext);
}
} else if (methodName.equals("remove")) {
removeEJBObject(callMethod, callContext);
@@ -427,6 +427,56 @@
}
returnValue = runMethod.invoke(bean, args);
+
+ } catch (InvocationTargetException ite) {
+
+ if (ite.getTargetException() instanceof RuntimeException) {
+ /* System Exception ****************************/
+ txPolicy.handleSystemException(ite.getTargetException(), bean, txContext);
+
+ } else {
+ /* Application Exception ***********************/
+ txPolicy.handleApplicationException(ite.getTargetException(), txContext);
+ }
+ } catch (Throwable e) {
+ /* System Exception ****************************/
+ txPolicy.handleSystemException(e, bean, txContext);
+ } finally {
+ txPolicy.afterInvoke(bean, txContext);
+ }
+
+ return returnValue;
+ }
+
+ private Object homeMethod(Method callMethod, Object[] args, ThreadContext callContext) throws OpenEJBException {
+ CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+ TransactionPolicy txPolicy = deploymentInfo.getTransactionPolicy(callMethod);
+ TransactionContext txContext = new TransactionContext(callContext, transactionManager);
+
+ txPolicy.beforeInvoke(null, txContext);
+
+ EntityBean bean = null;
+ Object returnValue = null;
+ try {
+ /*
+ Obtain a bean instance from the method ready pool
+ */
+ bean = createNewInstance(callContext);
+
+ // set the entity context
+ setEntityContext(bean);
+
+ try {
+ callContext.setCurrentOperation(Operations.OP_HOME);
+
+ Method runMethod = deploymentInfo.getMatchingBeanMethod(callMethod);
+
+ returnValue = runMethod.invoke(bean, args);
+ } finally {
+ unsetEntityContext(bean);
+ }
+
+ bean = null; // poof
} catch (InvocationTargetException ite) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java Sun Dec 10 22:39:11 2006
@@ -108,7 +108,7 @@
if (EJBHome.class.isAssignableFrom(declaringClass) || EJBLocalHome.class.isAssignableFrom(declaringClass)) {
if (declaringClass != EJBHome.class && declaringClass != EJBLocalHome.class) {
- if (methodName.equals("create")) {
+ if (methodName.startsWith("create")) {
return createEJBObject(callMethod, args, callContext);
} else if (methodName.startsWith("find")) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java Sun Dec 10 22:39:11 2006
@@ -19,6 +19,7 @@
import java.io.ObjectStreamException;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
+import java.util.HashMap;
import javax.ejb.EJBHome;
import javax.ejb.EJBException;
@@ -26,6 +27,7 @@
import org.apache.openejb.ProxyInfo;
import org.apache.openejb.RpcContainer;
import org.apache.openejb.InterfaceType;
+import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ApplicationServer;
import org.apache.openejb.core.ThreadContext;
@@ -34,18 +36,37 @@
public abstract class EjbHomeProxyHandler extends BaseEjbProxyHandler {
protected final static org.apache.log4j.Category logger = org.apache.log4j.Category.getInstance("OpenEJB");
- static final java.util.HashMap dispatchTable;
+ private final HashMap<String,MethodType> dispatchTable;
- static {
- dispatchTable = new java.util.HashMap();
- dispatchTable.put("create", new Integer(1));
- dispatchTable.put("getEJBMetaData", new Integer(2));
- dispatchTable.put("getHomeHandle", new Integer(3));
- dispatchTable.put("remove", new Integer(4));
+ private static enum MethodType {
+ CREATE,
+ FIND,
+ HOME_HANDLE,
+ META_DATA,
+ REMOVE
}
public EjbHomeProxyHandler(RpcContainer container, Object pk, Object depID, InterfaceType interfaceType) {
super(container, pk, depID, interfaceType);
+ dispatchTable = new HashMap();
+ dispatchTable.put("create", MethodType.CREATE);
+ dispatchTable.put("getEJBMetaData", MethodType.META_DATA);
+ dispatchTable.put("getHomeHandle", MethodType.HOME_HANDLE);
+ dispatchTable.put("remove", MethodType.REMOVE);
+
+ if (interfaceType == InterfaceType.EJB_HOME) {
+ DeploymentInfo deploymentInfo = container.getDeploymentInfo(depID);
+ Class homeInterface = deploymentInfo.getHomeInterface();
+ Method[] methods = homeInterface.getMethods();
+ for (Method method : methods) {
+ if (method.getName().startsWith("create")){
+ dispatchTable.put(method.getName(), MethodType.CREATE);
+ } else if (method.getName().startsWith("find")){
+ dispatchTable.put(method.getName(), MethodType.FIND);
+ }
+ }
+ }
+
}
public void invalidateReference() {
@@ -89,31 +110,29 @@
try {
java.lang.Object retValue;
- Integer operation = (Integer) dispatchTable.get(methodName);
+ MethodType operation = dispatchTable.get(methodName);
if (operation == null) {
- if (methodName.startsWith("find")) {
- retValue = findX(method, args, proxy);
- } else {
-
- throw new UnsupportedOperationException("Unkown method: " + method);
- }
+ retValue = homeMethod(method, args, proxy);
} else {
- switch (operation.intValue()) {
+ switch (operation) {
/*-- CREATE ------------- <HomeInterface>.create(<x>) ---*/
- case 1:
+ case CREATE:
retValue = create(method, args, proxy);
break;
+ case FIND:
+ retValue = findX(method, args, proxy);
+ break;
/*-- GET EJB METADATA ------ EJBHome.getEJBMetaData() ---*/
- case 2:
+ case META_DATA:
retValue = getEJBMetaData(method, args, proxy);
break;
/*-- GET HOME HANDLE -------- EJBHome.getHomeHandle() ---*/
- case 3:
+ case HOME_HANDLE:
retValue = getHomeHandle(method, args, proxy);
break;
/*-- REMOVE ------------------------ EJBHome.remove() ---*/
- case 4: {
+ case REMOVE: {
Class type = method.getParameterTypes()[0];
/*-- HANDLE ------- EJBHome.remove(Handle handle) ---*/
@@ -126,7 +145,7 @@
break;
}
default:
- throw new RuntimeException("Inconsistent internal state: value " + operation.intValue() + " for operation " + methodName);
+ throw new RuntimeException("Inconsistent internal state: value " + operation + " for operation " + methodName);
}
}
@@ -188,6 +207,11 @@
/*-------------------------------------------------*/
/* Home interface methods */
/*-------------------------------------------------*/
+
+ protected Object homeMethod(Method method, Object[] args, Object proxy) throws Throwable {
+ checkAuthorization(method);
+ return container.invoke(deploymentID, method, args, null, getThreadSpecificSecurityIdentity());
+ }
protected Object create(Method method, Object[] args, Object proxy) throws Throwable {
ProxyInfo proxyInfo = (ProxyInfo) container.invoke(deploymentID, method, args, null, getThreadSpecificSecurityIdentity());
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java Sun Dec 10 22:39:11 2006
@@ -102,7 +102,7 @@
Class declaringClass = callMethod.getDeclaringClass();
if (EJBHome.class.isAssignableFrom(declaringClass) || EJBLocalHome.class.isAssignableFrom(declaringClass)) {
- if (callMethod.getName().equals("create")) {
+ if (callMethod.getName().startsWith("create")) {
return createEJBObject(deployInfo, callMethod);
} else
return null;// EJBHome.remove( ) and other EJBHome methods are not process by the container
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/config/rules/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/config/rules/Messages.properties?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/config/rules/Messages.properties (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/alt/config/rules/Messages.properties Sun Dec 10 22:39:11 2006
@@ -55,30 +55,33 @@
3.no.home.create The home interface {0} must declare at least one create method. Example:\n\n\tpublic {1} create() throws javax.ejb.CreateException, java.rmi.RemoteException;
# 1 - EJB Class name
-# 2 - create params
+# 2 - create name
+# 3 - create params
1.session.no.ejb.create Create method not implemented.
-2.session.no.ejb.create Create method not implemented: ejbCreate({1}).
-3.session.no.ejb.create There should be a create method in the bean class {0} with the following signature:\n\n\tpublic void ejbCreate({1}) throws javax.ejb.CreateException
+2.session.no.ejb.create Create method not implemented: {1}({2}).
+3.session.no.ejb.create There should be a create method in the bean class {0} with the following signature:\n\n\tpublic void {1}({2}) throws javax.ejb.CreateException
# 1 - EJB Class name
-# 2 - primary key class
-# 3 - create params
+# 2 - create name
+# 3 - primary key class
+# 4 - create params
1.entity.no.ejb.create Create method not implemented.
-2.entity.no.ejb.create Create method not implemented: ejbCreate({2}).
-3.entity.no.ejb.create There should be a create method in the bean class {0} with the following signature:\n\n\tpublic {1} ejbCreate({2}) throws javax.ejb.CreateException
+2.entity.no.ejb.create Create method not implemented: {2}({3}).
+3.entity.no.ejb.create There should be a create method in the bean class {0} with the following signature:\n\n\tpublic {1} {2}({3}) throws javax.ejb.CreateException
# 1 - EJB Class name
-# 2 - create params
+# 2 - create name
+# 3 - create params
1.no.ejb.post.create No ejbPostCreate method
-2.no.ejb.post.create Missing create method: ejbPostCreate({1})
-3.no.ejb.post.create Entity create method with no matching ejbPostCreate. There should be an ejbPostCreate method in the bean class {0} with the following signature:\n\n\tpublic void ejbPostCreate({1}) throws javax.ejb.CreateException
+2.no.ejb.post.create Missing create method: {1}({2})
+3.no.ejb.post.create Entity create method with no matching ejbPostCreate. There should be an ejbPostCreate method in the bean class {0} with the following signature:\n\n\tpublic void {1}({2}) throws javax.ejb.CreateException
# 1 - bean class
# 2 - create params
# 3 - home interface
1.unused.ejb.create Unused ejbCreate method
-2.unused.ejb.create Unused ejbCreate method: ejbCreate({1})
-3.unused.ejb.create Create method will never be called. The bean class {0} defines the create method ejbCreate({1}), but there is no matching create({1}) method in the home interface {2}
+2.unused.ejb.create Unused ejbCreate method: {2}({3})
+3.unused.ejb.create Create method will never be called. The bean class {0} defines the create method {1}({3}), but there is no matching {2}({3}) method in the home interface {2}
# 0 - Class name
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java Sun Dec 10 22:39:11 2006
@@ -103,14 +103,14 @@
* @return Integer
* @exception javax.ejb.CreateException
*/
- public Integer ejbCreate(String name)
+ public Integer ejbCreateObject(String name)
throws javax.ejb.CreateException{
testAllowedOperations("ejbCreate");
return new Integer(-1);
}
- public void ejbPostCreate(String name)
+ public void ejbPostCreateObject(String name)
throws javax.ejb.CreateException{
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java Sun Dec 10 22:39:11 2006
@@ -169,9 +169,9 @@
* @param name
* @return
* @exception javax.ejb.CreateException
- * @see BasicBmpHome#create
+ * @see BasicBmpHome#createObject
*/
- public Integer ejbCreate(String name)
+ public Integer ejbCreateObject(String name)
throws javax.ejb.CreateException{
try {
StringTokenizer st = new StringTokenizer(name, " ");
@@ -221,7 +221,7 @@
}
}
- public void ejbPostCreate(String name)
+ public void ejbPostCreateObject(String name)
throws javax.ejb.CreateException{
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpHome.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpHome.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpHome.java Sun Dec 10 22:39:11 2006
@@ -26,7 +26,7 @@
*/
public interface BasicBmpHome extends javax.ejb.EJBHome {
- public BasicBmpObject create(String name)
+ public BasicBmpObject createObject(String name)
throws javax.ejb.CreateException, java.rmi.RemoteException;
public BasicBmpObject findByPrimaryKey(Integer primarykey)
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java Sun Dec 10 22:39:11 2006
@@ -102,7 +102,7 @@
BasicBmpHome home = (BasicBmpHome) ejbContext.lookup("entity/bmp/beanReferences/bmp_entity");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicBmpObject object = home.create("Enc Bean");
+ BasicBmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -118,7 +118,7 @@
BasicStatefulHome home = (BasicStatefulHome) ejbContext.lookup("entity/bmp/beanReferences/stateful");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -134,7 +134,7 @@
BasicStatelessHome home = (BasicStatelessHome) ejbContext.lookup("entity/bmp/beanReferences/stateless");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java Sun Dec 10 22:39:11 2006
@@ -17,13 +17,11 @@
package org.apache.openejb.test.entity.bmp;
import java.rmi.RemoteException;
-import java.util.Properties;
import javax.ejb.EJBException;
import javax.ejb.EntityContext;
import javax.ejb.RemoveException;
import javax.naming.InitialContext;
-import javax.naming.Context;
import javax.sql.DataSource;
import junit.framework.Assert;
@@ -114,7 +112,7 @@
BasicBmpHome home = (BasicBmpHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/bmp_entity"), BasicBmpHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicBmpObject object = home.create("Enc Bean");
+ BasicBmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -133,7 +131,7 @@
BasicStatefulHome home = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/stateful"), BasicStatefulHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -152,7 +150,7 @@
BasicStatelessHome home = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/stateless"), BasicStatelessHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java Sun Dec 10 22:39:11 2006
@@ -64,7 +64,7 @@
/**
* Maps to BasicCmpHome.create
*/
- public Integer ejbCreate(String name) throws CreateException {
+ public Integer ejbCreateObject(String name) throws CreateException {
testAllowedOperations("ejbCreate");
StringTokenizer st = new StringTokenizer(name, " ");
setFirstName(st.nextToken());
@@ -72,7 +72,7 @@
return null;
}
- public void ejbPostCreate(String name) {
+ public void ejbPostCreateObject(String name) {
testAllowedOperations("ejbPostCreate");
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java Sun Dec 10 22:39:11 2006
@@ -65,9 +65,9 @@
* @param name
* @return
* @exception javax.ejb.CreateException
- * @see BasicCmpHome#create
+ * @see BasicCmpHome#createObject
*/
- public Integer ejbCreate(String name)
+ public Integer ejbCreateObject(String name)
throws javax.ejb.CreateException{
testAllowedOperations("ejbCreate");
StringTokenizer st = new StringTokenizer(name, " ");
@@ -76,7 +76,7 @@
return new Integer(primaryKey);
}
- public void ejbPostCreate(String name)
+ public void ejbPostCreateObject(String name)
throws javax.ejb.CreateException{
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java Sun Dec 10 22:39:11 2006
@@ -60,14 +60,14 @@
/**
* Maps to BasicCmpHome.create(String name)
*/
- public Integer ejbCreate(String name) throws CreateException {
+ public Integer ejbCreateObject(String name) throws CreateException {
StringTokenizer st = new StringTokenizer(name, " ");
setFirstName(st.nextToken());
setLastName(st.nextToken());
return null;
}
- public void ejbPostCreate(String name) {
+ public void ejbPostCreateObject(String name) {
}
/**
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java Sun Dec 10 22:39:11 2006
@@ -66,9 +66,9 @@
* @param name
* @return
* @exception javax.ejb.CreateException
- * @see BasicCmpHome#create
+ * @see BasicCmpHome#createObject
*/
- public Integer ejbCreate(String name)
+ public Integer ejbCreateObject(String name)
throws javax.ejb.CreateException{
StringTokenizer st = new StringTokenizer(name, " ");
firstName = st.nextToken();
@@ -76,7 +76,7 @@
return null;
}
- public void ejbPostCreate(String name)
+ public void ejbPostCreateObject(String name)
throws javax.ejb.CreateException{
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpHome.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpHome.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpHome.java Sun Dec 10 22:39:11 2006
@@ -25,7 +25,7 @@
public interface BasicCmpHome extends javax.ejb.EJBHome {
- public BasicCmpObject create(String name)
+ public BasicCmpObject createObject(String name)
throws javax.ejb.CreateException, java.rmi.RemoteException;
public BasicCmpObject findByPrimaryKey(Integer primarykey)
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java Sun Dec 10 22:39:11 2006
@@ -78,7 +78,7 @@
BasicCmpHome home = (BasicCmpHome) ejbContext.lookup("entity/cmp/beanReferences/cmp_entity");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicCmpObject object = home.create("Enc Bean");
+ BasicCmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -94,7 +94,7 @@
BasicStatefulHome home = (BasicStatefulHome) ejbContext.lookup("entity/cmp/beanReferences/stateful");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -110,7 +110,7 @@
BasicStatelessHome home = (BasicStatelessHome) ejbContext.lookup("entity/cmp/beanReferences/stateless");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java Sun Dec 10 22:39:11 2006
@@ -82,7 +82,7 @@
BasicCmpHome home = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow(ctx.lookup("java:comp/env/entity/cmp/beanReferences/cmp_entity"), BasicCmpHome.class);
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicCmpObject object = home.create("Enc Bean");
+ BasicCmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -101,7 +101,7 @@
BasicStatefulHome home = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateful"), BasicStatefulHome.class);
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -120,7 +120,7 @@
BasicStatelessHome home = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateless"), BasicStatelessHome.class);
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java Sun Dec 10 22:39:11 2006
@@ -89,7 +89,7 @@
BasicCmpHome home = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/cmp_entity"), BasicCmpHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicCmpObject object = home.create("Enc Bean");
+ BasicCmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -108,7 +108,7 @@
BasicStatefulHome home = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateful"), BasicStatefulHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -127,7 +127,7 @@
BasicStatelessHome home = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateless"), BasicStatelessHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java Sun Dec 10 22:39:11 2006
@@ -47,9 +47,9 @@
*
* @param name
* @exception javax.ejb.CreateException
- * @see BasicStatefulHome#create
+ * @see BasicStatefulHome#createObject
*/
- public void ejbCreate(String name)
+ public void ejbCreateObject(String name)
throws javax.ejb.CreateException{
testAllowedOperations("ejbCreate");
this.name = name;
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java Sun Dec 10 22:39:11 2006
@@ -48,9 +48,9 @@
*
* @param name
* @exception javax.ejb.CreateException
- * @see BasicStatefulHome#create
+ * @see BasicStatefulHome#createObject
*/
- public void ejbCreate(String name)
+ public void ejbCreateObject(String name)
throws javax.ejb.CreateException{
testAllowedOperations("ejbCreate");
this.name = name;
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulHome.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulHome.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulHome.java Sun Dec 10 22:39:11 2006
@@ -24,6 +24,6 @@
*/
public interface BasicStatefulHome extends javax.ejb.EJBHome {
- public BasicStatefulObject create(String name)
+ public BasicStatefulObject createObject(String name)
throws javax.ejb.CreateException, java.rmi.RemoteException;
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java Sun Dec 10 22:39:11 2006
@@ -55,7 +55,7 @@
*
* @param name
* @exception javax.ejb.CreateException
- * @see BasicStatefulHome#create
+ * @see BasicStatefulHome#createObject
*/
public void ejbCreate(String name)
throws javax.ejb.CreateException{
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java Sun Dec 10 22:39:11 2006
@@ -69,7 +69,7 @@
BasicBmpHome home = (BasicBmpHome) ejbContext.lookup("stateful/beanReferences/bmp_entity");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicBmpObject object = home.create("Enc Bean");
+ BasicBmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -85,7 +85,7 @@
BasicStatefulHome home = (BasicStatefulHome) ejbContext.lookup("stateful/beanReferences/stateful");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -101,7 +101,7 @@
BasicStatelessHome home = (BasicStatelessHome) ejbContext.lookup("stateful/beanReferences/stateless");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java Sun Dec 10 22:39:11 2006
@@ -77,7 +77,7 @@
BasicBmpHome home = (BasicBmpHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateful/beanReferences/bmp_entity"), BasicBmpHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicBmpObject object = home.create("Enc Bean");
+ BasicBmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -96,7 +96,7 @@
BasicStatefulHome home = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateful/beanReferences/stateful"), BasicStatefulHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -115,7 +115,7 @@
BasicStatelessHome home = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateful/beanReferences/stateless"), BasicStatelessHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java Sun Dec 10 22:39:11 2006
@@ -131,7 +131,7 @@
*
* @exception javax.ejb.CreateException
*/
- public void ejbCreate() throws javax.ejb.CreateException{
+ public void ejbCreateObject() throws javax.ejb.CreateException{
testAllowedOperations("ejbCreate");
this.name = "nameless automaton";
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessHome.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessHome.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessHome.java Sun Dec 10 22:39:11 2006
@@ -24,6 +24,6 @@
*/
public interface BasicStatelessHome extends javax.ejb.EJBHome {
- public BasicStatelessObject create()
+ public BasicStatelessObject createObject()
throws javax.ejb.CreateException, java.rmi.RemoteException;
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java Sun Dec 10 22:39:11 2006
@@ -55,7 +55,7 @@
BasicBmpHome home = (BasicBmpHome) ejbContext.lookup("stateless/beanReferences/bmp_entity");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicBmpObject object = home.create("Enc Bean");
+ BasicBmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -71,7 +71,7 @@
BasicStatefulHome home = (BasicStatefulHome) ejbContext.lookup("stateless/beanReferences/stateful");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -87,7 +87,7 @@
BasicStatelessHome home = (BasicStatelessHome) ejbContext.lookup("stateless/beanReferences/stateless");
Assert.assertNotNull("The EJBHome looked up is null", home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object);
} catch (Exception e) {
Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java Sun Dec 10 22:39:11 2006
@@ -63,7 +63,7 @@
BasicBmpHome home = (BasicBmpHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateless/beanReferences/bmp_entity"), BasicBmpHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicBmpObject object = home.create("Enc Bean");
+ BasicBmpObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -82,7 +82,7 @@
BasicStatefulHome home = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateless/beanReferences/stateful"), BasicStatefulHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicStatefulObject object = home.create("Enc Bean");
+ BasicStatefulObject object = home.createObject("Enc Bean");
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -101,7 +101,7 @@
BasicStatelessHome home = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateless/beanReferences/stateless"), BasicStatelessHome.class );
Assert.assertNotNull("The EJBHome looked up is null",home);
- BasicStatelessObject object = home.create();
+ BasicStatelessObject object = home.createObject();
Assert.assertNotNull("The EJBObject is null", object );
} catch (Exception e){
Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java Sun Dec 10 22:39:11 2006
@@ -145,7 +145,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/bmp/allowed_operations/EntityHome");
ejbHome = (BasicBmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicBmpHome.class);
- ejbObject = ejbHome.create("Fourth Bean");
+ ejbObject = ejbHome.createObject("Fourth Bean");
ejbHandle = ejbObject.getHandle();
/* These tests will only work if the specified
* method has already been called by the container.
@@ -187,7 +187,7 @@
ejbHome.findByPrimaryKey((Integer)ejbObject.getPrimaryKey());
ejbHome.remove((Integer)ejbObject.getPrimaryKey());
- ejbObject = ejbHome.create("Fourth Bean");
+ ejbObject = ejbHome.createObject("Fourth Bean");
ejbHome.findEmptyCollection();
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbHomeTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbHomeTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbHomeTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbHomeTests.java Sun Dec 10 22:39:11 2006
@@ -34,7 +34,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/bmp/BasicBmpHome");
ejbHome = (BasicBmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicBmpHome.class);
- ejbObject = ejbHome.create("Second Bean");
+ ejbObject = ejbHome.createObject("Second Bean");
ejbPrimaryKey = ejbObject.getPrimaryKey();
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbObjectTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbObjectTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbObjectTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpEjbObjectTests.java Sun Dec 10 22:39:11 2006
@@ -34,7 +34,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/bmp/BasicBmpHome");
ejbHome = (BasicBmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicBmpHome.class);
- ejbObject = ejbHome.create("Third Bean");
+ ejbObject = ejbHome.createObject("Third Bean");
}
protected void tearDown() throws Exception {
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHandleTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHandleTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHandleTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHandleTests.java Sun Dec 10 22:39:11 2006
@@ -34,7 +34,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/bmp/BasicBmpHome");
ejbHome = (BasicBmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicBmpHome.class);
- ejbObject = ejbHome.create("Fifth Bean");
+ ejbObject = ejbHome.createObject("Fifth Bean");
ejbHandle = ejbObject.getHandle();
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHomeIntfcTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHomeIntfcTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHomeIntfcTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpHomeIntfcTests.java Sun Dec 10 22:39:11 2006
@@ -39,7 +39,7 @@
//
public void test01_create() {
try {
- ejbObject = ejbHome.create("First Bean");
+ ejbObject = ejbHome.createObject("First Bean");
assertNotNull("The EJBObject is null", ejbObject);
} catch (Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -59,13 +59,13 @@
public void test03_findByLastName() {
Integer[] keys = new Integer[3];
try {
- ejbObject = ejbHome.create("David Blevins");
+ ejbObject = ejbHome.createObject("David Blevins");
keys[0] = (Integer) ejbObject.getPrimaryKey();
- ejbObject = ejbHome.create("Dennis Blevins");
+ ejbObject = ejbHome.createObject("Dennis Blevins");
keys[1] = (Integer) ejbObject.getPrimaryKey();
- ejbObject = ejbHome.create("Claude Blevins");
+ ejbObject = ejbHome.createObject("Claude Blevins");
keys[2] = (Integer) ejbObject.getPrimaryKey();
} catch (Exception e) {
fail("Received exception while preparing the test: " + e.getClass() + " : " + e.getMessage());
@@ -91,6 +91,16 @@
java.util.Enumeration emptyEnumeration = ejbHome.findEmptyEnumeration();
assertNotNull("The enumeration is null", emptyEnumeration);
assertFalse("The enumeration is not empty", emptyEnumeration.hasMoreElements());
+ } catch (Exception e) {
+ fail("Received Exception " + e.getClass() + " : " + e.getMessage());
+ }
+ }
+
+ public void test05_homeMethod() {
+ try {
+ int expected = 8;
+ int actual = ejbHome.sum(5, 3);
+ assertEquals("home method returned wrong result", expected, actual);
} catch (Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRemoteIntfcTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRemoteIntfcTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRemoteIntfcTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRemoteIntfcTests.java Sun Dec 10 22:39:11 2006
@@ -33,7 +33,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/bmp/BasicBmpHome");
ejbHome = (BasicBmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicBmpHome.class);
- ejbObject = ejbHome.create("Forth Bean");
+ ejbObject = ejbHome.createObject("Forth Bean");
}
//=================================
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java Sun Dec 10 22:39:11 2006
@@ -145,7 +145,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/cmp/allowed_operations/EntityHome");
ejbHome = (BasicCmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicCmpHome.class);
- ejbObject = ejbHome.create("Fourth Bean");
+ ejbObject = ejbHome.createObject("Fourth Bean");
ejbHandle = ejbObject.getHandle();
/* These tests will only work if the specified
* method has already been called by the container.
@@ -187,7 +187,7 @@
ejbHome.findByPrimaryKey((Integer)ejbObject.getPrimaryKey());
ejbHome.remove((Integer)ejbObject.getPrimaryKey());
- ejbObject = ejbHome.create("Fourth Bean");
+ ejbObject = ejbHome.createObject("Fourth Bean");
ejbHome.findEmptyCollection();
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbHomeTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbHomeTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbHomeTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbHomeTests.java Sun Dec 10 22:39:11 2006
@@ -34,7 +34,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/cmp/BasicCmpHome");
ejbHome = (BasicCmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicCmpHome.class);
- ejbObject = ejbHome.create("Second Bean");
+ ejbObject = ejbHome.createObject("Second Bean");
ejbPrimaryKey = ejbObject.getPrimaryKey();
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbObjectTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbObjectTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbObjectTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpEjbObjectTests.java Sun Dec 10 22:39:11 2006
@@ -34,7 +34,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/cmp/BasicCmpHome");
ejbHome = (BasicCmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicCmpHome.class);
- ejbObject = ejbHome.create("Third Bean");
+ ejbObject = ejbHome.createObject("Third Bean");
}
protected void tearDown() throws Exception {
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHandleTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHandleTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHandleTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHandleTests.java Sun Dec 10 22:39:11 2006
@@ -34,7 +34,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/cmp/BasicCmpHome");
ejbHome = (BasicCmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicCmpHome.class);
- ejbObject = ejbHome.create("Fifth Bean");
+ ejbObject = ejbHome.createObject("Fifth Bean");
ejbHandle = ejbObject.getHandle();
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java Sun Dec 10 22:39:11 2006
@@ -40,7 +40,7 @@
//
public void test01_create(){
try{
- ejbObject = ejbHome.create("First Bean");
+ ejbObject = ejbHome.createObject("First Bean");
assertNotNull("The EJBObject is null", ejbObject);
} catch (Exception e){
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
@@ -61,13 +61,13 @@
public void test03_findByLastName(){
Integer[] keys = new Integer[3];
try{
- ejbObject = ejbHome.create("David Blevins");
+ ejbObject = ejbHome.createObject("David Blevins");
keys[0] = (Integer)ejbObject.getPrimaryKey();
- ejbObject = ejbHome.create("Dennis Blevins");
+ ejbObject = ejbHome.createObject("Dennis Blevins");
keys[1] = (Integer)ejbObject.getPrimaryKey();
- ejbObject = ejbHome.create("Claude Blevins");
+ ejbObject = ejbHome.createObject("Claude Blevins");
keys[2] = (Integer)ejbObject.getPrimaryKey();
} catch (Exception e){
fail("Received exception while preparing the test: "+e.getClass()+ " : "+e.getMessage());
@@ -85,6 +85,16 @@
}
} catch (Exception e){
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ }
+
+ public void test04_homeMethod() {
+ try {
+ int expected = 8;
+ int actual = ejbHome.sum(5, 3);
+ assertEquals("home method returned wrong result", expected, actual);
+ } catch (Exception e) {
+ fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
//
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRemoteIntfcTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRemoteIntfcTests.java?view=diff&rev=485528&r1=485527&r2=485528
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRemoteIntfcTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRemoteIntfcTests.java Sun Dec 10 22:39:11 2006
@@ -33,7 +33,7 @@
super.setUp();
Object obj = initialContext.lookup("client/tests/entity/cmp/BasicCmpHome");
ejbHome = (BasicCmpHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicCmpHome.class);
- ejbObject = ejbHome.create("Forth Bean");
+ ejbObject = ejbHome.createObject("Forth Bean");
}
//=================================