svn commit: r450640 [3/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/InvalidateReferenceException.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InvalidateReferenceException.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InvalidateReferenceException.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InvalidateReferenceException.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb;
+package org.apache.openejb;
 
 public class InvalidateReferenceException extends ApplicationException {
 

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/NotReentrantException.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/NotReentrantException.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/NotReentrantException.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/NotReentrantException.java Wed Sep 27 16:58:13 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb;
+package org.apache.openejb;
 
 import java.rmi.RemoteException;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/NotReentrantLocalException.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/NotReentrantLocalException.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/NotReentrantLocalException.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/NotReentrantLocalException.java Wed Sep 27 16:58:13 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb;
+package org.apache.openejb;
 
 import javax.ejb.EJBException;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java Wed Sep 27 16:58:13 2006
@@ -1,14 +1,14 @@
-package org.openejb;
+package org.apache.openejb;
 
-import org.openejb.loader.SystemInstance;
-import org.openejb.spi.ApplicationServer;
-import org.openejb.spi.Assembler;
-import org.openejb.spi.ContainerSystem;
-import org.openejb.spi.SecurityService;
-import org.openejb.util.JarUtils;
-import org.openejb.util.Logger;
-import org.openejb.util.Messages;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ApplicationServer;
+import org.apache.openejb.spi.Assembler;
+import org.apache.openejb.spi.ContainerSystem;
+import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.util.JarUtils;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.SafeToolkit;
 
 import javax.transaction.TransactionManager;
 import java.net.URL;
@@ -24,11 +24,11 @@
     }
 
     public static class Instance {
-        private static Messages messages = new Messages("org.openejb.util.resources");
+        private static Messages messages = new Messages("org.apache.openejb.util.resources");
 
         /**
          * 1 usage
-         * org.openejb.core.ivm.naming.InitContextFactory
+         * org.apache.openejb.core.ivm.naming.InitContextFactory
          */
         public Instance(Properties props) throws OpenEJBException {
             this(props, null);
@@ -42,7 +42,7 @@
 
             Logger.initialize(initProps);
 
-            Logger logger = Logger.getInstance("OpenEJB.startup", "org.openejb.util.resources");
+            Logger logger = Logger.getInstance("OpenEJB.startup", "org.apache.openejb.util.resources");
 
             try {
                 SystemInstance.init(initProps);
@@ -89,10 +89,10 @@
             SafeToolkit toolkit = SafeToolkit.getToolkit("OpenEJB");
 
             /* Uses the EnvProps.ASSEMBLER property to obtain the Assembler impl.
-               Default is org.openejb.assembler.classic.Assembler */
+               Default is org.apache.openejb.assembler.classic.Assembler */
             String className = props.getProperty(EnvProps.ASSEMBLER);
             if (className == null) {
-                className = props.getProperty("openejb.assembler", "org.openejb.assembler.classic.Assembler");
+                className = props.getProperty("openejb.assembler", "org.apache.openejb.assembler.classic.Assembler");
             } else {
                 logger.i18n.warning("startup.deprecatedPropertyName", EnvProps.ASSEMBLER);
             }
@@ -230,14 +230,14 @@
 
     /**
      * 1 usage
-     * org.openejb.core.ivm.naming.InitContextFactory
+     * org.apache.openejb.core.ivm.naming.InitContextFactory
      */
     public static void init(Properties props) throws OpenEJBException {
         init(props, null);
     }
 
-    private static Messages messages = new Messages("org.openejb.util.resources");
-    private static Logger logger = Logger.getInstance("OpenEJB.startup", "org.openejb.util.resources");
+    private static Messages messages = new Messages("org.apache.openejb.util.resources");
+    private static Logger logger = Logger.getInstance("OpenEJB.startup", "org.apache.openejb.util.resources");
 
     /**
      * 2 usages

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

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

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/RpcEjbDeployment.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/RpcEjbDeployment.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/RpcEjbDeployment.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/RpcEjbDeployment.java Wed Sep 27 16:58:13 2006
@@ -45,16 +45,15 @@
  *
  * ====================================================================
  */
-package org.openejb;
+package org.apache.openejb;
 
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import javax.ejb.EJBHome;
 import javax.ejb.EJBLocalHome;
 import javax.ejb.EJBLocalObject;
 import javax.ejb.EJBObject;
 
-import org.openejb.proxy.ProxyInfo;
+import org.apache.openejb.proxy.ProxyInfo;
 
 /**
  * Interface exposed by server side EJB deployment to allow the interceptor

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/RpcSignatureIndexBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/RpcSignatureIndexBuilder.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/RpcSignatureIndexBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/RpcSignatureIndexBuilder.java Wed Sep 27 16:58:13 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb;
+package org.apache.openejb;
 
 import java.util.TreeSet;
 import java.lang.reflect.Method;
@@ -54,8 +54,8 @@
 import javax.ejb.SessionBean;
 import javax.ejb.SessionContext;
 
-import org.openejb.proxy.ProxyInfo;
-import org.openejb.dispatch.InterfaceMethodSignature;
+import org.apache.openejb.proxy.ProxyInfo;
+import org.apache.openejb.dispatch.InterfaceMethodSignature;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/SignatureIndexBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/SignatureIndexBuilder.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/SignatureIndexBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/SignatureIndexBuilder.java Wed Sep 27 16:58:13 2006
@@ -42,9 +42,9 @@
  *
  * $Id$
  */
-package org.openejb;
+package org.apache.openejb;
 
-import org.openejb.dispatch.InterfaceMethodSignature;
+import org.apache.openejb.dispatch.InterfaceMethodSignature;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbContainer.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbContainer.java Wed Sep 27 16:58:13 2006
@@ -42,12 +42,12 @@
  *
  * $Id$
  */
-package org.openejb;
+package org.apache.openejb;
 
 import javax.ejb.SessionContext;
 
-import org.openejb.EjbContainer;
-import org.openejb.EJBInstanceContext;
+import org.apache.openejb.EjbContainer;
+import org.apache.openejb.EJBInstanceContext;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java Wed Sep 27 16:58:13 2006
@@ -45,21 +45,21 @@
  *
  * ====================================================================
  */
-package org.openejb;
+package org.apache.openejb;
 
 import org.apache.geronimo.timer.PersistenceException;
-import org.openejb.cache.InstanceCache;
-import org.openejb.cache.SimpleInstanceCache;
-import org.openejb.dispatch.InterfaceMethodSignature;
-import org.openejb.dispatch.MethodSignature;
-import org.openejb.dispatch.VirtualOperation;
-import org.openejb.proxy.ProxyInfo;
-import org.openejb.sfsb.BusinessMethod;
-import org.openejb.sfsb.CreateMethod;
-import org.openejb.sfsb.RemoveMethod;
-import org.openejb.sfsb.StatefulInstanceContextFactory;
-import org.openejb.sfsb.StatefulInstanceFactory;
-import org.openejb.util.Index;
+import org.apache.openejb.cache.InstanceCache;
+import org.apache.openejb.cache.SimpleInstanceCache;
+import org.apache.openejb.dispatch.InterfaceMethodSignature;
+import org.apache.openejb.dispatch.MethodSignature;
+import org.apache.openejb.dispatch.VirtualOperation;
+import org.apache.openejb.proxy.ProxyInfo;
+import org.apache.openejb.sfsb.BusinessMethod;
+import org.apache.openejb.sfsb.CreateMethod;
+import org.apache.openejb.sfsb.RemoveMethod;
+import org.apache.openejb.sfsb.StatefulInstanceContextFactory;
+import org.apache.openejb.sfsb.StatefulInstanceFactory;
+import org.apache.openejb.util.Index;
 
 import javax.security.auth.Subject;
 import java.util.Iterator;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java Wed Sep 27 16:58:13 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb;
+package org.apache.openejb;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatelessEjbContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatelessEjbContainer.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatelessEjbContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatelessEjbContainer.java Wed Sep 27 16:58:13 2006
@@ -42,12 +42,12 @@
  *
  * $Id$
  */
-package org.openejb;
+package org.apache.openejb;
 
 import javax.ejb.SessionContext;
 
-import org.openejb.EjbContainer;
-import org.openejb.EJBInstanceContext;
+import org.apache.openejb.EjbContainer;
+import org.apache.openejb.EJBInstanceContext;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatelessEjbDeployment.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatelessEjbDeployment.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatelessEjbDeployment.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/StatelessEjbDeployment.java Wed Sep 27 16:58:13 2006
@@ -45,21 +45,21 @@
  *
  * ====================================================================
  */
-package org.openejb;
+package org.apache.openejb;
 
-import org.openejb.cache.InstanceFactory;
-import org.openejb.cache.InstancePool;
-import org.openejb.dispatch.EJBTimeoutOperation;
-import org.openejb.dispatch.InterfaceMethodSignature;
-import org.openejb.dispatch.MethodSignature;
-import org.openejb.dispatch.VirtualOperation;
-import org.openejb.proxy.ProxyInfo;
-import org.openejb.slsb.BusinessMethod;
-import org.openejb.slsb.CreateMethod;
-import org.openejb.slsb.StatelessInstanceContextFactory;
-import org.openejb.slsb.StatelessInstanceFactory;
-import org.openejb.util.SoftLimitedInstancePool;
-import org.openejb.util.Index;
+import org.apache.openejb.cache.InstanceFactory;
+import org.apache.openejb.cache.InstancePool;
+import org.apache.openejb.dispatch.EJBTimeoutOperation;
+import org.apache.openejb.dispatch.InterfaceMethodSignature;
+import org.apache.openejb.dispatch.MethodSignature;
+import org.apache.openejb.dispatch.VirtualOperation;
+import org.apache.openejb.proxy.ProxyInfo;
+import org.apache.openejb.slsb.BusinessMethod;
+import org.apache.openejb.slsb.CreateMethod;
+import org.apache.openejb.slsb.StatelessInstanceContextFactory;
+import org.apache.openejb.slsb.StatelessInstanceFactory;
+import org.apache.openejb.util.SoftLimitedInstancePool;
+import org.apache.openejb.util.Index;
 
 import javax.ejb.Handle;
 import javax.ejb.TimedObject;

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/SystemExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/SystemExceptionInterceptor.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/SystemExceptionInterceptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/SystemExceptionInterceptor.java Wed Sep 27 16:58:13 2006
@@ -53,7 +53,7 @@
  *
  * ====================================================================
  */
-package org.openejb;
+package org.apache.openejb;
 
 import org.apache.geronimo.interceptor.Interceptor;
 import org.apache.geronimo.interceptor.Invocation;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java Wed Sep 27 16:58:13 2006
@@ -14,27 +14,27 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.alt.config.sys.Openejb;
-import org.openejb.alt.config.sys.Container;
-import org.openejb.alt.config.sys.Connector;
-import org.openejb.alt.config.ejb.OpenejbJar;
-import org.openejb.alt.config.ejb.EjbDeployment;
-import org.openejb.alt.config.ejb.ResourceLink;
-import org.openejb.OpenEJBException;
-import org.openejb.util.SafeToolkit;
-import org.openejb.util.Messages;
-import org.openejb.util.Logger;
-import org.openejb.jee.ResourceRef;
+import org.apache.openejb.alt.config.sys.Openejb;
+import org.apache.openejb.alt.config.sys.Container;
+import org.apache.openejb.alt.config.sys.Connector;
+import org.apache.openejb.alt.config.ejb.OpenejbJar;
+import org.apache.openejb.alt.config.ejb.EjbDeployment;
+import org.apache.openejb.alt.config.ejb.ResourceLink;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.util.SafeToolkit;
+import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.jee.ResourceRef;
 
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.HashMap;
 
 public class AutoConfigAndDeploy implements DynamicDeployer {
-    public static Messages messages = new Messages("org.openejb.util.resources");
-    public static Logger logger = Logger.getInstance("OpenEJB", "org.openejb.util.resources");
+    public static Messages messages = new Messages("org.apache.openejb.util.resources");
+    public static Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
 
     private final Openejb config;
     private ClassLoader classLoader;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java Wed Sep 27 16:58:13 2006
@@ -1,16 +1,16 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import java.lang.reflect.Method;
 
-import org.openejb.jee.ResourceRef;
-import org.openejb.OpenEJBException;
-import org.openejb.alt.config.ejb.EjbDeployment;
-import org.openejb.alt.config.ejb.OpenejbJar;
-import org.openejb.alt.config.ejb.ResourceLink;
-import org.openejb.alt.config.sys.Connector;
-import org.openejb.alt.config.sys.Container;
-import org.openejb.alt.config.sys.Openejb;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.jee.ResourceRef;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.ejb.EjbDeployment;
+import org.apache.openejb.alt.config.ejb.OpenejbJar;
+import org.apache.openejb.alt.config.ejb.ResourceLink;
+import org.apache.openejb.alt.config.sys.Connector;
+import org.apache.openejb.alt.config.sys.Container;
+import org.apache.openejb.alt.config.sys.Openejb;
+import org.apache.openejb.util.SafeToolkit;
 
 public class AutoDeployer implements DynamicDeployer {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java Wed Sep 27 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.jee.ResourceRef;
+import org.apache.openejb.jee.ResourceRef;
 
 public interface Bean {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigUtils.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigUtils.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigUtils.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigUtils.java Wed Sep 27 16:58:13 2006
@@ -1,35 +1,30 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
-import org.openejb.OpenEJBException;
-import org.openejb.alt.config.sys.Deployments;
-import org.openejb.alt.config.sys.Openejb;
-import org.openejb.loader.SystemInstance;
-import org.openejb.util.Logger;
-import org.openejb.util.Messages;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.sys.Deployments;
+import org.apache.openejb.alt.config.sys.Openejb;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.Reader;
 import java.io.Writer;
 import java.net.URL;
-import java.net.UnknownHostException;
-import java.net.URLClassLoader;
-import java.net.URI;
 import java.util.Enumeration;
 import java.util.Properties;
 
 public class ConfigUtils {
 
-    public static Messages messages = new Messages("org.openejb.util.resources");
-    public static Logger logger = Logger.getInstance("OpenEJB", "org.openejb.util.resources");
+    public static Messages messages = new Messages("org.apache.openejb.util.resources");
+    public static Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
 
     public static Openejb readConfig(String confFile) throws OpenEJBException {
         return (Openejb) Unmarshaller.unmarshal(Openejb.class, confFile);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java Wed Sep 27 16:58:13 2006
@@ -1,41 +1,41 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.OpenEJBException;
-import org.openejb.alt.config.ejb.EjbDeployment;
-import org.openejb.alt.config.sys.ConnectionManager;
-import org.openejb.alt.config.sys.Connector;
-import org.openejb.alt.config.sys.Container;
-import org.openejb.alt.config.sys.JndiProvider;
-import org.openejb.alt.config.sys.Openejb;
-import org.openejb.alt.config.sys.ProxyFactory;
-import org.openejb.alt.config.sys.SecurityService;
-import org.openejb.alt.config.sys.ServiceProvider;
-import org.openejb.alt.config.sys.TransactionService;
-import org.openejb.alt.config.sys.Deployments;
-import org.openejb.assembler.classic.ConnectionManagerInfo;
-import org.openejb.assembler.classic.ConnectorInfo;
-import org.openejb.assembler.classic.ContainerInfo;
-import org.openejb.assembler.classic.ContainerSystemInfo;
-import org.openejb.assembler.classic.EjbJarInfo;
-import org.openejb.assembler.classic.EnterpriseBeanInfo;
-import org.openejb.assembler.classic.EntityBeanInfo;
-import org.openejb.assembler.classic.EntityContainerInfo;
-import org.openejb.assembler.classic.FacilitiesInfo;
-import org.openejb.assembler.classic.IntraVmServerInfo;
-import org.openejb.assembler.classic.JndiContextInfo;
-import org.openejb.assembler.classic.ManagedConnectionFactoryInfo;
-import org.openejb.assembler.classic.MethodPermissionInfo;
-import org.openejb.assembler.classic.MethodTransactionInfo;
-import org.openejb.assembler.classic.OpenEjbConfiguration;
-import org.openejb.assembler.classic.OpenEjbConfigurationFactory;
-import org.openejb.assembler.classic.RoleMappingInfo;
-import org.openejb.assembler.classic.SecurityRoleInfo;
-import org.openejb.assembler.classic.SecurityServiceInfo;
-import org.openejb.assembler.classic.StatefulSessionContainerInfo;
-import org.openejb.assembler.classic.StatelessSessionContainerInfo;
-import org.openejb.assembler.classic.TransactionServiceInfo;
-import org.openejb.util.Logger;
-import org.openejb.util.Messages;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.ejb.EjbDeployment;
+import org.apache.openejb.alt.config.sys.ConnectionManager;
+import org.apache.openejb.alt.config.sys.Connector;
+import org.apache.openejb.alt.config.sys.Container;
+import org.apache.openejb.alt.config.sys.JndiProvider;
+import org.apache.openejb.alt.config.sys.Openejb;
+import org.apache.openejb.alt.config.sys.ProxyFactory;
+import org.apache.openejb.alt.config.sys.SecurityService;
+import org.apache.openejb.alt.config.sys.ServiceProvider;
+import org.apache.openejb.alt.config.sys.TransactionService;
+import org.apache.openejb.alt.config.sys.Deployments;
+import org.apache.openejb.assembler.classic.ConnectionManagerInfo;
+import org.apache.openejb.assembler.classic.ConnectorInfo;
+import org.apache.openejb.assembler.classic.ContainerInfo;
+import org.apache.openejb.assembler.classic.ContainerSystemInfo;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
+import org.apache.openejb.assembler.classic.EntityBeanInfo;
+import org.apache.openejb.assembler.classic.EntityContainerInfo;
+import org.apache.openejb.assembler.classic.FacilitiesInfo;
+import org.apache.openejb.assembler.classic.IntraVmServerInfo;
+import org.apache.openejb.assembler.classic.JndiContextInfo;
+import org.apache.openejb.assembler.classic.ManagedConnectionFactoryInfo;
+import org.apache.openejb.assembler.classic.MethodPermissionInfo;
+import org.apache.openejb.assembler.classic.MethodTransactionInfo;
+import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
+import org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory;
+import org.apache.openejb.assembler.classic.RoleMappingInfo;
+import org.apache.openejb.assembler.classic.SecurityRoleInfo;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.StatefulSessionContainerInfo;
+import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -47,8 +47,8 @@
 
 public class ConfigurationFactory implements OpenEjbConfigurationFactory, ProviderDefaults {
 
-    public static final Logger logger = Logger.getInstance("OpenEJB.startup", "org.openejb.alt.config.rules");
-    protected static final Messages messages = new Messages("org.openejb.alt.config.rules");
+    public static final Logger logger = Logger.getInstance("OpenEJB.startup", "org.apache.openejb.alt.config.rules");
+    protected static final Messages messages = new Messages("org.apache.openejb.alt.config.rules");
 
     private String configLocation = "";
 

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

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import java.io.DataInputStream;
 import java.io.File;
@@ -15,26 +15,26 @@
 
 import javax.ejb.Stateless;
 
-import org.openejb.OpenEJBException;
-import org.openejb.alt.config.ejb.EjbDeployment;
-import org.openejb.alt.config.ejb.MethodParams;
-import org.openejb.alt.config.ejb.OpenejbJar;
-import org.openejb.alt.config.ejb.QueryMethod;
-import org.openejb.alt.config.ejb.ResourceLink;
-import org.openejb.alt.config.sys.Connector;
-import org.openejb.alt.config.sys.Container;
-import org.openejb.alt.config.sys.Openejb;
-import org.openejb.jee.ResourceRef;
-import org.openejb.loader.SystemInstance;
-import org.openejb.util.JarUtils;
-import org.openejb.util.Logger;
-import org.openejb.util.Messages;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.ejb.EjbDeployment;
+import org.apache.openejb.alt.config.ejb.MethodParams;
+import org.apache.openejb.alt.config.ejb.OpenejbJar;
+import org.apache.openejb.alt.config.ejb.QueryMethod;
+import org.apache.openejb.alt.config.ejb.ResourceLink;
+import org.apache.openejb.alt.config.sys.Connector;
+import org.apache.openejb.alt.config.sys.Container;
+import org.apache.openejb.alt.config.sys.Openejb;
+import org.apache.openejb.jee.ResourceRef;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.JarUtils;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.SafeToolkit;
 
 public class Deploy {
-    private static final String helpBase = "META-INF/org.openejb.cli/";
+    private static final String helpBase = "META-INF/org.apache.openejb.cli/";
 
-    protected static final Messages _messages = new Messages("org.openejb.alt.util.resources");
+    protected static final Messages _messages = new Messages("org.apache.openejb.alt.util.resources");
 
     private static final String DEPLOYMENT_ID_HELP = "\nDeployment ID ----- \n\nA name for the ejb that is unique not only in this jar, but \nin all the jars in the container system.  This name will \nallow OpenEJB to place the bean in a global index and \nreference the bean quickly.  OpenEJB will also use this name \nas the global JNDI name for the Remote Server and the Local \nServer.  Clients of the Remote or Local servers can use this\nname to perform JNDI lookups.\n\nThe other EJB Server's using OpenEJB as the EJB Container \nSystem may also use this name to as part of a global JNDI \nnamespace available to remote application clients.\n\nExample: /my/acme/bugsBunnyBean\n\nSee http://www.openejb.org/deploymentids.html for details.\n";
     private static final String CONTAINER_ID_HELP = "\nContainer ID ----- \n\nThe name of the container where this ejb should run. \nContainers are declared and configured in the openejb.conf\nfile.\n";
@@ -317,7 +317,7 @@
 
     private void promptForOQLForEntityBeans(Class bean, EjbDeployment deployment)
             throws OpenEJBException {
-        org.openejb.alt.config.ejb.Query query;
+        org.apache.openejb.alt.config.ejb.Query query;
         QueryMethod queryMethod;
         MethodParams methodParams;
         boolean instructionsPrinted = false;
@@ -394,7 +394,7 @@
                 }
 
                 if (answer != null && !answer.equals("")) {
-                    query = new org.openejb.alt.config.ejb.Query();
+                    query = new org.apache.openejb.alt.config.ejb.Query();
                     methodParams = new MethodParams();
                     queryMethod = new QueryMethod();
 

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java Wed Sep 27 16:58:13 2006
@@ -14,16 +14,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.alt.config.sys.Deployments;
-import org.openejb.alt.config.ejb.OpenejbJar;
-import org.openejb.loader.FileUtils;
-import org.openejb.loader.SystemInstance;
-import org.openejb.OpenEJBException;
-import org.openejb.OpenEJB;
-import org.openejb.util.Logger;
-import org.openejb.jee.EjbJar;
+import org.apache.openejb.alt.config.sys.Deployments;
+import org.apache.openejb.alt.config.ejb.OpenejbJar;
+import org.apache.openejb.loader.FileUtils;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.jee.EjbJar;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -186,7 +186,7 @@
 
                 EjbSet set = validator.validateJar(ejbJarUtils, classLoader);
                 if (set.hasErrors() || set.hasFailures()) {
-                    Logger logger = Logger.getInstance("OpenEJB.startup.validation", "org.openejb.alt.config.rules");
+                    Logger logger = Logger.getInstance("OpenEJB.startup.validation", "org.apache.openejb.alt.config.rules");
 
                     ValidationError[] errors = set.getErrors();
                     for (int j = 0; j < errors.length; j++) {

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java Wed Sep 27 16:58:13 2006
@@ -14,48 +14,48 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.OpenEJBException;
-import org.openejb.alt.config.ejb.EjbDeployment;
-import org.openejb.alt.config.ejb.ResourceLink;
-import org.openejb.assembler.classic.EjbJarInfo;
-import org.openejb.assembler.classic.EjbLocalReferenceInfo;
-import org.openejb.assembler.classic.EjbReferenceInfo;
-import org.openejb.assembler.classic.EjbReferenceLocationInfo;
-import org.openejb.assembler.classic.EnterpriseBeanInfo;
-import org.openejb.assembler.classic.EntityBeanInfo;
-import org.openejb.assembler.classic.EnvEntryInfo;
-import org.openejb.assembler.classic.JndiEncInfo;
-import org.openejb.assembler.classic.MethodInfo;
-import org.openejb.assembler.classic.MethodPermissionInfo;
-import org.openejb.assembler.classic.MethodTransactionInfo;
-import org.openejb.assembler.classic.QueryInfo;
-import org.openejb.assembler.classic.ResourceReferenceInfo;
-import org.openejb.assembler.classic.SecurityRoleInfo;
-import org.openejb.assembler.classic.SecurityRoleReferenceInfo;
-import org.openejb.assembler.classic.StatefulBeanInfo;
-import org.openejb.assembler.classic.StatelessBeanInfo;
-import org.openejb.assembler.classic.LifecycleCallbackInfo;
-import org.openejb.jee.CmpField;
-import org.openejb.jee.ContainerTransaction;
-import org.openejb.jee.EjbLocalRef;
-import org.openejb.jee.EjbRef;
-import org.openejb.jee.EnterpriseBean;
-import org.openejb.jee.EntityBean;
-import org.openejb.jee.EnvEntry;
-import org.openejb.jee.Icon;
-import org.openejb.jee.Method;
-import org.openejb.jee.MethodParams;
-import org.openejb.jee.MethodPermission;
-import org.openejb.jee.RemoteBean;
-import org.openejb.jee.ResourceRef;
-import org.openejb.jee.SecurityRole;
-import org.openejb.jee.SecurityRoleRef;
-import org.openejb.jee.SessionBean;
-import org.openejb.jee.SessionType;
-import org.openejb.jee.LifecycleCallback;
-import org.openejb.loader.SystemInstance;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.ejb.EjbDeployment;
+import org.apache.openejb.alt.config.ejb.ResourceLink;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.assembler.classic.EjbLocalReferenceInfo;
+import org.apache.openejb.assembler.classic.EjbReferenceInfo;
+import org.apache.openejb.assembler.classic.EjbReferenceLocationInfo;
+import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
+import org.apache.openejb.assembler.classic.EntityBeanInfo;
+import org.apache.openejb.assembler.classic.EnvEntryInfo;
+import org.apache.openejb.assembler.classic.JndiEncInfo;
+import org.apache.openejb.assembler.classic.MethodInfo;
+import org.apache.openejb.assembler.classic.MethodPermissionInfo;
+import org.apache.openejb.assembler.classic.MethodTransactionInfo;
+import org.apache.openejb.assembler.classic.QueryInfo;
+import org.apache.openejb.assembler.classic.ResourceReferenceInfo;
+import org.apache.openejb.assembler.classic.SecurityRoleInfo;
+import org.apache.openejb.assembler.classic.SecurityRoleReferenceInfo;
+import org.apache.openejb.assembler.classic.StatefulBeanInfo;
+import org.apache.openejb.assembler.classic.StatelessBeanInfo;
+import org.apache.openejb.assembler.classic.LifecycleCallbackInfo;
+import org.apache.openejb.jee.CmpField;
+import org.apache.openejb.jee.ContainerTransaction;
+import org.apache.openejb.jee.EjbLocalRef;
+import org.apache.openejb.jee.EjbRef;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.EntityBean;
+import org.apache.openejb.jee.EnvEntry;
+import org.apache.openejb.jee.Icon;
+import org.apache.openejb.jee.Method;
+import org.apache.openejb.jee.MethodParams;
+import org.apache.openejb.jee.MethodPermission;
+import org.apache.openejb.jee.RemoteBean;
+import org.apache.openejb.jee.ResourceRef;
+import org.apache.openejb.jee.SecurityRole;
+import org.apache.openejb.jee.SecurityRoleRef;
+import org.apache.openejb.jee.SessionBean;
+import org.apache.openejb.jee.SessionType;
+import org.apache.openejb.jee.LifecycleCallback;
+import org.apache.openejb.loader.SystemInstance;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -98,7 +98,7 @@
         List<EnterpriseBeanInfo> beanInfos = new ArrayList<EnterpriseBeanInfo>(ejbds.size());
         for (EnterpriseBean bean : jar.getEjbJar().getEnterpriseBeans()) {
             EnterpriseBeanInfo beanInfo;
-            if (bean instanceof org.openejb.jee.SessionBean) {
+            if (bean instanceof org.apache.openejb.jee.SessionBean) {
                 beanInfo = initSessionBean((SessionBean) bean, ejbds);
             } else {
                 beanInfo = initEntityBean((EntityBean) bean, ejbds);
@@ -447,13 +447,13 @@
 
         if (bean.persistenceType.equalsIgnoreCase("Container")) {
             List<QueryInfo> qi = new ArrayList<QueryInfo>();
-            for (org.openejb.alt.config.ejb.Query q : d.getQuery()) {
+            for (org.apache.openejb.alt.config.ejb.Query q : d.getQuery()) {
                 QueryInfo query = new QueryInfo();
                 query.description = q.getDescription();
                 query.queryStatement = q.getObjectQl().trim();
 
                 MethodInfo method = new MethodInfo();
-                org.openejb.alt.config.ejb.QueryMethod qm = q.getQueryMethod();
+                org.apache.openejb.alt.config.ejb.QueryMethod qm = q.getQueryMethod();
                 method.methodName = qm.getMethodName();
                 method.methodParams = qm.getMethodParams().getMethodParam().toArray(new String[]{});
                 query.method = method;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarUtils.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarUtils.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarUtils.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarUtils.java Wed Sep 27 16:58:13 2006
@@ -1,11 +1,9 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.Writer;
 import java.io.FileNotFoundException;
 import java.util.Properties;
 import java.util.Vector;
@@ -16,22 +14,20 @@
 
 import org.exolab.castor.util.Configuration;
 import org.exolab.castor.util.LocalConfiguration;
-import org.exolab.castor.xml.MarshalException;
-import org.exolab.castor.xml.ValidationException;
-import org.openejb.OpenEJBException;
-import org.openejb.jee.EjbJar;
-import org.openejb.jee.EnterpriseBean;
-import org.openejb.alt.config.ejb.OpenejbJar;
-import org.openejb.alt.config.sys.Container;
-import org.openejb.loader.SystemInstance;
-import org.openejb.util.JarUtils;
-import org.openejb.util.Logger;
-import org.openejb.util.Messages;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.alt.config.ejb.OpenejbJar;
+import org.apache.openejb.alt.config.sys.Container;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.JarUtils;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
 
 public class EjbJarUtils {
 
-    public static final Messages messages = new Messages("org.openejb.util.resources");
-    public static final Logger logger = Logger.getInstance("OpenEJB.startup", "org.openejb.util.resources");
+    public static final Messages messages = new Messages("org.apache.openejb.util.resources");
+    public static final Logger logger = Logger.getInstance("OpenEJB.startup", "org.apache.openejb.util.resources");
 
     private final EjbJar ejbJar;
     private final String jarLocation;
@@ -243,10 +239,10 @@
     public Bean[] getBeans() {
         List<Bean> beans = new ArrayList<Bean>();
         for (EnterpriseBean enterpriseBean : ejbJar.getEnterpriseBeans()) {
-            if (enterpriseBean instanceof org.openejb.jee.EntityBean) {
-                beans.add(new EntityBean((org.openejb.jee.EntityBean) enterpriseBean));
-            } else if (enterpriseBean instanceof org.openejb.jee.SessionBean) {
-                beans.add(new SessionBean((org.openejb.jee.SessionBean) enterpriseBean));
+            if (enterpriseBean instanceof org.apache.openejb.jee.EntityBean) {
+                beans.add(new EntityBean((org.apache.openejb.jee.EntityBean) enterpriseBean));
+            } else if (enterpriseBean instanceof org.apache.openejb.jee.SessionBean) {
+                beans.add(new SessionBean((org.apache.openejb.jee.SessionBean) enterpriseBean));
             }
         }
         return beans.toArray(new Bean[]{});

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbSet.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbSet.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbSet.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbSet.java Wed Sep 27 16:58:13 2006
@@ -1,8 +1,8 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import java.util.Vector;
 
-import org.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EjbJar;
 
 public class EjbSet {
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import java.io.InputStream;
 import java.io.File;
@@ -8,23 +8,23 @@
 import java.util.Properties;
 import java.util.Vector;
 
-import org.openejb.OpenEJBException;
-import org.openejb.jee.EjbRef;
-import org.openejb.jee.EnvEntry;
-import org.openejb.jee.SecurityRoleRef;
-import org.openejb.jee.ResourceRef;
-import org.openejb.jee.EjbLocalRef;
-import org.openejb.loader.SystemInstance;
-import org.openejb.alt.config.rules.CheckClasses;
-import org.openejb.alt.config.rules.CheckMethods;
-import org.openejb.util.JarUtils;
-import org.openejb.util.Messages;
-import org.openejb.util.Logger;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbRef;
+import org.apache.openejb.jee.EnvEntry;
+import org.apache.openejb.jee.SecurityRoleRef;
+import org.apache.openejb.jee.ResourceRef;
+import org.apache.openejb.jee.EjbLocalRef;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.alt.config.rules.CheckClasses;
+import org.apache.openejb.alt.config.rules.CheckMethods;
+import org.apache.openejb.util.JarUtils;
+import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.Logger;
 
 public class EjbValidator {
-    private static final String helpBase = "META-INF/org.openejb.cli/";
+    private static final String helpBase = "META-INF/org.apache.openejb.cli/";
 
-    protected static final Messages _messages = new Messages("org.openejb.alt.config.rules");
+    protected static final Messages _messages = new Messages("org.apache.openejb.alt.config.rules");
 
     int LEVEL = 2;
     boolean PRINT_DETAILS = false;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EntityBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EntityBean.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EntityBean.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EntityBean.java Wed Sep 27 16:58:13 2006
@@ -1,14 +1,14 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.jee.PersistenceType;
-import org.openejb.jee.ResourceRef;
+import org.apache.openejb.jee.PersistenceType;
+import org.apache.openejb.jee.ResourceRef;
 
 public class EntityBean implements Bean {
 
-    org.openejb.jee.EntityBean bean;
+    org.apache.openejb.jee.EntityBean bean;
     String type;
 
-    EntityBean(org.openejb.jee.EntityBean bean) {
+    EntityBean(org.apache.openejb.jee.EntityBean bean) {
         this.bean = bean;
         if (bean.getPersistenceType() == PersistenceType.CONTAINER) {
             type = CMP_ENTITY;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/JaxbUnmarshaller.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/JaxbUnmarshaller.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/JaxbUnmarshaller.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/JaxbUnmarshaller.java Wed Sep 27 16:58:13 2006
@@ -14,10 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.OpenEJBException;
-import org.openejb.util.JarUtils;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.util.JarUtils;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Service.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Service.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Service.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Service.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 public interface Service {
     public java.lang.String getContent();

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ServiceUtils.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ServiceUtils.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ServiceUtils.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ServiceUtils.java Wed Sep 27 16:58:13 2006
@@ -1,12 +1,12 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
-import org.openejb.OpenEJBException;
-import org.openejb.alt.config.sys.ServiceProvider;
-import org.openejb.alt.config.sys.ServicesJar;
-import org.openejb.util.Logger;
-import org.openejb.util.Messages;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.sys.ServiceProvider;
+import org.apache.openejb.alt.config.sys.ServicesJar;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -17,10 +17,10 @@
 
 public class ServiceUtils {
 
-    public static final String defaultProviderURL = "org.openejb";
+    public static final String defaultProviderURL = "org.apache.openejb";
     private static Map loadedServiceJars = new HashMap();
-    public static Messages messages = new Messages("org.openejb.util.resources");
-    public static Logger logger = Logger.getInstance("OpenEJB", "org.openejb.util.resources");
+    public static Messages messages = new Messages("org.apache.openejb.util.resources");
+    public static Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
 
     public static ServiceProvider getServiceProvider(Service service) throws OpenEJBException {
         return getServiceProvider(service.getProvider());

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/SessionBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/SessionBean.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/SessionBean.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/SessionBean.java Wed Sep 27 16:58:13 2006
@@ -1,14 +1,14 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.jee.SessionType;
-import org.openejb.jee.ResourceRef;
+import org.apache.openejb.jee.SessionType;
+import org.apache.openejb.jee.ResourceRef;
 
 public class SessionBean implements Bean {
 
-    org.openejb.jee.SessionBean bean;
+    org.apache.openejb.jee.SessionBean bean;
     String type;
 
-    SessionBean(org.openejb.jee.SessionBean bean) {
+    SessionBean(org.apache.openejb.jee.SessionBean bean) {
         this.bean = bean;
         if (bean.getSessionType() == SessionType.STATEFUL) {
             type = STATEFUL;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/TempCodebase.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/TempCodebase.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/TempCodebase.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/TempCodebase.java Wed Sep 27 16:58:13 2006
@@ -1,8 +1,8 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.OpenEJBException;
-import org.openejb.loader.FileUtils;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.loader.FileUtils;
+import org.apache.openejb.util.SafeToolkit;
 
 import java.util.HashMap;
 import java.net.URL;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Unmarshaller.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Unmarshaller.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Unmarshaller.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Unmarshaller.java Wed Sep 27 16:58:13 2006
@@ -1,9 +1,9 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
-import org.openejb.OpenEJBException;
-import org.openejb.util.JarUtils;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.util.JarUtils;
 
 import java.io.File;
 import java.io.FileInputStream;

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationException.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationException.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationException.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationException.java Wed Sep 27 16:58:13 2006
@@ -1,9 +1,9 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
-import org.openejb.util.Messages;
+import org.apache.openejb.util.Messages;
 
 public class ValidationException extends java.lang.Exception {
-    protected static final Messages messages = new Messages("org.openejb.alt.config.rules");
+    protected static final Messages messages = new Messages("org.apache.openejb.alt.config.rules");
     protected Bean bean;
     protected Object[] details;
     protected String message;

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

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationTable.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationTable.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationTable.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationTable.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.alt.config;
+package org.apache.openejb.alt.config;
 
 import java.io.File;
 import java.net.URL;
@@ -10,9 +10,9 @@
 import java.sql.Statement;
 import java.util.Properties;
 
-import org.openejb.util.JarUtils;
-import org.openejb.ClassLoaderUtil;
-import org.openejb.loader.SystemInstance;
+import org.apache.openejb.util.JarUtils;
+import org.apache.openejb.ClassLoaderUtil;
+import org.apache.openejb.loader.SystemInstance;
 
 public class ValidationTable {
 

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

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/EjbDeployment.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/EjbDeployment.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/EjbDeployment.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/EjbDeployment.java Wed Sep 27 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.openejb.alt.config.ejb;
+package org.apache.openejb.alt.config.ejb;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/MethodParams.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/MethodParams.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/MethodParams.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/MethodParams.java Wed Sep 27 16:58:13 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.alt.config.ejb;
+package org.apache.openejb.alt.config.ejb;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/ObjectFactory.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/ObjectFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/ObjectFactory.java Wed Sep 27 16:58:13 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.alt.config.ejb;
+package org.apache.openejb.alt.config.ejb;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
@@ -26,7 +26,7 @@
 /**
  * This object contains factory methods for each
  * Java content interface and Java element interface
- * generated in the org.openejb.alt.config.ejb package.
+ * generated in the org.apache.openejb.alt.config.ejb package.
  * <p>An ObjectFactory allows you to programatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
@@ -45,7 +45,7 @@
     private final static QName _Description_QNAME = new QName("http://www.openejb.org/openejb-jar/1.1", "description");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openejb.alt.config.ejb
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.openejb.alt.config.ejb
      */
     public ObjectFactory() {
     }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/OpenejbJar.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/OpenejbJar.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/OpenejbJar.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/OpenejbJar.java Wed Sep 27 16:58:13 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.alt.config.ejb;
+package org.apache.openejb.alt.config.ejb;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/Query.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/Query.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/Query.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/Query.java Wed Sep 27 16:58:13 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.alt.config.ejb;
+package org.apache.openejb.alt.config.ejb;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/QueryMethod.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/QueryMethod.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/QueryMethod.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/QueryMethod.java Wed Sep 27 16:58:13 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.alt.config.ejb;
+package org.apache.openejb.alt.config.ejb;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/ResourceLink.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/ResourceLink.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/ResourceLink.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/ResourceLink.java Wed Sep 27 16:58:13 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.alt.config.ejb;
+package org.apache.openejb.alt.config.ejb;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/package-info.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/package-info.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/package-info.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/package-info.java Wed Sep 27 16:58:13 2006
@@ -15,4 +15,4 @@
  *  limitations under the License.
  */
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.openejb.org/openejb-jar/1.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.openejb.alt.config.ejb;
+package org.apache.openejb.alt.config.ejb;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckClasses.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckClasses.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckClasses.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckClasses.java Wed Sep 27 16:58:13 2006
@@ -1,15 +1,14 @@
-package org.openejb.alt.config.rules;
+package org.apache.openejb.alt.config.rules;
 
-import org.openejb.OpenEJBException;
-import org.openejb.alt.config.Bean;
-import org.openejb.alt.config.EjbSet;
-import org.openejb.alt.config.ValidationFailure;
-import org.openejb.alt.config.ValidationRule;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.Bean;
+import org.apache.openejb.alt.config.EjbSet;
+import org.apache.openejb.alt.config.ValidationFailure;
+import org.apache.openejb.alt.config.ValidationRule;
+import org.apache.openejb.util.SafeToolkit;
 
 import javax.ejb.EJBLocalHome;
 import javax.ejb.EJBLocalObject;
-import java.lang.reflect.Method;
 
 public class CheckClasses implements ValidationRule {
 
@@ -116,13 +115,13 @@
 
     public void check_isEjbClass(Bean b) {
 
-        if (b instanceof org.openejb.alt.config.SessionBean) {
+        if (b instanceof org.apache.openejb.alt.config.SessionBean) {
 
             // DMB: Beans in ejb 3 are not required to implement javax.ejb.SessionBean
             // but it would still be nice to think of some sort of check to do here.
             // compareTypes(b, b.getEjbClass(), javax.ejb.SessionBean.class);
 
-        } else if (b instanceof org.openejb.alt.config.EntityBean) {
+        } else if (b instanceof org.apache.openejb.alt.config.EntityBean) {
 
             compareTypes(b, b.getEjbClass(), javax.ejb.EntityBean.class);
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java?view=diff&rev=450640&r1=450506&r2=450640
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/rules/CheckMethods.java Wed Sep 27 16:58:13 2006
@@ -1,14 +1,14 @@
-package org.openejb.alt.config.rules;
+package org.apache.openejb.alt.config.rules;
 
-import org.openejb.OpenEJBException;
-import org.openejb.alt.config.Bean;
-import org.openejb.alt.config.EjbSet;
-import org.openejb.alt.config.EntityBean;
-import org.openejb.alt.config.SessionBean;
-import org.openejb.alt.config.ValidationFailure;
-import org.openejb.alt.config.ValidationRule;
-import org.openejb.alt.config.ValidationWarning;
-import org.openejb.util.SafeToolkit;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.Bean;
+import org.apache.openejb.alt.config.EjbSet;
+import org.apache.openejb.alt.config.EntityBean;
+import org.apache.openejb.alt.config.SessionBean;
+import org.apache.openejb.alt.config.ValidationFailure;
+import org.apache.openejb.alt.config.ValidationRule;
+import org.apache.openejb.alt.config.ValidationWarning;
+import org.apache.openejb.util.SafeToolkit;
 
 import javax.ejb.EJBLocalObject;
 import java.lang.reflect.Method;
@@ -137,7 +137,7 @@
 
     public boolean check_hasCreateMethod(Bean b, Class bean, Class home) {
 
-        if (b instanceof org.openejb.alt.config.SessionBean && !javax.ejb.SessionBean.class.isAssignableFrom(bean)){
+        if (b instanceof org.apache.openejb.alt.config.SessionBean && !javax.ejb.SessionBean.class.isAssignableFrom(bean)){
             // This is a pojo-style bean
             return false;
         }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ClassName.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ClassName.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/ClassName.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/ClassName.java Wed Sep 27 16:58:13 2006
@@ -5,14 +5,9 @@
  * $Id$
  */
 
-package org.openejb.alt.config.sys;
+package org.apache.openejb.alt.config.sys;
 
 //---------------------------------/
-
-import java.io.Serializable;
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
 
 public class ClassName implements java.io.Serializable {