svn commit: r450640 [5/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...

[db...@apache.org]

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ServicesJar.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ServicesJar.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ServicesJar.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ServicesJar.java Wed Sep 27 16:58:13 2006
@@ -5,22 +5,14 @@
  * $Id$
  */
 
-package org.openejb.alt.config.sys;
+package org.apache.openejb.alt.config.sys;
 
 //---------------------------------/
 
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Serializable;
-import java.io.Writer;
-import java.util.Enumeration;
 import java.util.Vector;
 
-import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
-import org.exolab.castor.xml.ValidationException;
-import org.xml.sax.ContentHandler;
 
 public class ServicesJar implements java.io.Serializable {
 
@@ -34,12 +26,12 @@
     }
 
 
-    public void addServiceProvider(org.openejb.alt.config.sys.ServiceProvider vServiceProvider)
+    public void addServiceProvider(org.apache.openejb.alt.config.sys.ServiceProvider vServiceProvider)
             throws java.lang.IndexOutOfBoundsException {
         _serviceProviderList.addElement(vServiceProvider);
     }
 
-    public void addServiceProvider(int index, org.openejb.alt.config.sys.ServiceProvider vServiceProvider)
+    public void addServiceProvider(int index, org.apache.openejb.alt.config.sys.ServiceProvider vServiceProvider)
             throws java.lang.IndexOutOfBoundsException {
         _serviceProviderList.insertElementAt(vServiceProvider, index);
     }
@@ -48,21 +40,21 @@
         return _serviceProviderList.elements();
     }
 
-    public org.openejb.alt.config.sys.ServiceProvider getServiceProvider(int index)
+    public org.apache.openejb.alt.config.sys.ServiceProvider getServiceProvider(int index)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _serviceProviderList.size())) {
             throw new IndexOutOfBoundsException();
         }
 
-        return (org.openejb.alt.config.sys.ServiceProvider) _serviceProviderList.elementAt(index);
+        return (org.apache.openejb.alt.config.sys.ServiceProvider) _serviceProviderList.elementAt(index);
     }
 
-    public org.openejb.alt.config.sys.ServiceProvider[] getServiceProvider() {
+    public org.apache.openejb.alt.config.sys.ServiceProvider[] getServiceProvider() {
         int size = _serviceProviderList.size();
-        org.openejb.alt.config.sys.ServiceProvider[] mArray = new org.openejb.alt.config.sys.ServiceProvider[size];
+        org.apache.openejb.alt.config.sys.ServiceProvider[] mArray = new org.apache.openejb.alt.config.sys.ServiceProvider[size];
         for (int index = 0; index < size; index++) {
-            mArray[index] = (org.openejb.alt.config.sys.ServiceProvider) _serviceProviderList.elementAt(index);
+            mArray[index] = (org.apache.openejb.alt.config.sys.ServiceProvider) _serviceProviderList.elementAt(index);
         }
         return mArray;
     }
@@ -97,13 +89,13 @@
         _serviceProviderList.removeAllElements();
     }
 
-    public org.openejb.alt.config.sys.ServiceProvider removeServiceProvider(int index) {
+    public org.apache.openejb.alt.config.sys.ServiceProvider removeServiceProvider(int index) {
         java.lang.Object obj = _serviceProviderList.elementAt(index);
         _serviceProviderList.removeElementAt(index);
-        return (org.openejb.alt.config.sys.ServiceProvider) obj;
+        return (org.apache.openejb.alt.config.sys.ServiceProvider) obj;
     }
 
-    public void setServiceProvider(int index, org.openejb.alt.config.sys.ServiceProvider vServiceProvider)
+    public void setServiceProvider(int index, org.apache.openejb.alt.config.sys.ServiceProvider vServiceProvider)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _serviceProviderList.size())) {
@@ -112,7 +104,7 @@
         _serviceProviderList.setElementAt(vServiceProvider, index);
     }
 
-    public void setServiceProvider(org.openejb.alt.config.sys.ServiceProvider[] serviceProviderArray) {
+    public void setServiceProvider(org.apache.openejb.alt.config.sys.ServiceProvider[] serviceProviderArray) {
 
         _serviceProviderList.removeAllElements();
         for (int i = 0; i < serviceProviderArray.length; i++) {
@@ -122,7 +114,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.openejb.alt.config.sys.ServicesJar) Unmarshaller.unmarshal(org.openejb.alt.config.sys.ServicesJar.class, reader);
+        return (org.apache.openejb.alt.config.sys.ServicesJar) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.ServicesJar.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ServicesJarDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ServicesJarDescriptor.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ServicesJarDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ServicesJarDescriptor.java Wed Sep 27 16:58:13 2006
@@ -5,15 +5,10 @@
  * $Id$
  */
 
-package org.openejb.alt.config.sys;
+package org.apache.openejb.alt.config.sys;
 
 //---------------------------------/
 
-import org.exolab.castor.mapping.AccessMode;
-import org.exolab.castor.xml.TypeValidator;
-import org.exolab.castor.xml.XMLFieldDescriptor;
-import org.exolab.castor.xml.validators.*;
-
 public class ServicesJarDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
 
 
@@ -38,7 +33,7 @@
         org.exolab.castor.xml.FieldValidator fieldValidator = null;
 
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.openejb.alt.config.sys.ServiceProvider.class, "_serviceProviderList", "ServiceProvider", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.ServiceProvider.class, "_serviceProviderList", "ServiceProvider", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -50,7 +45,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     ServicesJar target = (ServicesJar) object;
-                    target.addServiceProvider((org.openejb.alt.config.sys.ServiceProvider) value);
+                    target.addServiceProvider((org.apache.openejb.alt.config.sys.ServiceProvider) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -58,7 +53,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.openejb.alt.config.sys.ServiceProvider();
+                return new org.apache.openejb.alt.config.sys.ServiceProvider();
             }
         });
         desc.setHandler(handler);
@@ -88,7 +83,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.openejb.alt.config.sys.ServicesJar.class;
+        return org.apache.openejb.alt.config.sys.ServicesJar.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java Wed Sep 27 16:58:13 2006
@@ -5,22 +5,14 @@
  * $Id$
  */
 
-package org.openejb.alt.config.sys;
+package org.apache.openejb.alt.config.sys;
 
 //---------------------------------/
 
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Serializable;
-import java.io.Writer;
-
-import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
-import org.exolab.castor.xml.ValidationException;
-import org.xml.sax.ContentHandler;
 
-public class TransactionService implements java.io.Serializable, org.openejb.alt.config.Service {
+public class TransactionService implements java.io.Serializable, org.apache.openejb.alt.config.Service {
 
 
     private java.lang.String _id;
@@ -94,7 +86,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.openejb.alt.config.sys.TransactionService) Unmarshaller.unmarshal(org.openejb.alt.config.sys.TransactionService.class, reader);
+        return (org.apache.openejb.alt.config.sys.TransactionService) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.TransactionService.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java Wed Sep 27 16:58:13 2006
@@ -5,13 +5,10 @@
  * $Id$
  */
 
-package org.openejb.alt.config.sys;
+package org.apache.openejb.alt.config.sys;
 
 //---------------------------------/
 
-import org.exolab.castor.mapping.AccessMode;
-import org.exolab.castor.xml.TypeValidator;
-import org.exolab.castor.xml.XMLFieldDescriptor;
 import org.exolab.castor.xml.validators.*;
 
 public class TransactionServiceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
@@ -199,7 +196,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.openejb.alt.config.sys.TransactionService.class;
+        return org.apache.openejb.alt.config.sys.TransactionService.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CMPLogger.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CMPLogger.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CMPLogger.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CMPLogger.java Wed Sep 27 16:58:13 2006
@@ -1,9 +1,9 @@
-package org.openejb.alt.containers.castor_cmp11;
+package org.apache.openejb.alt.containers.castor_cmp11;
 
-import org.openejb.util.Logger;
+import org.apache.openejb.util.Logger;
 
 public class CMPLogger implements org.exolab.castor.persist.spi.LogInterceptor {
-    protected final Logger logger = Logger.getInstance("OpenEJB.CastorCMP", "org.openejb.alt.util.resources");
+    protected final Logger logger = Logger.getInstance("OpenEJB.CastorCMP", "org.apache.openejb.alt.util.resources");
     protected final String db;
 
     public CMPLogger(String db) {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.alt.containers.castor_cmp11;
+package org.apache.openejb.alt.containers.castor_cmp11;
 
 import org.exolab.castor.jdo.Database;
 import org.exolab.castor.jdo.JDOManager;
@@ -8,24 +8,24 @@
 import org.exolab.castor.persist.spi.CallbackInterceptor;
 import org.exolab.castor.persist.spi.Complex;
 import org.exolab.castor.persist.spi.InstanceFactory;
-import org.openejb.Container;
-import org.openejb.DeploymentInfo;
-import org.openejb.OpenEJBException;
-import org.openejb.ProxyInfo;
-import org.openejb.RpcContainer;
-import org.openejb.core.EnvProps;
-import org.openejb.core.Operations;
-import org.openejb.core.ThreadContext;
-import org.openejb.core.entity.EntityContext;
-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.LinkedListStack;
-import org.openejb.util.Logger;
-import org.openejb.util.SafeProperties;
-import org.openejb.util.SafeToolkit;
-import org.openejb.util.Stack;
+import org.apache.openejb.Container;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.RpcContainer;
+import org.apache.openejb.core.EnvProps;
+import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.entity.EntityContext;
+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.LinkedListStack;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.SafeProperties;
+import org.apache.openejb.util.SafeToolkit;
+import org.apache.openejb.util.Stack;
 
 import javax.ejb.EJBHome;
 import javax.ejb.EJBLocalHome;
@@ -112,7 +112,7 @@
         }
     }
 
-    public Logger logger = Logger.getInstance("OpenEJB", "org.openejb.alt.util.resources");
+    public Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.alt.util.resources");
 
     private HashMap deploymentRegistry;
 
@@ -132,7 +132,7 @@
 //        init(id, transactionManager, securityService, registry, poolsize, "instantdb", "Default JDBC Database", "org.enhydra.instantdb.jdbc.idbDriver", "jdbc:idb:conf/default.idb_database.conf", "Admin", "pass");
     }
 
-    public void init(Object id, HashMap registry, Properties properties) throws org.openejb.OpenEJBException {
+    public void init(Object id, HashMap registry, Properties properties) throws org.apache.openejb.OpenEJBException {
         TransactionManager transactionManager = (TransactionManager) properties.get(TransactionManager.class.getName());
         SecurityService securityService = (SecurityService) properties.get(SecurityService.class.getName());
 
@@ -171,7 +171,7 @@
         Map<String,URL> mappings = new HashMap<String,URL>();
         JndiTxReference txReference = new JndiTxReference(this.transactionManager);
         for (int x = 0; x < deploys.length; x++) {
-            org.openejb.core.CoreDeploymentInfo di = (org.openejb.core.CoreDeploymentInfo) deploys[x];
+            org.apache.openejb.core.CoreDeploymentInfo di = (org.apache.openejb.core.CoreDeploymentInfo) deploys[x];
             di.setContainer(this);
 
             URL url = null;
@@ -250,21 +250,21 @@
         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();
             String methodName = callMethod.getName();
@@ -280,7 +280,7 @@
                         return findEJBObject(callMethod, args, callContext);
                     } else {
 
-                        throw new org.openejb.InvalidateReferenceException(new java.rmi.RemoteException("Invalid method " + methodName + " only find<METHOD>( ) and create( ) method are allowed in EJB 1.1 container-managed persistence"));
+                        throw new org.apache.openejb.InvalidateReferenceException(new java.rmi.RemoteException("Invalid method " + methodName + " only find<METHOD>( ) and create( ) method are allowed in EJB 1.1 container-managed persistence"));
                     }
                 } else if (methodName.equals("remove")) {
                     removeEJBObject(callMethod, args, callContext);
@@ -305,7 +305,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,
@@ -323,7 +323,7 @@
 
     public EntityBean fetchFreeInstance(ThreadContext callContext) throws IllegalAccessException, InvocationTargetException, InstantiationException {
 
-        org.openejb.core.CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+        org.apache.openejb.core.CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
 
         /*
         Obtain the stack of instances of this deployment that are in the method ready state.
@@ -375,7 +375,7 @@
     }
 
     protected Object businessMethod(Method callMethod, Method runMethod, Object[] args, ThreadContext callContext)
-            throws org.openejb.OpenEJBException {
+            throws org.apache.openejb.OpenEJBException {
 
         EntityBean bean = null;
 
@@ -472,8 +472,8 @@
     }
 
     protected ProxyInfo createEJBObject(Method callMethod, Object[] args, ThreadContext callContext)
-            throws org.openejb.OpenEJBException {
-        org.openejb.core.CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+            throws org.apache.openejb.OpenEJBException {
+        org.apache.openejb.core.CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
 
         EntityBean bean = null;
         Object primaryKey = null;
@@ -635,9 +635,9 @@
 
     protected static final Object[] noArgs = new Object[0];
 
-    protected Object findEJBObject(Method callMethod, Object[] args, ThreadContext callContext) throws org.openejb.OpenEJBException {
+    protected Object findEJBObject(Method callMethod, Object[] args, ThreadContext callContext) throws org.apache.openejb.OpenEJBException {
 
-        org.openejb.core.CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+        org.apache.openejb.core.CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
 
         QueryResults results = null;
         Object returnValue = null;
@@ -765,7 +765,7 @@
                     proxies.addElement(new ProxyInfo(deploymentInfo, primaryKey, objectInterface, this));
                 }
                 if (callMethod.getReturnType() == java.util.Enumeration.class)
-                    returnValue = new org.openejb.util.Enumerator(proxies);
+                    returnValue = new org.apache.openejb.util.Enumerator(proxies);
                 else
                     returnValue = proxies;
             } else {
@@ -827,7 +827,7 @@
     }
 
     protected void removeEJBObject(Method callMethod, Object[] args, ThreadContext callContext)
-            throws org.openejb.OpenEJBException {
+            throws org.apache.openejb.OpenEJBException {
         EntityBean bean = null;
         TransactionContext txContext = new TransactionContext(callContext, getTransactionManager());
         TransactionPolicy txPolicy = callContext.getDeploymentInfo().getTransactionPolicy(callMethod);
@@ -1008,7 +1008,7 @@
         }
     }
 
-    protected void resetBeanFields(java.lang.Object bean, org.openejb.core.CoreDeploymentInfo info) {
+    protected void resetBeanFields(java.lang.Object bean, org.apache.openejb.core.CoreDeploymentInfo info) {
         final String[] cmFields = info.getCmrFields();
         final Class beanClass = bean.getClass();
 
@@ -1173,23 +1173,23 @@
      * space based every time the container starts. It nearly impossible for the bean to anticipate
      * and use the binding directly.  It may be possible, however, to locate it using a Context listing method.
      */
-    private void bindTransactionManagerReference(org.openejb.core.CoreDeploymentInfo di, String transactionManagerJndiName, JndiTxReference txReference) throws org.openejb.SystemException {
+    private void bindTransactionManagerReference(org.apache.openejb.core.CoreDeploymentInfo di, String transactionManagerJndiName, JndiTxReference txReference) throws org.apache.openejb.SystemException {
         try {
             di.getJndiEnc().bind(transactionManagerJndiName, txReference);
         } catch (Exception e) {
             logger.error("Unable to bind TransactionManager to deployment id = " + di.getDeploymentID() + " using JNDI name = \"" + transactionManagerJndiName + "\"", e);
-            throw new org.openejb.SystemException("Unable to bind TransactionManager to deployment id = " + di.getDeploymentID() + " using JNDI name = \"" + transactionManagerJndiName + "\"", e);
+            throw new org.apache.openejb.SystemException("Unable to bind TransactionManager to deployment id = " + di.getDeploymentID() + " using JNDI name = \"" + transactionManagerJndiName + "\"", e);
         }
     }
 
-    private void configureKeyGenerator(org.openejb.core.CoreDeploymentInfo di) throws org.openejb.SystemException {
+    private void configureKeyGenerator(org.apache.openejb.core.CoreDeploymentInfo di) throws org.apache.openejb.SystemException {
         KeyGenerator kg = null;
         try {
             kg = KeyGeneratorFactory.createKeyGenerator(di);
             di.setKeyGenerator(kg);
         } catch (Exception e) {
             logger.error("Unable to create KeyGenerator for deployment id = " + di.getDeploymentID(), e);
-            throw new org.openejb.SystemException("Unable to create KeyGenerator for deployment id = " + di.getDeploymentID(), e);
+            throw new org.apache.openejb.SystemException("Unable to create KeyGenerator for deployment id = " + di.getDeploymentID(), e);
         }
 
         try {
@@ -1217,7 +1217,7 @@
                 di.addQuery(findByPrimaryKeyMethod, findByPrimarKeyQuery.toString());
             }
         } catch (Exception e) {
-            throw new org.openejb.SystemException("Could not generate a query statement for the findByPrimaryKey method of the deployment = " + di.getDeploymentID(), e);
+            throw new org.apache.openejb.SystemException("Could not generate a query statement for the findByPrimaryKey method of the deployment = " + di.getDeploymentID(), e);
         }
     }
 }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java Wed Sep 27 16:58:13 2006
@@ -1,16 +1,16 @@
-package org.openejb.alt.containers.castor_cmp11;
+package org.apache.openejb.alt.containers.castor_cmp11;
 
 import java.rmi.RemoteException;
 
 import org.exolab.castor.jdo.Database;
 import org.exolab.castor.jdo.JDOManager;
-import org.openejb.ApplicationException;
-import org.openejb.core.transaction.TransactionContext;
-import org.openejb.core.transaction.TransactionPolicy;
-import org.openejb.core.transaction.TransactionContainer;
-import org.openejb.core.RpcContainerWrapper;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.core.transaction.TransactionContext;
+import org.apache.openejb.core.transaction.TransactionPolicy;
+import org.apache.openejb.core.transaction.TransactionContainer;
+import org.apache.openejb.core.RpcContainerWrapper;
 
-public class CastorCmpEntityTxPolicy extends org.openejb.core.transaction.TransactionPolicy {
+public class CastorCmpEntityTxPolicy extends org.apache.openejb.core.transaction.TransactionPolicy {
 
     protected TransactionPolicy policy;
     protected CastorCMP11_EntityContainer cmpContainer;
@@ -36,7 +36,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);
 
 //        DeploymentInfo deploymentInfo = context.callContext.getDeploymentInfo();
@@ -94,7 +94,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 {
         try {
             if (context.currentTx == null) {
                 Database db = (Database) context.callContext.getUnspecified();
@@ -129,7 +129,7 @@
         }
     }
 
-    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 {
             if (context.currentTx == null) {
                 Database db = (Database) context.callContext.getUnspecified();

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java Wed Sep 27 16:58:13 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.alt.containers.castor_cmp11;
+package org.apache.openejb.alt.containers.castor_cmp11;
 
 import org.castor.jdo.conf.Database;
 import org.castor.jdo.conf.DatabaseChoice;
@@ -25,7 +25,6 @@
 import org.castor.jdo.conf.Param;
 import org.castor.jdo.conf.TransactionDemarcation;
 import org.castor.jdo.conf.TransactionManager;
-import org.castor.util.Configuration;
 import org.exolab.castor.jdo.JDOManager;
 import org.exolab.castor.mapping.MappingException;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java Wed Sep 27 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.openejb.alt.containers.castor_cmp11;
+package org.apache.openejb.alt.containers.castor_cmp11;
 
-import org.openejb.core.ivm.naming.Reference;
+import org.apache.openejb.core.ivm.naming.Reference;
 
 import javax.naming.NamingException;
 import javax.transaction.TransactionManager;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/KeyGenerator.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/KeyGenerator.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/KeyGenerator.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/KeyGenerator.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.alt.containers.castor_cmp11;
+package org.apache.openejb.alt.containers.castor_cmp11;
 
 import org.exolab.castor.persist.spi.Complex;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/KeyGeneratorFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/KeyGeneratorFactory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/KeyGeneratorFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/KeyGeneratorFactory.java Wed Sep 27 16:58:13 2006
@@ -1,17 +1,17 @@
-package org.openejb.alt.containers.castor_cmp11;
+package org.apache.openejb.alt.containers.castor_cmp11;
 
 import java.util.HashMap;
 
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.util.Logger;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.util.Logger;
 
 public abstract class KeyGeneratorFactory {
-    protected final static Logger logger = Logger.getInstance("CastorCMP", "org.openejb.alt.util.resources");
+    protected final static Logger logger = Logger.getInstance("CastorCMP", "org.apache.openejb.alt.util.resources");
 
-    private static class PrimitiveKey implements org.openejb.alt.containers.castor_cmp11.KeyGenerator {
+    private static class PrimitiveKey implements org.apache.openejb.alt.containers.castor_cmp11.KeyGenerator {
         private final java.lang.reflect.Field field;
 
-        PrimitiveKey(CoreDeploymentInfo di) throws org.openejb.OpenEJBException {
+        PrimitiveKey(CoreDeploymentInfo di) throws org.apache.openejb.OpenEJBException {
             field = di.getPrimaryKeyField();
         }
 
@@ -33,13 +33,13 @@
         }
     }
 
-    private static class ComplexKey implements org.openejb.alt.containers.castor_cmp11.KeyGenerator {
+    private static class ComplexKey implements org.apache.openejb.alt.containers.castor_cmp11.KeyGenerator {
         private final java.lang.Class pkClass;
         private final Object[] cmFields;
         private final HashMap pkFieldMap;
         private final HashMap beanFieldMap;
 
-        ComplexKey(CoreDeploymentInfo di) throws org.openejb.OpenEJBException {
+        ComplexKey(CoreDeploymentInfo di) throws org.apache.openejb.OpenEJBException {
             pkClass = di.getPrimaryKeyClass();
             Class beanClass = di.getBeanClass();
             java.util.List v = new java.util.ArrayList();
@@ -95,7 +95,7 @@
     }
 
     public static KeyGenerator createKeyGenerator(CoreDeploymentInfo di)
-            throws org.openejb.OpenEJBException {
+            throws org.apache.openejb.OpenEJBException {
 
         if (di.getPrimaryKeyField() != null) {
             return new PrimitiveKey(di);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/ThreadLocalTransactionManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/ThreadLocalTransactionManagerFactory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/ThreadLocalTransactionManagerFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/ThreadLocalTransactionManagerFactory.java Wed Sep 27 16:58:13 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.alt.containers.castor_cmp11;
+package org.apache.openejb.alt.containers.castor_cmp11;
 
 import java.util.Properties;
 import javax.transaction.TransactionManager;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Wed Sep 27 16:58:13 2006
@@ -1,15 +1,15 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
-import org.openejb.EnvProps;
-import org.openejb.OpenEJBException;
-import org.openejb.Container;
-import org.openejb.loader.SystemInstance;
-import org.openejb.core.ConnectorReference;
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.core.TransactionManagerWrapper;
-import org.openejb.spi.SecurityService;
-import org.openejb.util.OpenEJBErrorHandler;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.EnvProps;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.Container;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.core.ConnectorReference;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.TransactionManagerWrapper;
+import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.util.OpenEJBErrorHandler;
+import org.apache.openejb.util.SafeToolkit;
 import org.apache.xbean.recipe.ObjectRecipe;
 import org.apache.xbean.recipe.StaticRecipe;
 
@@ -23,13 +23,13 @@
 import java.util.Properties;
 import java.util.List;
 
-public class Assembler extends AssemblerTool implements org.openejb.spi.Assembler {
+public class Assembler extends AssemblerTool implements org.apache.openejb.spi.Assembler {
 
-    private org.openejb.core.ContainerSystem containerSystem;
+    private org.apache.openejb.core.ContainerSystem containerSystem;
     private TransactionManager transactionManager;
-    private org.openejb.spi.SecurityService securityService;
+    private org.apache.openejb.spi.SecurityService securityService;
 
-    public org.openejb.spi.ContainerSystem getContainerSystem() {
+    public org.apache.openejb.spi.ContainerSystem getContainerSystem() {
         return containerSystem;
     }
 
@@ -61,7 +61,7 @@
 
         /* Get Configuration ////////////////////////////*/
         String className = props.getProperty(EnvProps.CONFIGURATION_FACTORY);
-        if (className == null) className = props.getProperty("openejb.configurator", "org.openejb.alt.config.ConfigurationFactory");
+        if (className == null) className = props.getProperty("openejb.configurator", "org.apache.openejb.alt.config.ConfigurationFactory");
 
         OpenEjbConfigurationFactory configFactory = (OpenEjbConfigurationFactory) toolkit.newInstance(className);
         configFactory.init(props);
@@ -72,7 +72,7 @@
         Properties systemProperties = System.getProperties();
         synchronized (systemProperties) {
             String str = systemProperties.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
-            String naming = "org.openejb.core.ivm.naming";
+            String naming = "org.apache.openejb.core.ivm.naming";
             if (str == null) {
                 str = naming;
             } else if (str.indexOf(naming) == -1) {
@@ -134,7 +134,7 @@
      * This method leverage the other assemble and apply methods which
      * can be used independently.
      * <p/>
-     * Assembles and returns the {@link org.openejb.core.ContainerSystem} using the
+     * Assembles and returns the {@link org.apache.openejb.core.ContainerSystem} using the
      * information from the {@link OpenEjbConfiguration} object passed in.
      * <pre>
      * This method performs the following actions(in order):
@@ -154,7 +154,7 @@
      * @throws Exception
      * @see OpenEjbConfiguration
      */
-    public org.openejb.core.ContainerSystem buildContainerSystem(OpenEjbConfiguration configInfo) throws Exception {
+    public org.apache.openejb.core.ContainerSystem buildContainerSystem(OpenEjbConfiguration configInfo) throws Exception {
 
         /*[1] Assemble ProxyFactory //////////////////////////////////////////
 
@@ -172,7 +172,7 @@
         ContainerSystemInfo containerSystemInfo = configInfo.containerSystem;
 
 
-        containerSystem = new org.openejb.core.ContainerSystem();
+        containerSystem = new org.apache.openejb.core.ContainerSystem();
 
         createTransactionManager(configInfo);
 
@@ -211,7 +211,7 @@
         for (int i1 = 0; i1 < containers.size(); i1++) {
             Container container1 = (Container) containers.get(i1);
             containerSystem.addContainer(container1.getContainerID(), container1);
-            org.openejb.DeploymentInfo[] deployments1 = container1.deployments();
+            org.apache.openejb.DeploymentInfo[] deployments1 = container1.deployments();
             for (int j = 0; j < deployments1.length; j++) {
                 containerSystem.addDeployment((CoreDeploymentInfo) deployments1[j]);
             }
@@ -219,10 +219,10 @@
 
         // roleMapping used later in buildMethodPermissions
         AssemblerTool.RoleMapping roleMapping = new AssemblerTool.RoleMapping(configInfo.facilities.securityService.roleMappings);
-        org.openejb.DeploymentInfo [] deployments = containerSystem.deployments();
+        org.apache.openejb.DeploymentInfo [] deployments = containerSystem.deployments();
         for (int i = 0; i < deployments.length; i++) {
-            applyMethodPermissions((org.openejb.core.CoreDeploymentInfo) deployments[i], containerSystemInfo.methodPermissions, roleMapping);
-            applyTransactionAttributes((org.openejb.core.CoreDeploymentInfo) deployments[i], containerSystemInfo.methodTransactions);
+            applyMethodPermissions((org.apache.openejb.core.CoreDeploymentInfo) deployments[i], containerSystemInfo.methodPermissions, roleMapping);
+            applyTransactionAttributes((org.apache.openejb.core.CoreDeploymentInfo) deployments[i], containerSystemInfo.methodTransactions);
         }
 
         ArrayList list = new ArrayList();
@@ -233,7 +233,7 @@
         while (iterator.hasNext()) {
             ContainerInfo container = (ContainerInfo) iterator.next();
             for (int z = 0; z < container.ejbeans.length; z++) {
-                CoreDeploymentInfo deployment = (org.openejb.core.CoreDeploymentInfo) containerSystem.getDeploymentInfo(container.ejbeans[z].ejbDeploymentId);
+                CoreDeploymentInfo deployment = (org.apache.openejb.core.CoreDeploymentInfo) containerSystem.getDeploymentInfo(container.ejbeans[z].ejbDeploymentId);
                 applySecurityRoleReference(deployment, container.ejbeans[z], roleMapping);
             }
         }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java Wed Sep 27 16:58:13 2006
@@ -1,11 +1,11 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
-import org.openejb.OpenEJBException;
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.util.Messages;
-import org.openejb.util.SafeToolkit;
-import org.openejb.util.proxy.ProxyFactory;
-import org.openejb.util.proxy.ProxyManager;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.SafeToolkit;
+import org.apache.openejb.util.proxy.ProxyFactory;
+import org.apache.openejb.util.proxy.ProxyManager;
 
 import javax.naming.InitialContext;
 import javax.resource.spi.ConnectionManager;
@@ -18,13 +18,13 @@
 
 public class AssemblerTool {
 
-    public static final Class PROXY_FACTORY = org.openejb.util.proxy.ProxyFactory.class;
-    public static final Class SECURITY_SERVICE = org.openejb.spi.SecurityService.class;
-    public static final Class TRANSACTION_SERVICE = org.openejb.spi.TransactionService.class;
+    public static final Class PROXY_FACTORY = org.apache.openejb.util.proxy.ProxyFactory.class;
+    public static final Class SECURITY_SERVICE = org.apache.openejb.spi.SecurityService.class;
+    public static final Class TRANSACTION_SERVICE = org.apache.openejb.spi.TransactionService.class;
     public static final Class CONNECTION_MANAGER = javax.resource.spi.ConnectionManager.class;
     public static final Class CONNECTOR = javax.resource.spi.ManagedConnectionFactory.class;
 
-    protected static final Messages messages = new Messages("org.openejb.util.resources");
+    protected static final Messages messages = new Messages("org.apache.openejb.util.resources");
     protected static final SafeToolkit toolkit = SafeToolkit.getToolkit("AssemblerTool");
     protected static final HashMap codebases = new HashMap();
 
@@ -43,13 +43,13 @@
     be internationalized.
     */
     public InitialContext assembleRemoteJndiContext(JndiContextInfo context)
-            throws org.openejb.OpenEJBException {
+            throws org.apache.openejb.OpenEJBException {
         try {
             InitialContext ic = new InitialContext(context.properties);
             return ic;
         } catch (javax.naming.NamingException ne) {
 
-            throw new org.openejb.OpenEJBException("The remote JNDI EJB references for remote-jndi-contexts = " + context.jndiContextId + "+ could not be resolved.", ne);
+            throw new org.apache.openejb.OpenEJBException("The remote JNDI EJB references for remote-jndi-contexts = " + context.jndiContextId + "+ could not be resolved.", ne);
         }
     }
 
@@ -75,7 +75,7 @@
     }
 
     public ManagedConnectionFactory assembleManagedConnectionFactory(ManagedConnectionFactoryInfo mngedConFactInfo)
-            throws org.openejb.OpenEJBException, java.lang.Exception {
+            throws org.apache.openejb.OpenEJBException, java.lang.Exception {
 
         ManagedConnectionFactory managedConnectionFactory = null;
         try {
@@ -224,8 +224,8 @@
     *
     * @param methodPermission the permission object to be copies and updated.
     * @param roleMapping encapsulates the mapping of many logical roles to their equivalent physical roles.
-    * @see org.openejb.assembler.classic.MethodPermissionInfo
-    * @see org.openejb.assembler.classic.AssemblerTool.RoleMapping
+    * @see org.apache.openejb.assembler.classic.MethodPermissionInfo
+    * @see org.apache.openejb.assembler.classic.AssemblerTool.RoleMapping
     */
     public MethodPermissionInfo applyRoleMappings(MethodPermissionInfo methodPermission,
                                                   AssemblerTool.RoleMapping roleMapping) {
@@ -276,7 +276,7 @@
 
     }
 
-    protected java.lang.reflect.Method[] resolveMethodInfo(MethodInfo methodInfo, org.openejb.core.CoreDeploymentInfo di) {
+    protected java.lang.reflect.Method[] resolveMethodInfo(MethodInfo methodInfo, org.apache.openejb.core.CoreDeploymentInfo di) {
         /*TODO: Add better exception handling.  This method doesn't throws any exceptions!!
          there is a lot of complex code here, I'm sure something could go wrong the user
          might want to know about.

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectionManagerInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectionManagerInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectionManagerInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectionManagerInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 import java.util.Properties;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class ConnectorInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerBuilder.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerBuilder.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -14,18 +14,18 @@
 import org.apache.xbean.recipe.ConstructionException;
 import org.apache.xbean.recipe.ObjectRecipe;
 import org.apache.xbean.recipe.StaticRecipe;
-import org.openejb.Container;
-import org.openejb.DeploymentInfo;
-import org.openejb.OpenEJBException;
-import org.openejb.RpcContainer;
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.loader.SystemInstance;
-import org.openejb.spi.SecurityService;
-import org.openejb.util.Logger;
+import org.apache.openejb.Container;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.RpcContainer;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.util.Logger;
 
 public class ContainerBuilder {
 
-    private static final Logger logger = Logger.getInstance("OpenEJB", "org.openejb.util.resources");
+    private static final Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
 
     private final Properties props;
     private final EjbJarInfo[] ejbJars;
@@ -50,7 +50,7 @@
             }
         }
 
-        ClassLoader classLoader = new URLClassLoader(jars, org.openejb.OpenEJB.class.getClassLoader());
+        ClassLoader classLoader = new URLClassLoader(jars, org.apache.openejb.OpenEJB.class.getClassLoader());
         EjbJarBuilder ejbJarBuilder = new EjbJarBuilder(classLoader);
 
         HashMap<String,DeploymentInfo> deployments = new HashMap();
@@ -74,9 +74,9 @@
             Container container = buildContainer(containerInfo, deploymentsList);
             container = wrapContainer(container);
 
-            org.openejb.DeploymentInfo [] deploys = container.deployments();
+            org.apache.openejb.DeploymentInfo [] deploys = container.deployments();
             for (int x = 0; x < deploys.length; x++) {
-                org.openejb.core.CoreDeploymentInfo di = (org.openejb.core.CoreDeploymentInfo) deploys[x];
+                org.apache.openejb.core.CoreDeploymentInfo di = (org.apache.openejb.core.CoreDeploymentInfo) deploys[x];
                 di.setContainer(container);
             }
             containers.add(container);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 import java.util.Properties;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerManagerInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerManagerInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerManagerInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerManagerInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class ContainerManagerInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class ContainerSystemInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java Wed Sep 27 16:58:13 2006
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 import java.util.HashMap;
 
-import org.openejb.DeploymentInfo;
-import org.openejb.OpenEJBException;
-import org.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.core.CoreDeploymentInfo;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class EjbJarInfo extends InfoObject {
     public String jarPath;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbLocalReferenceInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbLocalReferenceInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbLocalReferenceInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbLocalReferenceInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class EjbLocalReferenceInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbLocalReferenceLocationInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbLocalReferenceLocationInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbLocalReferenceLocationInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbLocalReferenceLocationInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class EjbLocalReferenceLocationInfo extends InfoObject {
     public boolean remote;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class EjbReferenceInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceLocationInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceLocationInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceLocationInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbReferenceLocationInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class EjbReferenceLocationInfo extends InfoObject {
     public boolean remote;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbType.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbType.java Wed Sep 27 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
-import org.openejb.DeploymentInfo;
+import org.apache.openejb.DeploymentInfo;
 
 public class EjbType {
     public static final EjbType STATEFUL = new EjbType(DeploymentInfo.STATEFUL, "Stateful SessionBean");
@@ -16,7 +16,7 @@
     private EjbType(byte type, String typeName) {
         this.type = type;
         this.typeName = typeName;
-        isSession = org.openejb.core.CoreDeploymentInfo.STATEFUL == type || org.openejb.core.CoreDeploymentInfo.STATELESS == type;
+        isSession = org.apache.openejb.core.CoreDeploymentInfo.STATEFUL == type || org.apache.openejb.core.CoreDeploymentInfo.STATELESS == type;
         isEntity = !isSession;
     }
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java Wed Sep 27 16:58:13 2006
@@ -1,12 +1,12 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
-import org.openejb.OpenEJBException;
-import org.openejb.SystemException;
-import org.openejb.core.DeploymentContext;
-import org.openejb.core.CoreDeploymentInfo;
-import org.openejb.core.ivm.naming.IvmContext;
-import org.openejb.util.Messages;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.SystemException;
+import org.apache.openejb.core.DeploymentContext;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.ivm.naming.IvmContext;
+import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.SafeToolkit;
 
 import java.io.File;
 import java.lang.reflect.Method;
@@ -18,7 +18,7 @@
 import java.util.ArrayList;
 
 class EnterpriseBeanBuilder {
-    protected static final Messages messages = new Messages("org.openejb.util.resources");
+    protected static final Messages messages = new Messages("org.apache.openejb.util.resources");
     private final EnterpriseBeanInfo bean;
     private final EjbType ejbType;
     private final ClassLoader cl;
@@ -41,7 +41,7 @@
     }
 
     static class Loader {
-        protected static final Messages messages = new Messages("org.openejb.util.resources");
+        protected static final Messages messages = new Messages("org.apache.openejb.util.resources");
         private final ClassLoader classLoader;
         private final String ejbDeploymentId;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 import java.util.List;
 import java.util.ArrayList;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class EntityBeanInfo extends EnterpriseBeanInfo {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityContainerInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityContainerInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityContainerInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityContainerInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class EntityContainerInfo extends ContainerInfo {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnvEntryInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnvEntryInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnvEntryInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnvEntryInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class EnvEntryInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/FacilitiesInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/FacilitiesInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/FacilitiesInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/FacilitiesInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class FacilitiesInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InfoObject.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InfoObject.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InfoObject.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InfoObject.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public abstract class InfoObject implements java.io.Serializable {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/IntraVmServerInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/IntraVmServerInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/IntraVmServerInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/IntraVmServerInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 import java.util.Properties;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiContextInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiContextInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiContextInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiContextInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class JndiContextInfo extends InfoObject {
     public String jndiContextId;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Wed Sep 27 16:58:13 2006
@@ -1,13 +1,13 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
-import org.openejb.OpenEJBException;
-import org.openejb.core.CoreUserTransaction;
-import org.openejb.core.ivm.naming.IntraVmJndiReference;
-import org.openejb.core.ivm.naming.IvmContext;
-import org.openejb.core.ivm.naming.JndiReference;
-import org.openejb.core.ivm.naming.NameNode;
-import org.openejb.core.ivm.naming.ParsedName;
-import org.openejb.core.ivm.naming.Reference;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.core.CoreUserTransaction;
+import org.apache.openejb.core.ivm.naming.IntraVmJndiReference;
+import org.apache.openejb.core.ivm.naming.IvmContext;
+import org.apache.openejb.core.ivm.naming.JndiReference;
+import org.apache.openejb.core.ivm.naming.NameNode;
+import org.apache.openejb.core.ivm.naming.ParsedName;
+import org.apache.openejb.core.ivm.naming.Reference;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
@@ -34,7 +34,7 @@
         } else if (ejbType == EjbType.STATELESS) {
             referenceWrapper = new StatelessRefereceWrapper();
         } else {
-            throw new org.openejb.OpenEJBException("Unknown component type");
+            throw new org.apache.openejb.OpenEJBException("Unknown component type");
         }
 
         beanManagedTransactions = transactionType != null && transactionType.equalsIgnoreCase("Bean");
@@ -140,7 +140,7 @@
             try {
                 enc.bind(name, value);
             } catch (NamingException e) {
-                throw new org.openejb.SystemException("Unable to bind '" + name + "' into bean's enc.", e);
+                throw new org.apache.openejb.SystemException("Unable to bind '" + name + "' into bean's enc.", e);
             }
         }
         return enc;
@@ -170,7 +170,7 @@
 
     static class EntityRefereceWrapper extends ReferenceWrapper {
         public Object wrap(Reference reference) {
-            return new org.openejb.core.entity.EncReference(reference);
+            return new org.apache.openejb.core.entity.EncReference(reference);
         }
 
         public Object wrap(UserTransaction userTransaction) {
@@ -180,21 +180,21 @@
 
     static class StatelessRefereceWrapper extends ReferenceWrapper {
         public Object wrap(Reference reference) {
-            return new org.openejb.core.stateless.EncReference(reference);
+            return new org.apache.openejb.core.stateless.EncReference(reference);
         }
 
         public Object wrap(UserTransaction userTransaction) {
-            return new org.openejb.core.stateless.EncUserTransaction((CoreUserTransaction) userTransaction);
+            return new org.apache.openejb.core.stateless.EncUserTransaction((CoreUserTransaction) userTransaction);
         }
     }
 
     static class StatefulRefereceWrapper extends ReferenceWrapper {
         public Object wrap(Reference reference) {
-            return new org.openejb.core.stateful.EncReference(reference);
+            return new org.apache.openejb.core.stateful.EncReference(reference);
         }
 
         public Object wrap(UserTransaction userTransaction) {
-            return new org.openejb.core.stateful.EncUserTransaction((CoreUserTransaction) userTransaction);
+            return new org.apache.openejb.core.stateful.EncUserTransaction((CoreUserTransaction) userTransaction);
         }
     }
 }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class JndiEncInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LifecycleCallbackInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LifecycleCallbackInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LifecycleCallbackInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LifecycleCallbackInfo.java Wed Sep 27 16:58:13 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ManagedConnectionFactoryInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ManagedConnectionFactoryInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ManagedConnectionFactoryInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ManagedConnectionFactoryInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 import java.util.Properties;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class MethodInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodPermissionInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodPermissionInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodPermissionInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodPermissionInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class MethodPermissionInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class MethodTransactionInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfiguration.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfiguration.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfiguration.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class OpenEjbConfiguration extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationFactory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationFactory.java Wed Sep 27 16:58:13 2006
@@ -1,8 +1,8 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 import java.util.Properties;
 
-import org.openejb.OpenEJBException;
+import org.apache.openejb.OpenEJBException;
 
 public interface OpenEjbConfigurationFactory {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/QueryInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/QueryInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/QueryInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/QueryInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class QueryInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/RemoteJndiContextsInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/RemoteJndiContextsInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/RemoteJndiContextsInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/RemoteJndiContextsInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class RemoteJndiContextsInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class ResourceInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class ResourceReferenceInfo extends InfoObject {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceLocationInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceLocationInfo.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceLocationInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceLocationInfo.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.assembler.classic;
+package org.apache.openejb.assembler.classic;
 
 public class ResourceReferenceLocationInfo extends InfoObject {