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 2007/03/10 07:45:07 UTC
svn commit: r516659 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core:
stateful/StatefulContainer.java stateful/StatefulInstanceManager.java
stateless/StatelessInstanceManager.java
Author: dblevins
Date: Fri Mar 9 22:45:06 2007
New Revision: 516659
URL: http://svn.apache.org/viewvc?view=rev&rev=516659
Log:
Reformatted
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?view=diff&rev=516659&r1=516658&r2=516659
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Fri Mar 9 22:45:06 2007
@@ -16,38 +16,38 @@
*/
package org.apache.openejb.core.stateful;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.ProxyInfo;
-import org.apache.openejb.ApplicationException;
import org.apache.openejb.RpcContainer;
-import org.apache.openejb.ContainerType;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.persistence.JtaEntityManagerRegistry;
-import org.apache.openejb.persistence.EntityManagerAlreadyRegisteredException;
+import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.transaction.TransactionContainer;
import org.apache.openejb.core.transaction.TransactionContext;
import org.apache.openejb.core.transaction.TransactionPolicy;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.persistence.EntityManagerAlreadyRegisteredException;
+import org.apache.openejb.persistence.JtaEntityManagerRegistry;
import org.apache.openejb.spi.SecurityService;
-import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Index;
+import org.apache.openejb.util.Logger;
-import javax.ejb.SessionBean;
import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionRequiredException;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityManager;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.rmi.RemoteException;
import java.rmi.dgc.VMID;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
/**
* @org.apache.xbean.XBean element="statefulContainer"
@@ -77,9 +77,9 @@
}
private class Data {
- private final Index<Method,MethodType> methodIndex;
+ private final Index<Method, MethodType> methodIndex;
- private Data(Index<Method,MethodType> methodIndex) {
+ private Data(Index<Method, MethodType> methodIndex) {
this.methodIndex = methodIndex;
}
@@ -92,81 +92,85 @@
Map<Method, MethodType> methods = new HashMap<Method, MethodType>();
Method preDestroy = deploymentInfo.getPreDestroy();
- if (preDestroy != null){
+ if (preDestroy != null) {
methods.put(preDestroy, MethodType.REMOVE);
Class businessLocal = deploymentInfo.getBusinessLocalInterface();
- if (businessLocal != null){
+ if (businessLocal != null) {
try {
Method method = businessLocal.getMethod(preDestroy.getName());
methods.put(method, MethodType.REMOVE);
- } catch (NoSuchMethodException thatsFine) {}
+ } catch (NoSuchMethodException thatsFine) {
+ }
}
Class businessRemote = deploymentInfo.getBusinessRemoteInterface();
- if (businessRemote != null){
+ if (businessRemote != null) {
try {
Method method = businessRemote.getMethod(preDestroy.getName());
methods.put(method, MethodType.REMOVE);
- } catch (NoSuchMethodException thatsFine) {}
+ } catch (NoSuchMethodException thatsFine) {
+ }
}
}
Class legacyRemote = deploymentInfo.getRemoteInterface();
- if (legacyRemote != null){
+ if (legacyRemote != null) {
try {
Method method = legacyRemote.getMethod("remove");
methods.put(method, MethodType.REMOVE);
- } catch (NoSuchMethodException thatsFine) {}
+ } catch (NoSuchMethodException thatsFine) {
+ }
}
Class legacyLocal = deploymentInfo.getLocalInterface();
- if (legacyLocal != null){
+ if (legacyLocal != null) {
try {
Method method = legacyLocal.getMethod("remove");
methods.put(method, MethodType.REMOVE);
- } catch (NoSuchMethodException thatsFine) {}
+ } catch (NoSuchMethodException thatsFine) {
+ }
}
Class businessLocalHomeInterface = deploymentInfo.getBusinessLocalInterface();
- if (businessLocalHomeInterface != null){
+ if (businessLocalHomeInterface != null) {
for (Method method : DeploymentInfo.BusinessLocalHome.class.getMethods()) {
- if (method.getName().startsWith("create")){
+ if (method.getName().startsWith("create")) {
methods.put(method, MethodType.CREATE);
- } else if (method.getName().equals("remove")){
+ } else if (method.getName().equals("remove")) {
methods.put(method, MethodType.REMOVE);
}
}
}
Class businessRemoteHomeInterface = deploymentInfo.getBusinessRemoteInterface();
- if (businessRemoteHomeInterface != null){
+ if (businessRemoteHomeInterface != null) {
for (Method method : DeploymentInfo.BusinessRemoteHome.class.getMethods()) {
- if (method.getName().startsWith("create")){
+ if (method.getName().startsWith("create")) {
methods.put(method, MethodType.CREATE);
- } else if (method.getName().equals("remove")){
+ } else if (method.getName().equals("remove")) {
methods.put(method, MethodType.REMOVE);
}
}
}
Class homeInterface = deploymentInfo.getHomeInterface();
- if (homeInterface != null){
+ if (homeInterface != null) {
for (Method method : homeInterface.getMethods()) {
- if (method.getName().startsWith("create")){
+ if (method.getName().startsWith("create")) {
methods.put(method, MethodType.CREATE);
- } else if (method.getName().equals("remove")){
+ } else if (method.getName().equals("remove")) {
methods.put(method, MethodType.REMOVE);
}
}
}
Class localHomeInterface = deploymentInfo.getLocalHomeInterface();
- if (localHomeInterface != null){
+ if (localHomeInterface != null) {
for (Method method : localHomeInterface.getMethods()) {
- if (method.getName().startsWith("create")){
+ if (method.getName().startsWith("create")) {
methods.put(method, MethodType.CREATE);
- } else if (method.getName().equals("remove")){
+ } else if (method.getName().equals("remove")) {
methods.put(method, MethodType.REMOVE);
}
}
@@ -199,11 +203,11 @@
}
public void deploy(DeploymentInfo deploymentInfo) throws OpenEJBException {
- deploy((CoreDeploymentInfo)deploymentInfo);
+ deploy((CoreDeploymentInfo) deploymentInfo);
}
public void undeploy(DeploymentInfo info) throws OpenEJBException {
- undeploy((CoreDeploymentInfo)info);
+ undeploy((CoreDeploymentInfo) info);
}
private synchronized void undeploy(CoreDeploymentInfo deploymentInfo) {
@@ -211,10 +215,10 @@
deploymentInfo.setContainer(null);
deploymentInfo.setContainerData(null);
}
-
+
private synchronized void deploy(CoreDeploymentInfo deploymentInfo) {
Map<Method, MethodType> methods = getLifecycelMethodsOfInterface(deploymentInfo);
- deploymentInfo.setContainerData(new Data(new Index<Method,MethodType>(methods)));
+ deploymentInfo.setContainerData(new Data(new Index<Method, MethodType>(methods)));
deploymentsById.put(deploymentInfo.getDeploymentID(), deploymentInfo);
deploymentInfo.setContainer(this);
@@ -222,7 +226,8 @@
public Object invoke(Object deployID, Method callMethod, Object [] args, Object primKey, Object securityIdentity) throws OpenEJBException {
CoreDeploymentInfo deployInfo = (CoreDeploymentInfo) this.getDeploymentInfo(deployID);
- if (deployInfo == null) throw new OpenEJBException("Deployment does not exist in this container. Deployment(id='"+deployID+"'), Container(id='"+containerID+"')");
+ if (deployInfo == null)
+ throw new OpenEJBException("Deployment does not exist in this container. Deployment(id='" + deployID + "'), Container(id='" + containerID + "')");
Data data = (Data) deployInfo.getContainerData();
MethodType methodType = data.getMethodIndex().get(callMethod);
@@ -265,7 +270,7 @@
_invoke(callMethod, runMethod, args, bean, createContext);
} else {
Method postConstruct = deploymentInfo.getPostConstruct();
- if (postConstruct != null){
+ if (postConstruct != null) {
_invoke(callMethod, postConstruct, args, bean, createContext);
}
}
@@ -390,7 +395,7 @@
private Index<EntityManagerFactory, EntityManager> createEntityManagers(CoreDeploymentInfo deploymentInfo) {
// create the extended entity managers
Index<EntityManagerFactory, Map> factories = deploymentInfo.getExtendedEntityManagerFactories();
- Index<EntityManagerFactory,EntityManager> entityManagers = null;
+ Index<EntityManagerFactory, EntityManager> entityManagers = null;
if (factories != null && factories.size() > 0) {
entityManagers = new Index<EntityManagerFactory, EntityManager>(new ArrayList<EntityManagerFactory>(factories.keySet()));
for (Map.Entry<EntityManagerFactory, Map> entry : factories.entrySet()) {
@@ -428,7 +433,7 @@
// register them
try {
- entityManagerRegistry.addEntityManagers((String)deploymentInfo.getDeploymentID(), primaryKey, entityManagers);
+ entityManagerRegistry.addEntityManagers((String) deploymentInfo.getDeploymentID(), primaryKey, entityManagers);
} catch (EntityManagerAlreadyRegisteredException e) {
throw new EJBException(e);
}
@@ -443,7 +448,7 @@
Object primaryKey = callContext.getPrimaryKey();
// register them
- entityManagerRegistry.removeEntityManagers((String)deploymentInfo.getDeploymentID(), primaryKey);
+ entityManagerRegistry.removeEntityManagers((String) deploymentInfo.getDeploymentID(), primaryKey);
}
public void discardInstance(Object bean, ThreadContext threadContext) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java?view=diff&rev=516659&r1=516658&r2=516659
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java Fri Mar 9 22:45:06 2007
@@ -16,41 +16,41 @@
*/
package org.apache.openejb.core.stateful;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.NoSuchObjectException;
-import java.rmi.RemoteException;
-import java.util.Hashtable;
-import java.util.LinkedList;
-import java.util.Map;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityManager;
-
import org.apache.openejb.ApplicationException;
import org.apache.openejb.Injection;
import org.apache.openejb.InvalidateReferenceException;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.SystemException;
-import org.apache.openejb.persistence.JtaEntityManagerRegistry;
import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.CoreUserTransaction;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.core.CoreUserTransaction;
-import org.apache.openejb.core.transaction.TransactionRolledbackException;
import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
+import org.apache.openejb.core.transaction.TransactionRolledbackException;
+import org.apache.openejb.persistence.JtaEntityManagerRegistry;
import org.apache.openejb.spi.SecurityService;
-import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Index;
+import org.apache.openejb.util.Logger;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
import org.apache.xbean.recipe.StaticRecipe;
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.rmi.NoSuchObjectException;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.Map;
+
public class StatefulInstanceManager {
public static final Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
@@ -125,12 +125,12 @@
Context ctx = deploymentInfo.getJndiEnc();
SessionContext sessionContext = null;
try {
- sessionContext = (SessionContext)ctx.lookup("java:comp/EJBContext");
+ sessionContext = (SessionContext) ctx.lookup("java:comp/EJBContext");
} catch (NamingException e1) {
sessionContext = createSessionContext();
ctx.bind("java:comp/EJBContext", sessionContext);
}
- if(javax.ejb.SessionBean.class.isAssignableFrom(beanClass) || hasSetSessionContext(beanClass)) {
+ if (javax.ejb.SessionBean.class.isAssignableFrom(beanClass) || hasSetSessionContext(beanClass)) {
callContext.setCurrentOperation(Operation.INJECTION);
objectRecipe.setProperty("sessionContext", new StaticRecipe(sessionContext));
}
@@ -152,9 +152,9 @@
}
bean = objectRecipe.create(beanClass.getClassLoader());
Map unsetProperties = objectRecipe.getUnsetProperties();
- if (unsetProperties.size() > 0){
+ if (unsetProperties.size() > 0) {
for (Object property : unsetProperties.keySet()) {
- logger.warning("Injection: No such property '"+property+"' in class "+beanClass.getName());
+ logger.warning("Injection: No such property '" + property + "' in class " + beanClass.getName());
}
}
} catch (Throwable callbackException) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?view=diff&rev=516659&r1=516658&r2=516659
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java Fri Mar 9 22:45:06 2007
@@ -16,13 +16,9 @@
*/
package org.apache.openejb.core.stateless;
-import org.apache.xbean.recipe.ObjectRecipe;
-import org.apache.xbean.recipe.StaticRecipe;
-import org.apache.xbean.recipe.Option;
-import org.apache.xbean.recipe.ConstructionException;
+import org.apache.openejb.Injection;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.SystemException;
-import org.apache.openejb.Injection;
import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
@@ -30,22 +26,24 @@
import org.apache.openejb.core.interceptor.InterceptorStack;
import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.util.LinkedListStack;
+import org.apache.openejb.util.Logger;
import org.apache.openejb.util.SafeToolkit;
import org.apache.openejb.util.Stack;
-import org.apache.openejb.util.Logger;
+import org.apache.xbean.recipe.ConstructionException;
+import org.apache.xbean.recipe.ObjectRecipe;
+import org.apache.xbean.recipe.Option;
+import org.apache.xbean.recipe.StaticRecipe;
-import javax.ejb.SessionContext;
import javax.ejb.SessionBean;
-import javax.transaction.TransactionManager;
+import javax.ejb.SessionContext;
import javax.naming.Context;
import javax.naming.NamingException;
+import javax.transaction.TransactionManager;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
import java.util.HashMap;
-import java.util.Map;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Map;
public class StatelessInstanceManager {
private static final Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
@@ -67,7 +65,7 @@
this.poolLimit = poolSize;
this.strictPooling = strictPooling;
- if (strictPooling && poolSize < 1){
+ if (strictPooling && poolSize < 1) {
throw new IllegalArgumentException("Cannot use strict pooling with a pool size less than one. Strict pooling blocks threads till an instance in the pool is available. Please increase the pool size or set strict pooling to false");
}
@@ -108,13 +106,13 @@
Context ctx = deploymentInfo.getJndiEnc();
SessionContext sessionContext = null;
try {
- sessionContext = (SessionContext)ctx.lookup("java:comp/EJBContext");
+ sessionContext = (SessionContext) ctx.lookup("java:comp/EJBContext");
} catch (NamingException e1) {
sessionContext = createSessionContext();
// TODO: This should work
ctx.bind("java:comp/EJBContext", sessionContext);
}
- if(javax.ejb.SessionBean.class.isAssignableFrom(beanClass) || hasSetSessionContext(beanClass)) {
+ if (javax.ejb.SessionBean.class.isAssignableFrom(beanClass) || hasSetSessionContext(beanClass)) {
callContext.setCurrentOperation(Operation.INJECTION);
objectRecipe.setProperty("sessionContext", new StaticRecipe(sessionContext));
}
@@ -131,15 +129,15 @@
objectRecipe.setProperty(injection.getName(), new StaticRecipe(object));
}
} catch (NamingException e) {
- logger.warning("Injection data not found in enc: jndiName='"+injection.getJndiName()+"', target="+injection.getTarget()+"/"+injection.getName());
+ logger.warning("Injection data not found in enc: jndiName='" + injection.getJndiName() + "', target=" + injection.getTarget() + "/" + injection.getName());
}
}
bean = objectRecipe.create(beanClass.getClassLoader());
Map unsetProperties = objectRecipe.getUnsetProperties();
- if (unsetProperties.size() > 0){
+ if (unsetProperties.size() > 0) {
for (Object property : unsetProperties.keySet()) {
- logger.warning("Injection: No such property '"+property+"' in class "+beanClass.getName());
+ logger.warning("Injection: No such property '" + property + "' in class " + beanClass.getName());
}
}
@@ -153,7 +151,7 @@
Object interceptorInstance = interceptorRecipe.create(clazz.getClassLoader());
interceptorInstances.put(clazz.getName(), interceptorInstance);
} catch (ConstructionException e) {
- throw new Exception("Failed to create interceptor: "+clazz.getName(), e);
+ throw new Exception("Failed to create interceptor: " + clazz.getName(), e);
}
}
@@ -163,9 +161,9 @@
Method postConstruct = deploymentInfo.getPostConstruct();
- if (postConstruct != null){
+ if (postConstruct != null) {
List<InterceptorData> interceptors = deploymentInfo.getMethodInterceptors(postConstruct);
- if (!SessionBean.class.isAssignableFrom(beanClass)){
+ if (!SessionBean.class.isAssignableFrom(beanClass)) {
postConstruct = null;
}
InterceptorStack interceptorStack = new InterceptorStack(bean, postConstruct, Operation.CREATE, interceptors, interceptorInstances);
@@ -178,7 +176,7 @@
}
String t = "The bean instance " + bean + " threw a system exception:" + e;
logger.error(t, e);
- throw new org.apache.openejb.ApplicationException(new RemoteException("Can not obtain a free instance.",e));
+ throw new org.apache.openejb.ApplicationException(new RemoteException("Can not obtain a free instance.", e));
} finally {
callContext.setCurrentOperation(originalOperation);
}
@@ -212,7 +210,7 @@
pool.push(bean);
poolQueue.notifyWaitingThreads();
} else {
- if (pool.size() >= poolLimit){
+ if (pool.size() >= poolLimit) {
freeInstance(callContext, bean);
} else {
pool.push(bean);
@@ -225,12 +223,12 @@
callContext.setCurrentOperation(Operation.REMOVE);
CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
Method preDestroy = deploymentInfo.getPreDestroy();
- if (preDestroy != null){
+ if (preDestroy != null) {
List<InterceptorData> interceptors = deploymentInfo.getMethodInterceptors(preDestroy);
- if (!SessionBean.class.isAssignableFrom(deploymentInfo.getBeanClass())){
+ if (!SessionBean.class.isAssignableFrom(deploymentInfo.getBeanClass())) {
preDestroy = null;
}
- InterceptorStack interceptorStack = new InterceptorStack(((Instance)bean).bean, preDestroy, Operation.REMOVE, interceptors, ((Instance)bean).interceptors);
+ InterceptorStack interceptorStack = new InterceptorStack(((Instance) bean).bean, preDestroy, Operation.REMOVE, interceptors, ((Instance) bean).interceptors);
interceptorStack.invoke();
preDestroy.invoke(bean);
}