You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2006/09/28 21:39:51 UTC

svn commit: r450983 [17/20] - in /incubator/openejb/trunk/openejb2: ./ etc/ modules/ modules/openejb-builder/ modules/openejb-builder/src/main/java/org/apache/ modules/openejb-builder/src/main/java/org/apache/openejb/ modules/openejb-builder/src/main/j...

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Main.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Main.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Main.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Main.java Thu Sep 28 12:39:00 2006
@@ -42,12 +42,12 @@
  *
  * $Id$
  */
-package org.openejb.server;
+package org.apache.openejb.server;
 
 import java.util.Properties;
 import java.io.InputStream;
 import java.net.URL;
-import org.openejb.util.JarUtils;
+import org.apache.openejb.util.JarUtils;
 
 /**
  * This class will parse all the command line arguments then
@@ -137,7 +137,7 @@
                 }
             }
 
-            props.setProperty("org/openejb/configuration_factory", "org.openejb.config.ConfigurationFactory");
+            props.setProperty("org/openejb/configuration_factory", "org.apache.openejb.config.ConfigurationFactory");
 
         } catch ( Exception re ) {
             System.err.println("FATAL ERROR: "+ re.getMessage());

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Server.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Server.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Server.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Server.java Thu Sep 28 12:39:00 2006
@@ -42,14 +42,14 @@
  *
  * $Id$
  */
-package org.openejb.server;
+package org.apache.openejb.server;
 
 import java.util.Properties;
 
-import org.openejb.OpenEJB;
-import org.openejb.util.Logger;
-import org.openejb.util.Messages;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.SafeToolkit;
 
 /**
  * This is the base class for orcistrating the other daemons 
@@ -64,11 +64,11 @@
  * 
  * 
  */
-public class Server implements org.openejb.spi.Service {
+public class Server implements org.apache.openejb.spi.Service {
 
     private SafeToolkit toolkit = SafeToolkit.getToolkit("OpenEJB EJB Server");
-    private Messages _messages = new Messages( "org.openejb.server" );
-    private Logger logger = Logger.getInstance( "OpenEJB.server.remote", "org.openejb.server" );
+    private Messages _messages = new Messages( "org.apache.openejb.server" );
+    private Logger logger = Logger.getInstance( "OpenEJB.server.remote", "org.apache.openejb.server" );
 
     Properties props;
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ServerFederation.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ServerFederation.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ServerFederation.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ServerFederation.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server;
+package org.apache.openejb.server;
 
 import javax.ejb.EJBHome;
 import javax.ejb.EJBMetaData;
@@ -50,8 +50,8 @@
 import javax.ejb.Handle;
 import javax.ejb.HomeHandle;
 
-import org.openejb.proxy.ProxyInfo;
-import org.openejb.spi.ApplicationServer;
+import org.apache.openejb.proxy.ProxyInfo;
+import org.apache.openejb.spi.ApplicationServer;
 
 /**
  * This class is passed in as the ApplicationServer implementation

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ServiceManager.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ServiceManager.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server;
+package org.apache.openejb.server;
 
 import java.net.InetAddress;
 import java.net.URL;
@@ -60,7 +60,7 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
-import org.openejb.util.Messages;
+import org.apache.openejb.util.Messages;
 
 
 /**
@@ -78,7 +78,7 @@
  */
 public class ServiceManager {
 
-    static Messages messages = new Messages("org.openejb.server");
+    static Messages messages = new Messages("org.apache.openejb.server");
     Log log = LogFactory.getLog(ServiceManager.class);
 
     private static ServiceManager manager;
@@ -225,8 +225,8 @@
         Kernel kernel = KernelRegistry.getSingleKernel();
 
         try {
-            ServiceManager.setUpServerService(kernel, "EJB", "127.0.0.1", 4201, org.openejb.server.ejbd.EjbServer.class);
-            ServiceManager.setUpServerService(kernel, "ADMIN", "127.0.0.1", 4200, org.openejb.server.admin.AdminDaemon.class);
+            ServiceManager.setUpServerService(kernel, "EJB", "127.0.0.1", 4201, org.apache.openejb.server.ejbd.EjbServer.class);
+            ServiceManager.setUpServerService(kernel, "ADMIN", "127.0.0.1", 4200, org.apache.openejb.server.admin.AdminDaemon.class);
         } catch (Exception e) {
             throw new ServiceException(e);
         }
@@ -306,7 +306,7 @@
      * @exception ServiceException
      */
     private Class loadClass(String className) throws ServiceException {
-        ClassLoader loader = org.openejb.util.ClasspathUtils.getContextClassLoader();
+        ClassLoader loader = org.apache.openejb.util.ClasspathUtils.getContextClassLoader();
         Class clazz = null;
         try {
             clazz = Class.forName(className, true, loader);

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/SimpleSocketService.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/SimpleSocketService.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/SimpleSocketService.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/SimpleSocketService.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.server;
+package org.apache.openejb.server;
 
 import org.activeio.xnet.ServerService;
 import org.activeio.xnet.ServiceException;
@@ -58,8 +58,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.kernel.ClassLoading;
-import org.openejb.DeploymentIndex;
-import org.openejb.OpenEJB;
+import org.apache.openejb.DeploymentIndex;
+import org.apache.openejb.OpenEJB;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/SimpleSocketServiceGBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/SimpleSocketServiceGBean.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/SimpleSocketServiceGBean.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/SimpleSocketServiceGBean.java Thu Sep 28 12:39:00 2006
@@ -14,12 +14,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.server;
+package org.apache.openejb.server;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.openejb.DeploymentIndex;
+import org.apache.openejb.DeploymentIndex;
 import org.activeio.xnet.SocketService;
 
 import java.net.InetAddress;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Stop.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Stop.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Stop.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/Stop.java Thu Sep 28 12:39:00 2006
@@ -42,12 +42,12 @@
  *
  * $Id$
  */
-package org.openejb.server;
+package org.apache.openejb.server;
 
 /**
  * This class is here for backwards compatibility 
  * 
  */
-public class Stop extends org.openejb.server.admin.Stop {
+public class Stop extends org.apache.openejb.server.admin.Stop {
     
 }

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java Thu Sep 28 12:39:00 2006
@@ -42,17 +42,16 @@
  *
  * $Id$
  */
-package org.openejb.server.admin;
+package org.apache.openejb.server.admin;
 
 import java.io.*;
 import java.net.*;
 import java.util.*;
 import org.activeio.xnet.ServerService;
 import org.activeio.xnet.ServiceException;
-import org.openejb.server.ServiceManager;
-import org.activeio.xnet.ServiceException;
-import org.openejb.client.RequestMethods;
-import org.openejb.DeploymentIndex;
+import org.apache.openejb.server.ServiceManager;
+import org.apache.openejb.client.RequestMethods;
+import org.apache.openejb.DeploymentIndex;
 
 /**
  * This is the base class for orcistrating the other daemons 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/admin/Stop.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/admin/Stop.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/admin/Stop.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/admin/Stop.java Thu Sep 28 12:39:00 2006
@@ -42,18 +42,18 @@
  *
  * $Id$
  */
-package org.openejb.server.admin;
+package org.apache.openejb.server.admin;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.net.URL;
 import java.util.Properties;
-import org.openejb.util.JarUtils;
+import org.apache.openejb.util.JarUtils;
 
 /**
  */
-public class Stop implements org.openejb.client.RequestMethods {
+public class Stop implements org.apache.openejb.client.RequestMethods {
     
     /**
      * 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/EJBContainerProvider.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/EJBContainerProvider.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/EJBContainerProvider.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/EJBContainerProvider.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.axis;
+package org.apache.openejb.server.axis;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -68,13 +68,13 @@
 import org.apache.geronimo.interceptor.InvocationKey;
 import org.apache.geronimo.interceptor.InvocationResult;
 import org.apache.geronimo.interceptor.SimpleInvocationResult;
-import org.openejb.transaction.EjbTransactionContext;
+import org.apache.openejb.transaction.EjbTransactionContext;
 import org.apache.geronimo.webservices.MessageContextInvocationKey;
-import org.openejb.EJBInstanceContext;
-import org.openejb.EJBInterfaceType;
-import org.openejb.EjbDeployment;
-import org.openejb.EjbInvocation;
-import org.openejb.ExtendedEjbDeployment;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EJBInterfaceType;
+import org.apache.openejb.EjbDeployment;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.ExtendedEjbDeployment;
 import org.xml.sax.SAXException;
 
 public class EJBContainerProvider extends RPCProvider {

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/WSContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/WSContainer.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/WSContainer.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/WSContainer.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.axis;
+package org.apache.openejb.server.axis;
 
 import java.net.URI;
 
@@ -53,7 +53,7 @@
 import org.apache.geronimo.axis.server.ServiceInfo;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.webservices.SoapHandler;
-import org.openejb.RpcEjbDeployment;
+import org.apache.openejb.RpcEjbDeployment;
 
 public class WSContainer implements GBeanLifecycle {
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/WSContainerGBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/WSContainerGBean.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/WSContainerGBean.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/axis/WSContainerGBean.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.axis;
+package org.apache.openejb.server.axis;
 
 import java.net.URI;
 
@@ -51,7 +51,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.webservices.SoapHandler;
-import org.openejb.RpcEjbDeployment;
+import org.apache.openejb.RpcEjbDeployment;
 
 public class WSContainerGBean {
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java Thu Sep 28 12:39:00 2006
@@ -42,16 +42,16 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.openejb.client.AuthenticationRequest;
-import org.openejb.client.AuthenticationResponse;
-import org.openejb.client.ClientMetaData;
-import org.openejb.client.RequestMethods;
-import org.openejb.client.ResponseCodes;
+import org.apache.openejb.client.AuthenticationRequest;
+import org.apache.openejb.client.AuthenticationResponse;
+import org.apache.openejb.client.ClientMetaData;
+import org.apache.openejb.client.RequestMethods;
+import org.apache.openejb.client.ResponseCodes;
 
 class AuthRequestHandler implements ResponseCodes, RequestMethods {
     AuthRequestHandler() {

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/CallContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/CallContext.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/CallContext.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/CallContext.java Thu Sep 28 12:39:00 2006
@@ -42,11 +42,11 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
-import org.openejb.EjbDeployment;
-import org.openejb.client.EJBRequest;
-import org.openejb.util.FastThreadLocal;
+import org.apache.openejb.EjbDeployment;
+import org.apache.openejb.client.EJBRequest;
+import org.apache.openejb.util.FastThreadLocal;
 
 /**
  * TODO: Add comment

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java Thu Sep 28 12:39:00 2006
@@ -42,18 +42,18 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openejb.DeploymentIndex;
-import org.openejb.client.EJBHomeHandle;
-import org.openejb.client.EJBHomeHandler;
-import org.openejb.client.EJBMetaDataImpl;
-import org.openejb.client.EJBObjectHandle;
-import org.openejb.client.EJBObjectHandler;
-import org.openejb.client.ServerMetaData;
-import org.openejb.proxy.ProxyInfo;
+import org.apache.openejb.DeploymentIndex;
+import org.apache.openejb.client.EJBHomeHandle;
+import org.apache.openejb.client.EJBHomeHandler;
+import org.apache.openejb.client.EJBMetaDataImpl;
+import org.apache.openejb.client.EJBObjectHandle;
+import org.apache.openejb.client.EJBObjectHandler;
+import org.apache.openejb.client.ServerMetaData;
+import org.apache.openejb.proxy.ProxyInfo;
 
 
 /**
@@ -61,7 +61,7 @@
  * implementations of the javax.ejb.* interaces as
  * 
  */
-class ClientObjectFactory implements org.openejb.spi.ApplicationServer {
+class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer {
     private final DeploymentIndex deploymentIndex;
     private static Log log = LogFactory.getLog(ClientObjectFactory.class);
 	private static final int PORT;
@@ -156,7 +156,7 @@
      * @param info
      * 
      * @return 
-     * @see org.openejb.client.EJBMetaDataImpl
+     * @see org.apache.openejb.client.EJBMetaDataImpl
      */
     protected javax.ejb.EJBMetaData _getEJBMetaData(CallContext call, ProxyInfo info) {
 
@@ -183,7 +183,7 @@
      * @param info
      * 
      * @return 
-     * @see org.openejb.client.EJBObjectHandle
+     * @see org.apache.openejb.client.EJBObjectHandle
      */
     protected javax.ejb.Handle _getHandle(CallContext call, ProxyInfo info) {
 
@@ -210,7 +210,7 @@
      * @param info
      * 
      * @return 
-     * @see org.openejb.client.EJBHomeHandle
+     * @see org.apache.openejb.client.EJBHomeHandle
      */
     protected javax.ejb.HomeHandle _getHomeHandle(CallContext call, ProxyInfo info) {
 
@@ -236,7 +236,7 @@
      * @param info
      * 
      * @return 
-     * @see org.openejb.client.EJBObjectHandler
+     * @see org.apache.openejb.client.EJBObjectHandler
      */
     protected javax.ejb.EJBObject _getEJBObject(CallContext call, ProxyInfo info) {
 
@@ -263,7 +263,7 @@
      * @param info
      * 
      * @return 
-     * @see org.openejb.client.EJBHomeHandler
+     * @see org.apache.openejb.client.EJBHomeHandler
      */
     protected javax.ejb.EJBHome _getEJBHome(CallContext call, ProxyInfo info) {
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EJBObjectInputStream.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EJBObjectInputStream.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EJBObjectInputStream.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EJBObjectInputStream.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,8 +50,6 @@
 import java.io.ObjectStreamClass;
 
 import org.apache.geronimo.kernel.ClassLoading;
-import org.apache.geronimo.kernel.ClassLoading;
-import org.apache.geronimo.kernel.ClassLoading;
 
 public class EJBObjectInputStream extends ObjectInputStream {
 
@@ -66,9 +64,9 @@
     }
 
     /**
-	 * Set the classloader that belongs to the ejb
-	 *  
-	 */
+     * Set the classloader that belongs to the ejb
+     *
+     */
     public void setClassLoader(ClassLoader ejbClassLoader) {
         this.ejbClassLoader = ejbClassLoader;
     }

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -60,12 +60,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.openejb.DeploymentIndex;
-import org.openejb.client.RequestMethods;
-import org.openejb.client.ResponseCodes;
-import org.openejb.client.ProtocolMetaData;
-import org.openejb.proxy.ProxyInfo;
-import org.openejb.spi.ApplicationServer;
+import org.apache.openejb.DeploymentIndex;
+import org.apache.openejb.client.RequestMethods;
+import org.apache.openejb.client.ResponseCodes;
+import org.apache.openejb.client.ProtocolMetaData;
+import org.apache.openejb.proxy.ProxyInfo;
+import org.apache.openejb.spi.ApplicationServer;
 
 /**
  *

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbInvocationStream.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbInvocationStream.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbInvocationStream.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbInvocationStream.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -51,14 +51,14 @@
 import org.apache.geronimo.interceptor.InvocationKey;
 import org.apache.geronimo.interceptor.InvocationResult;
 import org.apache.geronimo.interceptor.SimpleInvocationResult;
-import org.openejb.transaction.EjbTransactionContext;
-import org.openejb.EJBInstanceContext;
-import org.openejb.EJBInterfaceType;
-import org.openejb.EjbInvocation;
-import org.openejb.EjbInvocationImpl;
-import org.openejb.ExtendedEjbDeployment;
-import org.openejb.corba.ORBRef;
-import org.openejb.client.EJBRequest;
+import org.apache.openejb.transaction.EjbTransactionContext;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EJBInterfaceType;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EjbInvocationImpl;
+import org.apache.openejb.ExtendedEjbDeployment;
+import org.apache.openejb.corba.ORBRef;
+import org.apache.openejb.client.EJBRequest;
 
 public class EjbInvocationStream extends EJBRequest implements EjbInvocation {
     // The container that we are invoking, this is set in the container before sending the invocation to the interceptor stack

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java Thu Sep 28 12:39:00 2006
@@ -43,7 +43,7 @@
  * $Id$
  */
 
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
@@ -60,18 +60,18 @@
 import org.apache.geronimo.interceptor.InvocationResult;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.IdentificationPrincipal;
-import org.openejb.DeploymentIndex;
-import org.openejb.RpcEjbDeployment;
-import org.openejb.InvalidateReferenceException;
-import org.openejb.EjbDeployment;
-import org.openejb.corba.ORBRef;
-import org.openejb.client.EJBRequest;
-import org.openejb.client.EJBResponse;
-import org.openejb.client.RequestMethods;
-import org.openejb.client.ResponseCodes;
-import org.openejb.cluster.server.ClusteredInvocationResult;
-import org.openejb.proxy.BaseEJB;
-import org.openejb.proxy.ProxyInfo;
+import org.apache.openejb.DeploymentIndex;
+import org.apache.openejb.RpcEjbDeployment;
+import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.EjbDeployment;
+import org.apache.openejb.corba.ORBRef;
+import org.apache.openejb.client.EJBRequest;
+import org.apache.openejb.client.EJBResponse;
+import org.apache.openejb.client.RequestMethods;
+import org.apache.openejb.client.ResponseCodes;
+import org.apache.openejb.cluster.server.ClusteredInvocationResult;
+import org.apache.openejb.proxy.BaseEJB;
+import org.apache.openejb.proxy.ProxyInfo;
 
 
 class EjbRequestHandler implements ResponseCodes, RequestMethods {
@@ -252,9 +252,9 @@
                 }
             } catch (InvalidateReferenceException e) {
                 res.setResponse(EJB_SYS_EXCEPTION, e.getCause());
-            } catch (org.openejb.ApplicationException e) {
+            } catch (org.apache.openejb.ApplicationException e) {
                 res.setResponse(EJB_APP_EXCEPTION, e.getCause());
-            } catch (org.openejb.SystemException e) {
+            } catch (org.apache.openejb.SystemException e) {
                 res.setResponse(EJB_ERROR, e.getCause());
 
                 // TODO:2: This means a severe error occured in OpenEJB
@@ -315,7 +315,7 @@
         }
 
         if (result.isException()) {
-            throw new org.openejb.ApplicationException(result.getException());
+            throw new org.apache.openejb.ApplicationException(result.getException());
         } else {
             return result.getResult();
         }

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 
 import java.io.IOException;
@@ -52,10 +52,10 @@
 
 import org.activeio.xnet.ServerService;
 import org.activeio.xnet.ServiceException;
-import org.openejb.DeploymentIndex;
-import org.openejb.OpenEJB;
-import org.openejb.client.EJBObjectProxyHandle;
-import org.openejb.server.ServerFederation;
+import org.apache.openejb.DeploymentIndex;
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.client.EJBObjectProxyHandle;
+import org.apache.openejb.server.ServerFederation;
 
 /**
  * @since 11/25/2001

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbServerGBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbServerGBean.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbServerGBean.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbServerGBean.java Thu Sep 28 12:39:00 2006
@@ -42,14 +42,14 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import org.activeio.xnet.SocketService;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.openejb.DeploymentIndex;
-import org.openejb.corba.ORBRef;
+import org.apache.openejb.DeploymentIndex;
+import org.apache.openejb.corba.ORBRef;
 
 public class EjbServerGBean {
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -54,14 +54,14 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.KernelRegistry;
-import org.openejb.DeploymentIndex;
-import org.openejb.RpcEjbDeployment;
-import org.openejb.client.EJBMetaDataImpl;
-import org.openejb.client.JNDIRequest;
-import org.openejb.client.JNDIResponse;
-import org.openejb.client.RequestMethods;
-import org.openejb.client.ResponseCodes;
-import org.openejb.proxy.ProxyInfo;
+import org.apache.openejb.DeploymentIndex;
+import org.apache.openejb.RpcEjbDeployment;
+import org.apache.openejb.client.EJBMetaDataImpl;
+import org.apache.openejb.client.JNDIRequest;
+import org.apache.openejb.client.JNDIResponse;
+import org.apache.openejb.client.RequestMethods;
+import org.apache.openejb.client.ResponseCodes;
+import org.apache.openejb.proxy.ProxyInfo;
 
 /**
  */

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/PseudoSecurityService.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/PseudoSecurityService.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/PseudoSecurityService.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/PseudoSecurityService.java Thu Sep 28 12:39:00 2006
@@ -42,11 +42,10 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
-import java.security.Principal;
-import org.openejb.spi.SecurityService;
-import org.openejb.util.FastThreadLocal;
+import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.util.FastThreadLocal;
 
 public class PseudoSecurityService implements SecurityService {
     

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/PseudoTransactionService.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/PseudoTransactionService.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/PseudoTransactionService.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/PseudoTransactionService.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.ejbd;
+package org.apache.openejb.server.ejbd;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -55,7 +55,7 @@
 import javax.transaction.UserTransaction;
 import javax.transaction.xa.XAResource;
 
-import org.openejb.spi.TransactionService;
+import org.apache.openejb.spi.TransactionService;
 
 public class PseudoTransactionService implements TransactionService {
     TransactionManager txm = new MyTransactionManager();

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpListener.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpListener.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpListener.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpListener.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.httpd;
+package org.apache.openejb.server.httpd;
 
 import java.io.IOException;
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java Thu Sep 28 12:39:00 2006
@@ -42,12 +42,11 @@
  *
  * $Id$
  */
-package org.openejb.server.httpd;
+package org.apache.openejb.server.httpd;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
-import javax.servlet.ServletInputStream;
 
 
 /** An interface to take care of HTTP Requests.  It parses headers, content, form and url
@@ -55,52 +54,52 @@
  *
  */
 public interface HttpRequest extends java.io.Serializable{
-    
-    /** the HTTP OPTIONS type */    
+
+    /** the HTTP OPTIONS type */
     public static final int OPTIONS = 0; // Section 9.2
-    /** the HTTP GET type */    
+    /** the HTTP GET type */
     public static final int GET     = 1; // Section 9.3
-    /** the HTTP HEAD type */    
+    /** the HTTP HEAD type */
     public static final int HEAD    = 2; // Section 9.4
-    /** the HTTP POST type */    
+    /** the HTTP POST type */
     public static final int POST    = 3; // Section 9.5
-    /** the HTTP PUT type */    
+    /** the HTTP PUT type */
     public static final int PUT     = 4; // Section 9.6
-    /** the HTTP DELETE type */    
+    /** the HTTP DELETE type */
     public static final int DELETE  = 5; // Section 9.7
-    /** the HTTP TRACE type */    
+    /** the HTTP TRACE type */
     public static final int TRACE   = 6; // Section 9.8
-    /** the HTTP CONNECT type */    
+    /** the HTTP CONNECT type */
     public static final int CONNECT = 7; // Section 9.9
-    /** the HTTP UNSUPPORTED type */    
+    /** the HTTP UNSUPPORTED type */
     public static final int UNSUPPORTED = 8;
-    
+
     /* 
-     * Header variables 
-     */
-	/** the Accept header */
-	public static final String HEADER_ACCEPT = "Accept";
-	/** the Accept-Encoding header */
-	public static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
-	/** the Accept-Language header */
-	public static final String HEADER_ACCEPT_LANGUAGE = "Accept-Language";
+    * Header variables
+    */
+    /** the Accept header */
+    public static final String HEADER_ACCEPT = "Accept";
+    /** the Accept-Encoding header */
+    public static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
+    /** the Accept-Language header */
+    public static final String HEADER_ACCEPT_LANGUAGE = "Accept-Language";
     /** the Content-Type header */
     public static final String HEADER_CONTENT_TYPE = "Content-Type";
     /** the Content-Length header */
     public static final String HEADER_CONTENT_LENGTH = "Content-Length";
-	/** the Connection header */
-	public static final String HEADER_CONNECTION = "Connection";
-	/** the Cache-Control header */
-	public static final String HEADER_CACHE_CONTROL = "Cache-Control";
-	/** the Host header */
-	public static final String HEADER_HOST = "Host";
-	/** the User-Agent header */
-	public static final String HEADER_USER_AGENT = "User-Agent";
+    /** the Connection header */
+    public static final String HEADER_CONNECTION = "Connection";
+    /** the Cache-Control header */
+    public static final String HEADER_CACHE_CONTROL = "Cache-Control";
+    /** the Host header */
+    public static final String HEADER_HOST = "Host";
+    /** the User-Agent header */
+    public static final String HEADER_USER_AGENT = "User-Agent";
     /** the Set-Cookie header */
     public static final String HEADER_SET_COOKIE = "Set-Cookie";
     /** the Cookie header */
     public static final String HEADER_COOKIE = "Cookie";
-    
+
     /**
      * Returns the current <code>HttpSession</code> associated with this
      * request or, if there is no current session and <code>create</code> is
@@ -130,11 +129,11 @@
      * @see #getSession(boolean)
      */
     public HttpSession getSession();
-    
+
     /** Gets a header based the header name passed in.
      * @param name The name of the header to get
      * @return The value of the header
-     */  
+     */
     public String getHeader(String name);
 
     /** Gets a form parameter based on the name passed in.
@@ -142,7 +141,7 @@
      * @return The value of the parameter
      */
     public String getFormParameter(String name);
-    
+
     /**
      * Gets all the form parameters
      * @return All the form parameters
@@ -173,12 +172,12 @@
      * CONNECT = 7
      * UNSUPPORTED = 8
      * @return The integer value of the method
-     */ 
+     */
     public int getMethod();
 
     /** Gets the URI for the current URL page.
      * @return The URI
-     */ 
+     */
     public java.net.URI getURI();
 
     int getContentLength();

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.httpd;
+package org.apache.openejb.server.httpd;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInput;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpResponse.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpResponse.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpResponse.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpResponse.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.httpd;
+package org.apache.openejb.server.httpd;
 
 /**This interface takes care of HTTP Responses.  It sends data back to the browser.
  * 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.httpd;
+package org.apache.openejb.server.httpd;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutput;
@@ -59,7 +59,7 @@
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.openejb.util.JarUtils;
+import org.apache.openejb.util.JarUtils;
 
 /** This class takes care of HTTP Responses.  It sends data back to the browser.
  */

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpServer.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpServer.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpServer.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.httpd;
+package org.apache.openejb.server.httpd;
 
 import org.activeio.xnet.ServerService;
 import org.activeio.xnet.ServiceException;
@@ -50,8 +50,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.openejb.DeploymentIndex;
-import org.openejb.OpenEJBException;
+import org.apache.openejb.DeploymentIndex;
+import org.apache.openejb.OpenEJBException;
 import sun.net.www.protocol.http.HttpURLConnection;
 
 import javax.naming.Context;
@@ -151,7 +151,7 @@
 
         Properties properties = new Properties();
         properties.put(Context.INITIAL_CONTEXT_FACTORY,
-                "org.openejb.naming.GlobalInitialContextFactory");
+                "org.apache.openejb.naming.GlobalInitialContextFactory");
 
     }
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpServerGBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpServerGBean.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpServerGBean.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpServerGBean.java Thu Sep 28 12:39:00 2006
@@ -43,7 +43,7 @@
  * $Id$
  */
 
-package org.openejb.server.httpd;
+package org.apache.openejb.server.httpd;
 
 import java.net.Socket;
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpSession.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpSession.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpSession.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/httpd/HttpSession.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.httpd;
+package org.apache.openejb.server.httpd;
 
 /**
  */

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/soap/SoapHttpListener.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/soap/SoapHttpListener.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/soap/SoapHttpListener.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/soap/SoapHttpListener.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.soap;
+package org.apache.openejb.server.soap;
 
 
 import java.io.IOException;
@@ -54,9 +54,9 @@
 
 import org.apache.geronimo.webservices.SoapHandler;
 import org.apache.geronimo.webservices.WebServiceContainer;
-import org.openejb.server.httpd.HttpListener;
-import org.openejb.server.httpd.HttpRequest;
-import org.openejb.server.httpd.HttpResponse;
+import org.apache.openejb.server.httpd.HttpListener;
+import org.apache.openejb.server.httpd.HttpRequest;
+import org.apache.openejb.server.httpd.HttpResponse;
 
 public class SoapHttpListener implements HttpListener, SoapHandler {
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/soap/SoapHttpListenerGBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/soap/SoapHttpListenerGBean.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/soap/SoapHttpListenerGBean.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/soap/SoapHttpListenerGBean.java Thu Sep 28 12:39:00 2006
@@ -42,13 +42,13 @@
  *
  * $Id$
  */
-package org.openejb.server.soap;
+package org.apache.openejb.server.soap;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.webservices.SoapHandler;
-import org.openejb.server.httpd.HttpRequest;
-import org.openejb.server.httpd.HttpResponse;
+import org.apache.openejb.server.httpd.HttpRequest;
+import org.apache.openejb.server.httpd.HttpResponse;
 
 public class SoapHttpListenerGBean {
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Command.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Command.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Command.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Command.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Exit.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Exit.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Exit.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Exit.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/GroovySh.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/GroovySh.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/GroovySh.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/GroovySh.java Thu Sep 28 12:39:00 2006
@@ -42,13 +42,11 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 
-import java.io.BufferedReader;
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintStream;
 
 //import org.codehaus.groovy.runtime.InvokerHelper;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Help.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Help.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Help.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Help.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Lookup.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Lookup.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Lookup.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Lookup.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -54,8 +54,8 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingEnumeration;
 
-import org.openejb.OpenEJB;
-import org.openejb.naming.IvmContext;
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.naming.IvmContext;
 
 /**
  */
@@ -166,7 +166,7 @@
                 {
                     try
                     {
-                        ClassLoader cl = org.openejb.util.ClasspathUtils.getContextClassLoader();
+                        ClassLoader cl = org.apache.openejb.util.ClasspathUtils.getContextClassLoader();
                         eClass = Class.forName( entry.getClassName(), true, cl );
                     }
                     catch ( Throwable t )

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Ls.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Ls.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Ls.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Ls.java Thu Sep 28 12:39:00 2006
@@ -42,15 +42,11 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-
-import org.openejb.OpenEJB;
-import org.openejb.assembler.Container;
-import org.openejb.assembler.DeploymentInfo;
 
 /**
  */

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Prompt.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Prompt.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Prompt.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Prompt.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Stop.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Stop.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Stop.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Stop.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetCodes.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetCodes.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetCodes.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetCodes.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetInputStream.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetInputStream.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetInputStream.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetInputStream.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetOption.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetOption.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetOption.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetOption.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 
 class TelnetOption {

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetPrintStream.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetPrintStream.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetPrintStream.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetPrintStream.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.OutputStream;
 import java.io.PrintStream;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetServer.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetServer.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TelnetServer.java Thu Sep 28 12:39:00 2006
@@ -42,9 +42,8 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -53,7 +52,6 @@
 import java.util.Properties;
 
 import org.activeio.xnet.ServiceException;
-import org.activeio.xnet.ServiceException;
 
 /**
  */
@@ -62,18 +60,18 @@
 
     public void init(Properties props) throws Exception {
     }
-    
+
     public void service(Socket socket) throws ServiceException, IOException {
         InputStream telnetIn = null;
         PrintStream telnetOut = null;
-        
+
         try {
             InputStream in = socket.getInputStream();
             OutputStream out = socket.getOutputStream();
-            
+
             telnetIn = new TelnetInputStream(in, out);
             telnetOut = new TelnetPrintStream(out);
-            
+
             telnetOut.println("OpenEJB Remote Server Console");
             telnetOut.println("type \'help\' for a list of commands");
 
@@ -82,7 +80,7 @@
 
             TextConsole shell = new TextConsole();
             shell.exec(telnetIn, telnetOut);
-            
+
         } catch (Throwable t) {
             // TODO: log this
             //logger.error(t.getMessage());
@@ -93,7 +91,7 @@
             if (telnetOut != null)
                 telnetOut.close();
             if (socket != null) socket.close();
-            
+
         }
        }
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Test.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Test.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Test.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Test.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.FileInputStream;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TextConsole.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TextConsole.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TextConsole.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/TextConsole.java Thu Sep 28 12:39:00 2006
@@ -42,23 +42,21 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.Vector;
 
-import org.openejb.util.Logger;
+import org.apache.openejb.util.Logger;
 
 /**
  */
 public class TextConsole  {
 
-    Logger logger = Logger.getInstance( "OpenEJB.admin", "org.openejb.server" );
+    Logger logger = Logger.getInstance( "OpenEJB.admin", "org.apache.openejb.server" );
 
     Properties props;
     

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Version.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Version.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Version.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/telnet/Version.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.server.telnet;
+package org.apache.openejb.server.telnet;
 
 import java.io.DataInputStream;
 import java.io.IOException;

Copied: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/service-jar.xml (from r450979, incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/service-jar.xml)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/service-jar.xml?view=diff&rev=450983&p1=incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/service-jar.xml&r1=450979&p2=incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/service-jar.xml&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/service-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/service-jar.xml Thu Sep 28 12:39:00 2006
@@ -84,7 +84,7 @@
 
     <ServiceProvider id="ContainerIndex"
         provider-type="ContainerIndex"
-        class-name="org.openejb.ContainerIndex">
+        class-name="org.apache.openejb.ContainerIndex">
         EJBContainers j2eeType=StatelessSessionBean,* j2eeType=StatefulSessionBean,* j2eeType=EntityBean,*
     </ServiceProvider>
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/AfterBegin.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/AfterBegin.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/AfterBegin.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/AfterBegin.java Thu Sep 28 12:39:00 2006
@@ -45,16 +45,16 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import java.io.Serializable;
 import javax.ejb.SessionSynchronization;
 
 import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.EJBOperation;
-import org.openejb.EjbInvocation;
-import org.openejb.dispatch.VirtualOperation;
-import org.openejb.timer.TimerState;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.dispatch.VirtualOperation;
+import org.apache.openejb.timer.TimerState;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/AfterCompletion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/AfterCompletion.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/AfterCompletion.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/AfterCompletion.java Thu Sep 28 12:39:00 2006
@@ -45,16 +45,16 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import java.io.Serializable;
 import javax.ejb.SessionSynchronization;
 
 import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.EJBOperation;
-import org.openejb.EjbInvocation;
-import org.openejb.dispatch.VirtualOperation;
-import org.openejb.timer.TimerState;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.dispatch.VirtualOperation;
+import org.apache.openejb.timer.TimerState;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/BeforeCompletion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/BeforeCompletion.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/BeforeCompletion.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/BeforeCompletion.java Thu Sep 28 12:39:00 2006
@@ -45,16 +45,16 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import java.io.Serializable;
 import javax.ejb.SessionSynchronization;
 
 import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.EJBOperation;
-import org.openejb.EjbInvocation;
-import org.openejb.dispatch.VirtualOperation;
-import org.openejb.timer.TimerState;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.dispatch.VirtualOperation;
+import org.apache.openejb.timer.TimerState;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/BusinessMethod.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/BusinessMethod.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/BusinessMethod.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/BusinessMethod.java Thu Sep 28 12:39:00 2006
@@ -45,14 +45,14 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 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;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/CreateMethod.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/CreateMethod.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/CreateMethod.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/CreateMethod.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
@@ -55,12 +55,12 @@
 import org.apache.geronimo.interceptor.InvocationResult;
 
 import net.sf.cglib.reflect.FastClass;
-import org.openejb.EJBInstanceContext;
-import org.openejb.EJBInterfaceType;
-import org.openejb.EjbInvocation;
-import org.openejb.EJBOperation;
-import org.openejb.dispatch.MethodSignature;
-import org.openejb.dispatch.VirtualOperation;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EJBInterfaceType;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.dispatch.MethodSignature;
+import org.apache.openejb.dispatch.VirtualOperation;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import javax.ejb.EnterpriseBean;
 import javax.ejb.SessionContext;
@@ -59,24 +59,24 @@
 import org.apache.geronimo.interceptor.Invocation;
 import org.apache.geronimo.interceptor.InvocationResult;
 import org.apache.geronimo.timer.PersistentTimer;
-import org.openejb.CallbackMethod;
-import org.openejb.ConnectionTrackingInterceptor;
-import org.openejb.EJBInstanceContext;
-import org.openejb.EjbCallbackInvocation;
-import org.openejb.ExtendedEjbDeployment;
-import org.openejb.StatefulEjbContainer;
-import org.openejb.SystemExceptionInterceptor;
-import org.openejb.cluster.server.ClusteredInstanceInterceptor;
-import org.openejb.dispatch.DispatchInterceptor;
-import org.openejb.naming.ComponentContextInterceptor;
-import org.openejb.security.DefaultSubjectInterceptor;
-import org.openejb.security.EJBIdentityInterceptor;
-import org.openejb.security.EjbRunAsInterceptor;
-import org.openejb.security.EjbSecurityInterceptor;
-import org.openejb.security.PolicyContextHandlerEJBInterceptor;
-import org.openejb.transaction.DefaultUserTransaction;
-import org.openejb.transaction.TransactionPolicyInterceptor;
-import org.openejb.transaction.TransactionContextInterceptor;
+import org.apache.openejb.CallbackMethod;
+import org.apache.openejb.ConnectionTrackingInterceptor;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EjbCallbackInvocation;
+import org.apache.openejb.ExtendedEjbDeployment;
+import org.apache.openejb.StatefulEjbContainer;
+import org.apache.openejb.SystemExceptionInterceptor;
+import org.apache.openejb.cluster.server.ClusteredInstanceInterceptor;
+import org.apache.openejb.dispatch.DispatchInterceptor;
+import org.apache.openejb.naming.ComponentContextInterceptor;
+import org.apache.openejb.security.DefaultSubjectInterceptor;
+import org.apache.openejb.security.EJBIdentityInterceptor;
+import org.apache.openejb.security.EjbRunAsInterceptor;
+import org.apache.openejb.security.EjbSecurityInterceptor;
+import org.apache.openejb.security.PolicyContextHandlerEJBInterceptor;
+import org.apache.openejb.transaction.DefaultUserTransaction;
+import org.apache.openejb.transaction.TransactionPolicyInterceptor;
+import org.apache.openejb.transaction.TransactionContextInterceptor;
 
 
 /**

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainerGBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainerGBean.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainerGBean.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainerGBean.java Thu Sep 28 12:39:00 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import javax.transaction.TransactionManager;
 
@@ -22,7 +22,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
-import org.openejb.StatefulEjbContainer;
+import org.apache.openejb.StatefulEjbContainer;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/RemoveMethod.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/RemoveMethod.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/RemoveMethod.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/RemoveMethod.java Thu Sep 28 12:39:00 2006
@@ -45,13 +45,13 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import org.apache.geronimo.interceptor.InvocationResult;
-import org.openejb.EjbInvocation;
-import org.openejb.EJBOperation;
-import org.openejb.dispatch.MethodSignature;
-import org.openejb.dispatch.AbstractMethodOperation;
+import org.apache.openejb.EjbInvocation;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.dispatch.MethodSignature;
+import org.apache.openejb.dispatch.AbstractMethodOperation;
 
 /**
  * Virtual operation handling removal of a stateful session bean instance instance.

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulCallbackInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulCallbackInterceptor.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulCallbackInterceptor.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulCallbackInterceptor.java Thu Sep 28 12:39:00 2006
@@ -42,16 +42,16 @@
  *
  * $Id$
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import org.apache.geronimo.interceptor.Interceptor;
 import org.apache.geronimo.interceptor.Invocation;
 import org.apache.geronimo.interceptor.InvocationResult;
-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 javax.ejb.EnterpriseBean;
 import javax.ejb.SessionBean;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceContext.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceContext.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceContext.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import javax.ejb.SessionBean;
 import javax.transaction.Transaction;
@@ -54,14 +54,14 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openejb.AbstractInstanceContext;
-import org.openejb.EJBContextImpl;
-import org.openejb.EJBOperation;
-import org.openejb.StatefulEjbContainer;
-import org.openejb.StatefulEjbDeployment;
-import org.openejb.cache.InstanceCache;
-import org.openejb.proxy.EJBProxyFactory;
-import org.openejb.util.TransactionUtils;
+import org.apache.openejb.AbstractInstanceContext;
+import org.apache.openejb.EJBContextImpl;
+import org.apache.openejb.EJBOperation;
+import org.apache.openejb.StatefulEjbContainer;
+import org.apache.openejb.StatefulEjbDeployment;
+import org.apache.openejb.cache.InstanceCache;
+import org.apache.openejb.proxy.EJBProxyFactory;
+import org.apache.openejb.util.TransactionUtils;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceContextFactory.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceContextFactory.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceContextFactory.java Thu Sep 28 12:39:00 2006
@@ -45,18 +45,18 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import java.io.Serializable;
 import javax.ejb.SessionBean;
 
-import org.openejb.EJBInstanceContext;
-import org.openejb.EJBInstanceFactory;
-import org.openejb.EJBInstanceFactoryImpl;
-import org.openejb.InstanceContextFactory;
-import org.openejb.StatefulEjbContainer;
-import org.openejb.StatefulEjbDeployment;
-import org.openejb.proxy.EJBProxyFactory;
+import org.apache.openejb.EJBInstanceContext;
+import org.apache.openejb.EJBInstanceFactory;
+import org.apache.openejb.EJBInstanceFactoryImpl;
+import org.apache.openejb.InstanceContextFactory;
+import org.apache.openejb.StatefulEjbContainer;
+import org.apache.openejb.StatefulEjbDeployment;
+import org.apache.openejb.proxy.EJBProxyFactory;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceFactory.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceFactory.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/StatefulInstanceFactory.java Thu Sep 28 12:39:00 2006
@@ -45,14 +45,14 @@
  *
  * ====================================================================
  */
-package org.openejb.sfsb;
+package org.apache.openejb.sfsb;
 
 import java.io.Serializable;
 import javax.naming.Context;
 
 import org.apache.geronimo.naming.java.RootContext;
-import org.openejb.InstanceContextFactory;
-import org.openejb.cache.InstanceFactory;
+import org.apache.openejb.InstanceContextFactory;
+import org.apache.openejb.cache.InstanceFactory;
 
 
 /**