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/09/28 01:58:47 UTC
svn commit: r450640 [8/17] - in /incubator/openejb/trunk/openejb3: ./
assembly/ assembly/openejb-itests-webapp/
assembly/openejb-itests-webapp/src/main/assembly/
assembly/openejb-itests-webapp/src/main/webapp/META-INF/
assembly/openejb-itests-webapp/sr...
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java Wed Sep 27 16:58:13 2006
@@ -1,13 +1,13 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.ApplicationException;
-import org.openejb.InvalidateReferenceException;
-import org.openejb.core.transaction.TransactionContext;
-import org.openejb.core.transaction.TransactionPolicy;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.core.transaction.TransactionContext;
+import org.apache.openejb.core.transaction.TransactionPolicy;
import javax.ejb.SessionSynchronization;
-public class SessionSynchronizationTxPolicy extends org.openejb.core.transaction.TransactionPolicy {
+public class SessionSynchronizationTxPolicy extends org.apache.openejb.core.transaction.TransactionPolicy {
protected TransactionPolicy policy;
@@ -15,8 +15,8 @@
this.policy = policy;
this.container = policy.getContainer();
this.policyType = policy.policyType;
- if (container instanceof org.openejb.Container &&
- ((org.openejb.Container) container).getContainerType() != org.openejb.Container.STATEFUL ||
+ if (container instanceof org.apache.openejb.Container &&
+ ((org.apache.openejb.Container) container).getContainerType() != org.apache.openejb.Container.STATEFUL ||
policyType == TransactionPolicy.Never ||
policyType == TransactionPolicy.NotSupported) {
throw new IllegalArgumentException();
@@ -24,7 +24,7 @@
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
policy.beforeInvoke(instance, context);
if (context.currentTx == null) return;
@@ -44,7 +44,7 @@
}
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
policy.afterInvoke(instance, context);
}
@@ -52,7 +52,7 @@
policy.handleApplicationException(appException, context);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
try {
policy.handleSystemException(sysException, instance, context);
} catch (ApplicationException e) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java Wed Sep 27 16:58:13 2006
@@ -1,8 +1,8 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.SystemException;
-import org.openejb.core.EnvProps;
-import org.openejb.loader.SystemInstance;
+import org.apache.openejb.SystemException;
+import org.apache.openejb.core.EnvProps;
+import org.apache.openejb.loader.SystemInstance;
import java.io.File;
import java.io.FileInputStream;
@@ -21,7 +21,7 @@
init(null);
}
- public void init(Properties props) throws org.openejb.SystemException {
+ public void init(Properties props) throws org.apache.openejb.SystemException {
if (props == null) {
props = new Properties();
}
@@ -37,12 +37,12 @@
}
logger.info("Using directory " + sessionDirectory + " for stateful session passivation");
} catch (java.io.IOException e) {
- throw new org.openejb.SystemException(getClass().getName() + ".init(): can't use directory prefix " + dir + ":" + e);
+ throw new org.apache.openejb.SystemException(getClass().getName() + ".init(): can't use directory prefix " + dir + ":" + e);
}
}
public void passivate(Object primaryKey, Object state)
- throws org.openejb.SystemException {
+ throws org.apache.openejb.SystemException {
try {
String filename = primaryKey.toString().replace(':', '=');
@@ -63,12 +63,12 @@
catch (Exception t) {
logger.info("Passivation failed ", t);
- throw new org.openejb.SystemException(t);
+ throw new org.apache.openejb.SystemException(t);
}
}
- public void passivate(Hashtable hash) throws org.openejb.SystemException {
+ public void passivate(Hashtable hash) throws org.apache.openejb.SystemException {
Enumeration enumeration = hash.keys();
while (enumeration.hasMoreElements()) {
Object id = enumeration.nextElement();
@@ -76,7 +76,7 @@
}
}
- public Object activate(Object primaryKey) throws org.openejb.SystemException {
+ public Object activate(Object primaryKey) throws org.apache.openejb.SystemException {
try {
@@ -100,7 +100,7 @@
} catch (Exception t) {
logger.info("Activation failed ", t);
- throw new org.openejb.SystemException(t);
+ throw new org.apache.openejb.SystemException(t);
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java Wed Sep 27 16:58:13 2006
@@ -1,10 +1,10 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.ApplicationException;
-import org.openejb.InvalidateReferenceException;
-import org.openejb.core.transaction.TransactionContainer;
-import org.openejb.core.transaction.TransactionContext;
-import org.openejb.core.transaction.TransactionPolicy;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.core.transaction.TransactionContainer;
+import org.apache.openejb.core.transaction.TransactionContext;
+import org.apache.openejb.core.transaction.TransactionPolicy;
import javax.transaction.Status;
import javax.transaction.Transaction;
@@ -14,8 +14,8 @@
public StatefulBeanManagedTxPolicy(TransactionContainer container) {
this();
- if (container instanceof org.openejb.Container &&
- ((org.openejb.Container) container).getContainerType() != org.openejb.Container.STATEFUL) {
+ if (container instanceof org.apache.openejb.Container &&
+ ((org.apache.openejb.Container) container).getContainerType() != org.apache.openejb.Container.STATEFUL) {
throw new IllegalArgumentException();
}
this.container = container;
@@ -29,7 +29,7 @@
return "TX_BeanManaged: ";
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
try {
StatefulInstanceManager instanceManager = (StatefulInstanceManager) context.context.get(StatefulInstanceManager.class);
@@ -43,12 +43,12 @@
context.currentTx = (Transaction) possibleBeanTx;
resumeTransaction(context, context.currentTx);
}
- } catch (org.openejb.OpenEJBException e) {
+ } catch (org.apache.openejb.OpenEJBException e) {
handleSystemException(e.getRootCause(), instance, context);
}
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
try {
context.currentTx = context.getTransactionManager().getTransaction();
@@ -67,7 +67,7 @@
StatefulInstanceManager instanceManager = (StatefulInstanceManager) context.context.get(StatefulInstanceManager.class);
instanceManager.setAncillaryState(primaryKey, context.currentTx);
- } catch (org.openejb.OpenEJBException e) {
+ } catch (org.apache.openejb.OpenEJBException e) {
handleSystemException(e.getRootCause(), instance, context);
} catch (javax.transaction.SystemException e) {
handleSystemException(e, instance, context);
@@ -83,7 +83,7 @@
throw new ApplicationException(appException);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
logSystemException(sysException);
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=450640&r1=450506&r2=450640
==============================================================================
--- 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 Wed Sep 27 16:58:13 2006
@@ -1,21 +1,20 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.Container;
-import org.openejb.DeploymentInfo;
-import org.openejb.OpenEJBException;
-import org.openejb.ProxyInfo;
-import org.openejb.ApplicationException;
-import org.openejb.core.Operations;
-import org.openejb.core.ThreadContext;
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.core.transaction.TransactionContainer;
-import org.openejb.core.transaction.TransactionContext;
-import org.openejb.core.transaction.TransactionPolicy;
-import org.openejb.spi.SecurityService;
-import org.openejb.util.Logger;
-import org.openejb.util.Index;
+import org.apache.openejb.Container;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.core.Operations;
+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.spi.SecurityService;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Index;
-import javax.ejb.EJBLocalHome;
import javax.ejb.SessionBean;
import javax.transaction.TransactionManager;
import java.lang.reflect.Method;
@@ -26,7 +25,7 @@
/**
* @org.apache.xbean.XBean element="statefulContainer"
*/
-public class StatefulContainer implements org.openejb.RpcContainer, TransactionContainer {
+public class StatefulContainer implements org.apache.openejb.RpcContainer, TransactionContainer {
private StatefulInstanceManager instanceManager;
@@ -34,7 +33,7 @@
private Object containerID = null;
- final static protected Logger logger = Logger.getInstance("OpenEJB", "org.openejb.util.resources");
+ final static protected Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
private TransactionManager transactionManager;
private SecurityService securityService;
@@ -157,7 +156,7 @@
di.setContainer(this);
}
- public Object invoke(Object deployID, Method callMethod, Object [] args, Object primKey, Object securityIdentity) throws org.openejb.OpenEJBException {
+ public Object invoke(Object deployID, Method callMethod, Object [] args, Object primKey, Object securityIdentity) throws org.apache.openejb.OpenEJBException {
try {
CoreDeploymentInfo deployInfo = (CoreDeploymentInfo) this.getDeploymentInfo(deployID);
@@ -196,7 +195,7 @@
The thread context must be stripped from the thread before returning or throwing an exception
so that an object outside the container does not have access to a
bean's JNDI ENC. In addition, its important for the
- org.openejb.core.ivm.java.javaURLContextFactory, which determines the context
+ org.apache.openejb.core.ivm.java.javaURLContextFactory, which determines the context
of a JNDI lookup based on the presence of a ThreadContext object. If no ThreadContext
object is available, then the request is assumed to be made from outside the container
system and is given the global OpenEJB JNDI name space instead. If there is a thread context,
@@ -214,14 +213,14 @@
}
protected Object _invoke(Method callMethod, Method runMethod, Object [] args, Object bean, ThreadContext callContext)
- throws org.openejb.OpenEJBException {
+ throws org.apache.openejb.OpenEJBException {
TransactionPolicy txPolicy = callContext.getDeploymentInfo().getTransactionPolicy(callMethod);
TransactionContext txContext = new TransactionContext(callContext, getTransactionManager());
txContext.context.put(StatefulInstanceManager.class, instanceManager);
try {
txPolicy.beforeInvoke(bean, txContext);
- } catch (org.openejb.ApplicationException e) {
+ } catch (org.apache.openejb.ApplicationException e) {
if (e.getRootCause() instanceof javax.transaction.TransactionRequiredException ||
e.getRootCause() instanceof java.rmi.RemoteException) {
@@ -273,7 +272,7 @@
}
protected void removeEJBObject(Method callMethod, Object [] args, ThreadContext callContext)
- throws org.openejb.OpenEJBException {
+ throws org.apache.openejb.OpenEJBException {
try {
Object bean = instanceManager.obtainInstance(callContext.getPrimaryKey(), callContext);
@@ -291,7 +290,7 @@
}
protected ProxyInfo createEJBObject(Method callMethod, Object [] args, ThreadContext callContext)
- throws org.openejb.OpenEJBException {
+ throws org.apache.openejb.OpenEJBException {
CoreDeploymentInfo deploymentInfo = (CoreDeploymentInfo) callContext.getDeploymentInfo();
Class beanType = deploymentInfo.getBeanClass();
Object primaryKey = this.newPrimaryKey();
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java Wed Sep 27 16:58:13 2006
@@ -1,11 +1,11 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.ApplicationException;
-import org.openejb.InvalidateReferenceException;
-import org.openejb.core.transaction.TransactionContext;
-import org.openejb.core.transaction.TransactionPolicy;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.core.transaction.TransactionContext;
+import org.apache.openejb.core.transaction.TransactionPolicy;
-public class StatefulContainerManagedTxPolicy extends org.openejb.core.transaction.TransactionPolicy {
+public class StatefulContainerManagedTxPolicy extends org.apache.openejb.core.transaction.TransactionPolicy {
protected TransactionPolicy policy;
@@ -13,8 +13,8 @@
this.policy = policy;
this.container = policy.getContainer();
this.policyType = policy.policyType;
- if (container instanceof org.openejb.Container &&
- ((org.openejb.Container) container).getContainerType() != org.openejb.Container.STATEFUL) {
+ if (container instanceof org.apache.openejb.Container &&
+ ((org.apache.openejb.Container) container).getContainerType() != org.apache.openejb.Container.STATEFUL) {
throw new IllegalArgumentException();
}
}
@@ -23,11 +23,11 @@
return policy.policyToString();
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
policy.beforeInvoke(instance, context);
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
policy.afterInvoke(instance, context);
}
@@ -35,7 +35,7 @@
policy.handleApplicationException(appException, context);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
try {
policy.handleSystemException(sysException, instance, context);
} catch (ApplicationException e) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java Wed Sep 27 16:58:13 2006
@@ -1,18 +1,18 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.RpcContainer;
-import org.openejb.loader.SystemInstance;
-import org.openejb.core.Operations;
-import org.openejb.core.ThreadContext;
-import org.openejb.core.ivm.EjbObjectProxyHandler;
-import org.openejb.spi.SecurityService;
+import org.apache.openejb.RpcContainer;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.spi.SecurityService;
import javax.transaction.TransactionManager;
import javax.xml.rpc.handler.MessageContext;
import java.io.ObjectStreamException;
import java.io.Serializable;
-public class StatefulContext extends org.openejb.core.CoreContext implements javax.ejb.SessionContext {
+public class StatefulContext extends org.apache.openejb.core.CoreContext implements javax.ejb.SessionContext {
public StatefulContext(TransactionManager transactionManager, SecurityService securityService) {
super(transactionManager, securityService);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java Wed Sep 27 16:58:13 2006
@@ -1,10 +1,10 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.ProxyInfo;
-import org.openejb.RpcContainer;
-import org.openejb.core.ivm.EjbHomeProxyHandler;
-import org.openejb.core.ivm.EjbObjectProxyHandler;
-import org.openejb.util.proxy.ProxyManager;
+import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.RpcContainer;
+import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
+import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.util.proxy.ProxyManager;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java Wed Sep 27 16:58:13 2006
@@ -1,8 +1,8 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.RpcContainer;
-import org.openejb.core.ivm.EjbObjectProxyHandler;
-import org.openejb.util.proxy.ProxyManager;
+import org.apache.openejb.RpcContainer;
+import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.util.proxy.ProxyManager;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
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=450640&r1=450506&r2=450640
==============================================================================
--- 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 Wed Sep 27 16:58:13 2006
@@ -1,22 +1,20 @@
-package org.openejb.core.stateful;
+package org.apache.openejb.core.stateful;
-import org.openejb.ApplicationException;
-import org.openejb.InvalidateReferenceException;
-import org.openejb.OpenEJBException;
-import org.openejb.SystemException;
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.core.Operations;
-import org.openejb.core.ThreadContext;
-import org.openejb.core.ivm.IntraVmCopyMonitor;
-import org.openejb.spi.SecurityService;
-import org.openejb.util.Logger;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.SystemException;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
+import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.SafeToolkit;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.StaticRecipe;
import javax.ejb.EJBException;
-import javax.ejb.EnterpriseBean;
-import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
import javax.transaction.Status;
import javax.transaction.Transaction;
@@ -426,7 +424,7 @@
}
}
- public Logger logger = Logger.getInstance("OpenEJB", "org.openejb.util.resources");
+ public Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
protected void handleCallbackException(Throwable e, Object instance, ThreadContext callContext, String callBack) throws ApplicationException, SystemException {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java Wed Sep 27 16:58:13 2006
@@ -1,10 +1,10 @@
-package org.openejb.core.stateless;
+package org.apache.openejb.core.stateless;
-import org.openejb.core.ivm.naming.Reference;
+import org.apache.openejb.core.ivm.naming.Reference;
import javax.naming.NameNotFoundException;
-public class EncReference extends org.openejb.core.ivm.naming.ENCReference {
+public class EncReference extends org.apache.openejb.core.ivm.naming.ENCReference {
public EncReference(Reference ref) {
super(ref);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java Wed Sep 27 16:58:13 2006
@@ -1,7 +1,7 @@
-package org.openejb.core.stateless;
+package org.apache.openejb.core.stateless;
-import org.openejb.core.Operations;
-import org.openejb.core.ivm.naming.ObjectReference;
+import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ivm.naming.ObjectReference;
import javax.naming.NameNotFoundException;
@@ -11,12 +11,12 @@
Operation is checked to ensure that its is allowed for the bean's current state.
*/
-public class EncUserTransaction extends org.openejb.core.ivm.naming.ENCReference {
+public class EncUserTransaction extends org.apache.openejb.core.ivm.naming.ENCReference {
/*
* This constructor take a new CoreUserTransaction object as the object reference
*/
- public EncUserTransaction(org.openejb.core.CoreUserTransaction reference) {
+ public EncUserTransaction(org.apache.openejb.core.CoreUserTransaction reference) {
super(new ObjectReference(reference));
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java Wed Sep 27 16:58:13 2006
@@ -1,9 +1,9 @@
-package org.openejb.core.stateless;
+package org.apache.openejb.core.stateless;
-import org.openejb.ApplicationException;
-import org.openejb.core.transaction.TransactionContainer;
-import org.openejb.core.transaction.TransactionContext;
-import org.openejb.core.transaction.TransactionPolicy;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.core.transaction.TransactionContainer;
+import org.apache.openejb.core.transaction.TransactionContext;
+import org.apache.openejb.core.transaction.TransactionPolicy;
import javax.transaction.Status;
import java.rmi.RemoteException;
@@ -12,8 +12,8 @@
public StatelessBeanManagedTxPolicy(TransactionContainer container) {
this();
- if (container instanceof org.openejb.Container &&
- ((org.openejb.Container) container).getContainerType() != org.openejb.Container.STATELESS) {
+ if (container instanceof org.apache.openejb.Container &&
+ ((org.apache.openejb.Container) container).getContainerType() != org.apache.openejb.Container.STATELESS) {
throw new IllegalArgumentException();
}
@@ -28,12 +28,12 @@
return "TX_BeanManaged: ";
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
context.clientTx = suspendTransaction(context);
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
try {
/*
* The Container must detect the case in which a transaction was started, but
@@ -62,7 +62,7 @@
}
} catch (javax.transaction.SystemException e) {
- throw new org.openejb.SystemException(e);
+ throw new org.apache.openejb.SystemException(e);
} finally {
resumeTransaction(context, context.clientTx);
}
@@ -73,7 +73,7 @@
throw new ApplicationException(appException);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
try {
context.currentTx = context.getTransactionManager().getTransaction();
} catch (javax.transaction.SystemException e) {
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=450640&r1=450506&r2=450640
==============================================================================
--- 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 Wed Sep 27 16:58:13 2006
@@ -1,15 +1,15 @@
-package org.openejb.core.stateless;
+package org.apache.openejb.core.stateless;
-import org.openejb.Container;
-import org.openejb.DeploymentInfo;
-import org.openejb.OpenEJBException;
-import org.openejb.ProxyInfo;
-import org.openejb.core.Operations;
-import org.openejb.core.ThreadContext;
-import org.openejb.core.transaction.TransactionContainer;
-import org.openejb.core.transaction.TransactionContext;
-import org.openejb.core.transaction.TransactionPolicy;
-import org.openejb.spi.SecurityService;
+import org.apache.openejb.Container;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ThreadContext;
+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.spi.SecurityService;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
@@ -23,7 +23,7 @@
/**
* @org.apache.xbean.XBean element="statelessContainer"
*/
-public class StatelessContainer implements org.openejb.RpcContainer, TransactionContainer {
+public class StatelessContainer implements org.apache.openejb.RpcContainer, TransactionContainer {
private StatelessInstanceManager instanceManager;
@@ -42,7 +42,7 @@
instanceManager = new StatelessInstanceManager(transactionManager, securityService, timeOut, poolSize, strictPooling);
for (DeploymentInfo deploymentInfo : deploymentRegistry.values()) {
- org.openejb.core.CoreDeploymentInfo di = (org.openejb.core.CoreDeploymentInfo) deploymentInfo;
+ org.apache.openejb.core.CoreDeploymentInfo di = (org.apache.openejb.core.CoreDeploymentInfo) deploymentInfo;
di.setContainer(this);
}
}
@@ -67,22 +67,22 @@
HashMap registry = (HashMap) deploymentRegistry.clone();
registry.put(deploymentID, info);
deploymentRegistry = registry;
- org.openejb.core.CoreDeploymentInfo di = (org.openejb.core.CoreDeploymentInfo) info;
+ org.apache.openejb.core.CoreDeploymentInfo di = (org.apache.openejb.core.CoreDeploymentInfo) info;
di.setContainer(this);
}
public Object invoke(Object deployID, Method callMethod, Object [] args, Object primKey, Object securityIdentity)
- throws org.openejb.OpenEJBException {
+ throws org.apache.openejb.OpenEJBException {
try {
- org.openejb.core.CoreDeploymentInfo deployInfo = (org.openejb.core.CoreDeploymentInfo) this.getDeploymentInfo(deployID);
+ org.apache.openejb.core.CoreDeploymentInfo deployInfo = (org.apache.openejb.core.CoreDeploymentInfo) this.getDeploymentInfo(deployID);
ThreadContext callContext = ThreadContext.getThreadContext();
callContext.set(deployInfo, primKey, securityIdentity);
boolean authorized = getSecurityService().isCallerAuthorized(securityIdentity, deployInfo.getAuthorizedRoles(callMethod));
if (!authorized)
- throw new org.openejb.ApplicationException(new RemoteException("Unauthorized Access by Principal Denied"));
+ throw new org.apache.openejb.ApplicationException(new RemoteException("Unauthorized Access by Principal Denied"));
Class declaringClass = callMethod.getDeclaringClass();
if (EJBHome.class.isAssignableFrom(declaringClass) || EJBLocalHome.class.isAssignableFrom(declaringClass)) {
@@ -110,7 +110,7 @@
The thread context must be stripped from the thread before returning or throwing an exception
so that an object outside the container does not have access to a
bean's JNDI ENC. In addition, its important for the
- org.openejb.core.ivm.java.javaURLContextFactory, which determines the context
+ org.apache.openejb.core.ivm.java.javaURLContextFactory, which determines the context
of a JNDI lookup based on the presence of a ThreadContext object. If no ThreadContext
object is available, then the request is assumed to be made from outside the container
system and is given the global OpenEJB JNDI name space instead. If there is a thread context,
@@ -131,7 +131,7 @@
}
protected Object _invoke(Method callMethod, Method runMethod, Object [] args, Object bean, ThreadContext callContext)
- throws org.openejb.OpenEJBException {
+ throws org.apache.openejb.OpenEJBException {
TransactionPolicy txPolicy = callContext.getDeploymentInfo().getTransactionPolicy(callMethod);
TransactionContext txContext = new TransactionContext(callContext, getTransactionManager());
@@ -176,7 +176,7 @@
return transactionManager;
}
- protected ProxyInfo createEJBObject(org.openejb.core.CoreDeploymentInfo deploymentInfo, Method callMethod) {
+ protected ProxyInfo createEJBObject(org.apache.openejb.core.CoreDeploymentInfo deploymentInfo, Method callMethod) {
Class callingClass = callMethod.getDeclaringClass();
Class objectInterface = deploymentInfo.getObjectInterface(callingClass);
return new ProxyInfo(deploymentInfo, null, objectInterface, this);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java Wed Sep 27 16:58:13 2006
@@ -1,17 +1,17 @@
-package org.openejb.core.stateless;
+package org.apache.openejb.core.stateless;
-import org.openejb.RpcContainer;
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.core.Operations;
-import org.openejb.core.ThreadContext;
-import org.openejb.core.ivm.EjbObjectProxyHandler;
-import org.openejb.spi.SecurityService;
+import org.apache.openejb.RpcContainer;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.spi.SecurityService;
import javax.transaction.TransactionManager;
import javax.xml.rpc.handler.MessageContext;
public class StatelessContext
- extends org.openejb.core.CoreContext implements javax.ejb.SessionContext {
+ extends org.apache.openejb.core.CoreContext implements javax.ejb.SessionContext {
public StatelessContext(TransactionManager transactionManager, SecurityService securityService) {
super(transactionManager, securityService);
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java Wed Sep 27 16:58:13 2006
@@ -1,11 +1,11 @@
-package org.openejb.core.stateless;
+package org.apache.openejb.core.stateless;
-import org.openejb.RpcContainer;
-import org.openejb.core.ThreadContext;
-import org.openejb.core.ivm.EjbHomeProxyHandler;
-import org.openejb.core.ivm.EjbObjectProxyHandler;
-import org.openejb.core.ivm.IntraVmHandle;
-import org.openejb.util.proxy.ProxyManager;
+import org.apache.openejb.RpcContainer;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
+import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.core.ivm.IntraVmHandle;
+import org.apache.openejb.util.proxy.ProxyManager;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java Wed Sep 27 16:58:13 2006
@@ -1,9 +1,9 @@
-package org.openejb.core.stateless;
+package org.apache.openejb.core.stateless;
-import org.openejb.Container;
-import org.openejb.RpcContainer;
-import org.openejb.core.ivm.EjbObjectProxyHandler;
-import org.openejb.util.proxy.ProxyManager;
+import org.apache.openejb.Container;
+import org.apache.openejb.RpcContainer;
+import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.util.proxy.ProxyManager;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
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=450640&r1=450506&r2=450640
==============================================================================
--- 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 Wed Sep 27 16:58:13 2006
@@ -1,17 +1,17 @@
-package org.openejb.core.stateless;
+package org.apache.openejb.core.stateless;
import org.apache.log4j.Category;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.StaticRecipe;
-import org.openejb.OpenEJBException;
-import org.openejb.SystemException;
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.core.Operations;
-import org.openejb.core.ThreadContext;
-import org.openejb.spi.SecurityService;
-import org.openejb.util.LinkedListStack;
-import org.openejb.util.SafeToolkit;
-import org.openejb.util.Stack;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.SystemException;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.util.LinkedListStack;
+import org.apache.openejb.util.SafeToolkit;
+import org.apache.openejb.util.Stack;
import javax.ejb.SessionContext;
import javax.transaction.TransactionManager;
@@ -89,7 +89,7 @@
}
String t = "The bean instance " + bean + " threw a system exception:" + e;
logger.error(t, e);
- throw new org.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);
}
@@ -147,11 +147,11 @@
}
public synchronized void waitForAvailableInstance()
- throws org.openejb.InvalidateReferenceException {
+ throws org.apache.openejb.InvalidateReferenceException {
try {
wait(waitPeriod);
} catch (InterruptedException ie) {
- throw new org.openejb.InvalidateReferenceException(new RemoteException("No instance avaiable to service request"));
+ throw new org.apache.openejb.InvalidateReferenceException(new RemoteException("No instance avaiable to service request"));
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java Wed Sep 27 16:58:13 2006
@@ -1,8 +1,6 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
-import javax.ejb.EnterpriseBean;
-
-import org.openejb.core.ThreadContext;
+import org.apache.openejb.core.ThreadContext;
public interface TransactionContainer {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContext.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContext.java Wed Sep 27 16:58:13 2006
@@ -1,9 +1,9 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.openejb.core.ThreadContext;
+import org.apache.openejb.core.ThreadContext;
import java.util.Map;
import java.util.HashMap;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java Wed Sep 27 16:58:13 2006
@@ -1,16 +1,15 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
import java.rmi.RemoteException;
-import javax.ejb.EnterpriseBean;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.openejb.ApplicationException;
-import org.openejb.InvalidateReferenceException;
-import org.openejb.SystemException;
-import org.openejb.core.ThreadContext;
-import org.openejb.util.Logger;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.SystemException;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.util.Logger;
public abstract class TransactionPolicy {
@@ -26,8 +25,8 @@
private TransactionManager manager;
protected TransactionContainer container;
- protected final static Logger logger = Logger.getInstance("OpenEJB", "org.openejb.util.resources");
- protected final static Logger txLogger = Logger.getInstance("Transaction", "org.openejb.util.resources");
+ protected final static Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
+ protected final static Logger txLogger = Logger.getInstance("Transaction", "org.apache.openejb.util.resources");
public TransactionContainer getContainer() {
return container;
@@ -37,13 +36,13 @@
return "Internal Error: no such policy";
}
- public abstract void handleApplicationException(Throwable appException, TransactionContext context) throws org.openejb.ApplicationException;
+ public abstract void handleApplicationException(Throwable appException, TransactionContext context) throws org.apache.openejb.ApplicationException;
- public abstract void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException;
+ public abstract void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException;
- public abstract void beforeInvoke(Object bean, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException;
+ public abstract void beforeInvoke(Object bean, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException;
- public abstract void afterInvoke(Object bean, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException;
+ public abstract void afterInvoke(Object bean, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException;
protected void markTxRollbackOnly(Transaction tx) throws SystemException {
try {
@@ -55,7 +54,7 @@
}
} catch (javax.transaction.SystemException se) {
logger.error("Exception during setRollbackOnly()", se);
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
}
@@ -68,7 +67,7 @@
return tx;
} catch (javax.transaction.SystemException se) {
logger.error("Exception during suspend()", se);
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
}
@@ -87,15 +86,15 @@
} catch (javax.transaction.InvalidTransactionException ite) {
txLogger.error("Could not resume the client's transaction, the transaction is no longer valid: " + ite.getMessage());
- throw new org.openejb.SystemException(ite);
+ throw new org.apache.openejb.SystemException(ite);
} catch (IllegalStateException e) {
txLogger.error("Could not resume the client's transaction: " + e.getMessage());
- throw new org.openejb.SystemException(e);
+ throw new org.apache.openejb.SystemException(e);
} catch (javax.transaction.SystemException e) {
txLogger.error("Could not resume the client's transaction: The transaction reported a system exception: " + e.getMessage());
- throw new org.openejb.SystemException(e);
+ throw new org.apache.openejb.SystemException(e);
}
}
@@ -125,17 +124,17 @@
} catch (SecurityException e) {
txLogger.error("The current thread is not allowed to commit the transaction: " + e.getMessage());
- throw new org.openejb.SystemException(e);
+ throw new org.apache.openejb.SystemException(e);
} catch (IllegalStateException e) {
txLogger.error("The current thread is not associated with a transaction: " + e.getMessage());
- throw new org.openejb.SystemException(e);
+ throw new org.apache.openejb.SystemException(e);
} catch (javax.transaction.SystemException e) {
txLogger.error("The Transaction Manager has encountered an unexpected error condition while attempting to commit the transaction: " + e.getMessage());
- throw new org.openejb.SystemException(e);
+ throw new org.apache.openejb.SystemException(e);
}
}
@@ -153,12 +152,12 @@
} catch (IllegalStateException e) {
logger.error("The TransactionManager reported an exception while attempting to rollback the transaction: " + e.getMessage());
- throw new org.openejb.SystemException(e);
+ throw new org.apache.openejb.SystemException(e);
} catch (javax.transaction.SystemException e) {
logger.error("The TransactionManager reported an exception while attempting to rollback the transaction: " + e.getMessage());
- throw new org.openejb.SystemException(e);
+ throw new org.apache.openejb.SystemException(e);
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java Wed Sep 27 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
-import org.openejb.ApplicationException;
+import org.apache.openejb.ApplicationException;
public class TxManditory extends TransactionPolicy {
@@ -17,7 +17,7 @@
return "TX_Mandatory: ";
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
try {
@@ -32,11 +32,11 @@
} catch (javax.transaction.SystemException se) {
logger.error("Exception during getTransaction()", se);
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
}
@@ -45,7 +45,7 @@
throw new ApplicationException(appException);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
/* [1] Log the system exception or error *********/
logSystemException(sysException);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java Wed Sep 27 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
-import org.openejb.ApplicationException;
+import org.apache.openejb.ApplicationException;
public class TxNever extends TransactionPolicy {
@@ -17,7 +17,7 @@
return "TX_Never: ";
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
try {
@@ -28,11 +28,11 @@
} catch (javax.transaction.SystemException se) {
logger.error("Exception during getTransaction()", se);
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
}
@@ -41,7 +41,7 @@
throw new ApplicationException(appException);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
/* [1] Log the system exception or error *********/
logSystemException(sysException);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java Wed Sep 27 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
-import org.openejb.ApplicationException;
+import org.apache.openejb.ApplicationException;
public class TxNotSupported extends TransactionPolicy {
@@ -17,19 +17,19 @@
return "TX_NotSupported: ";
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
try {
context.clientTx = context.getTransactionManager().suspend();
} catch (javax.transaction.SystemException se) {
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
context.currentTx = null;
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
if (context.clientTx != null) {
try {
@@ -52,7 +52,7 @@
throw new ApplicationException(appException);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
/* [1] Log the system exception or error *********/
logSystemException(sysException);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java Wed Sep 27 16:58:13 2006
@@ -1,8 +1,8 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
import javax.transaction.Status;
-import org.openejb.ApplicationException;
+import org.apache.openejb.ApplicationException;
public class TxRequired extends TransactionPolicy {
@@ -19,7 +19,7 @@
return "TX_Required: ";
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
try {
@@ -33,11 +33,11 @@
} catch (javax.transaction.SystemException se) {
logger.error("Exception during getTransaction()", se);
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
try {
if (context.clientTx != null) return;
@@ -50,7 +50,7 @@
} catch (javax.transaction.SystemException se) {
logger.error("Exception during getTransaction()", se);
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
}
@@ -59,7 +59,7 @@
throw new ApplicationException(appException);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
/* [1] Log the system exception or error **********/
logSystemException(sysException);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java Wed Sep 27 16:58:13 2006
@@ -1,8 +1,8 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
import javax.transaction.Status;
-import org.openejb.ApplicationException;
+import org.apache.openejb.ApplicationException;
public class TxRequiresNew extends TransactionPolicy {
@@ -19,7 +19,7 @@
return "TX_RequiresNew: ";
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
try {
@@ -28,12 +28,12 @@
context.currentTx = context.getTransactionManager().getTransaction();
} catch (javax.transaction.SystemException se) {
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
try {
@@ -44,7 +44,7 @@
}
} catch (javax.transaction.SystemException se) {
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
} finally {
if (context.clientTx != null) {
resumeTransaction(context, context.clientTx);
@@ -58,7 +58,7 @@
throw new ApplicationException(appException);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
/* [1] Log the system exception or error **********/
logSystemException(sysException);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java Wed Sep 27 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.openejb.core.transaction;
+package org.apache.openejb.core.transaction;
-import org.openejb.ApplicationException;
+import org.apache.openejb.ApplicationException;
public class TxSupports extends TransactionPolicy {
@@ -17,7 +17,7 @@
return "TX_Supports: ";
}
- public void beforeInvoke(Object instance, TransactionContext context) throws org.openejb.SystemException, org.openejb.ApplicationException {
+ public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
try {
@@ -25,11 +25,11 @@
context.currentTx = context.clientTx;
} catch (javax.transaction.SystemException se) {
- throw new org.openejb.SystemException(se);
+ throw new org.apache.openejb.SystemException(se);
}
}
- public void afterInvoke(Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void afterInvoke(Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
}
@@ -38,7 +38,7 @@
throw new ApplicationException(appException);
}
- public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.openejb.ApplicationException, org.openejb.SystemException {
+ public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws org.apache.openejb.ApplicationException, org.apache.openejb.SystemException {
boolean runningInTransaction = (context.currentTx != null);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractCallbackOperation.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractCallbackOperation.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractCallbackOperation.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractCallbackOperation.java Wed Sep 27 16:58:13 2006
@@ -45,7 +45,7 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import java.io.Serializable;
@@ -53,10 +53,10 @@
import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.EJBInstanceContext;
-import org.openejb.EjbInvocation;
-import org.openejb.EJBOperation;
-import org.openejb.timer.TimerState;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.timer.TimerState;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractMethodOperation.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractMethodOperation.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractMethodOperation.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractMethodOperation.java Wed Sep 27 16:58:13 2006
@@ -45,7 +45,7 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -57,10 +57,10 @@
import net.sf.cglib.reflect.FastClass;
-import org.openejb.EJBInstanceContext;
-import org.openejb.EjbInvocation;
-import org.openejb.EJBOperation;
-import org.openejb.timer.TimerState;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.timer.TimerState;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractOperationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractOperationFactory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractOperationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/AbstractOperationFactory.java Wed Sep 27 16:58:13 2006
@@ -45,7 +45,7 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
/**
* @version $Revision$ $Date$
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/DispatchInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/DispatchInterceptor.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/DispatchInterceptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/DispatchInterceptor.java Wed Sep 27 16:58:13 2006
@@ -45,13 +45,13 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import org.apache.geronimo.interceptor.Interceptor;
import org.apache.geronimo.interceptor.Invocation;
import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.ExtendedEjbDeployment;
-import org.openejb.EjbInvocation;
+import org.apache.openejb.ExtendedEjbDeployment;
+import org.apache.openejb.EjbInvocation;
/**
* @version $Revision$ $Date$
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/EJBTimeoutOperation.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/EJBTimeoutOperation.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/EJBTimeoutOperation.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/EJBTimeoutOperation.java Wed Sep 27 16:58:13 2006
@@ -45,16 +45,16 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import javax.ejb.EnterpriseBean;
import javax.ejb.TimedObject;
import javax.ejb.Timer;
import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.EjbInvocation;
-import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractCallbackOperation;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.dispatch.AbstractCallbackOperation;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/InterfaceMethodSignature.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/InterfaceMethodSignature.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/InterfaceMethodSignature.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/InterfaceMethodSignature.java Wed Sep 27 16:58:13 2006
@@ -45,13 +45,13 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Arrays;
-import org.openejb.util.ClassLoading;
+import org.apache.openejb.util.ClassLoading;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/MethodHelper.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/MethodHelper.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/MethodHelper.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/MethodHelper.java Wed Sep 27 16:58:13 2006
@@ -45,7 +45,7 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -54,7 +54,7 @@
import net.sf.cglib.core.Signature;
import net.sf.cglib.proxy.MethodProxy;
import net.sf.cglib.asm.Type;
-import org.openejb.EJBInterfaceType;
+import org.apache.openejb.EJBInterfaceType;
/**
* Helper methods to deal with the whack handeling of indexes in cglib MethodProxy objects.
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/MethodSignature.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/MethodSignature.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/MethodSignature.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/MethodSignature.java Wed Sep 27 16:58:13 2006
@@ -45,13 +45,13 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Arrays;
-import org.openejb.util.ClassLoading;
+import org.apache.openejb.util.ClassLoading;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/SystemMethodIndices.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/SystemMethodIndices.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/SystemMethodIndices.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/SystemMethodIndices.java Wed Sep 27 16:58:13 2006
@@ -45,15 +45,15 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import javax.ejb.Timer;
-import org.openejb.EJBInstanceContext;
-import org.openejb.EjbInvocation;
-import org.openejb.EjbInvocationImpl;
-import org.openejb.EJBInterfaceType;
-import org.openejb.timer.EJBTimeoutInvocationFactory;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EjbInvocationImpl;
+import org.apache.openejb.EJBInterfaceType;
+import org.apache.openejb.timer.EJBTimeoutInvocationFactory;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/VirtualOperation.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/VirtualOperation.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/VirtualOperation.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/VirtualOperation.java Wed Sep 27 16:58:13 2006
@@ -45,11 +45,11 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
+package org.apache.openejb.dispatch;
import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.EjbInvocation;
+import org.apache.openejb.EjbInvocation;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/VirtualOperationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/VirtualOperationFactory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/VirtualOperationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/dispatch/VirtualOperationFactory.java Wed Sep 27 16:58:13 2006
@@ -45,9 +45,7 @@
*
* ====================================================================
*/
-package org.openejb.dispatch;
-
-import java.util.Map;
+package org.apache.openejb.dispatch;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/BusinessMethod.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/BusinessMethod.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/BusinessMethod.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/BusinessMethod.java Wed Sep 27 16:58:13 2006
@@ -45,14 +45,14 @@
*
* ====================================================================
*/
-package org.openejb.entity;
+package org.apache.openejb.entity;
import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.EjbInvocation;
-import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractMethodOperation;
-import org.openejb.dispatch.MethodSignature;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.dispatch.AbstractMethodOperation;
+import org.apache.openejb.dispatch.MethodSignature;
/**
*
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/EntityCallbackInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/EntityCallbackInterceptor.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/EntityCallbackInterceptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/EntityCallbackInterceptor.java Wed Sep 27 16:58:13 2006
@@ -42,13 +42,13 @@
*
* $Id$
*/
-package org.openejb.entity;
+package org.apache.openejb.entity;
-import org.openejb.CallbackMethod;
-import org.openejb.EjbCallbackInvocation;
-import org.openejb.EjbInvocation;
-import org.openejb.EJBOperation;
-import org.openejb.dispatch.AbstractCallbackOperation;
+import org.apache.openejb.CallbackMethod;
+import org.apache.openejb.EjbCallbackInvocation;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.dispatch.AbstractCallbackOperation;
import org.apache.geronimo.interceptor.InvocationResult;
import org.apache.geronimo.interceptor.Invocation;
import org.apache.geronimo.interceptor.Interceptor;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/EntityContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/EntityContextImpl.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/EntityContextImpl.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/entity/EntityContextImpl.java Wed Sep 27 16:58:13 2006
@@ -45,7 +45,7 @@
*
* ====================================================================
*/
-package org.openejb.entity;
+package org.apache.openejb.entity;
import java.security.Principal;
import javax.ejb.EJBHome;
@@ -58,10 +58,10 @@
import javax.transaction.UserTransaction;
import javax.transaction.TransactionManager;
-import org.openejb.EJBContextImpl;
-import org.openejb.EJBInstanceContext;
-import org.openejb.EJBOperation;
-import org.openejb.timer.TimerState;
+import org.apache.openejb.EJBContextImpl;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.timer.TimerState;
/**
* @version $Revision$ $Date$