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 [2/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/ja...

Modified: incubator/openejb/trunk/openejb2/etc/project.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/etc/project.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/etc/project.xml (original)
+++ incubator/openejb/trunk/openejb2/etc/project.xml Thu Sep 28 12:39:00 2006
@@ -13,7 +13,7 @@
     <name>OpenEJB</name>
     <id>openejb</id>
     <groupId>openejb</groupId>
-    <package>org.openejb</package>
+    <package>org.apache.openejb</package>
 
     <organization>
         <name>OpenEJB</name>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml Thu Sep 28 12:39:00 2006
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.openejb</groupId>
+        <groupId>org.apache.openejb</groupId>
         <artifactId>modules</artifactId>
         <version>2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -23,7 +23,7 @@
         <!--</dependency>-->
 
         <dependency>
-            <groupId>org.openejb</groupId>
+            <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/corba/security/config/css/CSSConfigEditor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/corba/security/config/css/CSSConfigEditor.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/corba/security/config/css/CSSConfigEditor.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/corba/security/config/css/CSSConfigEditor.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.corba.security.config.css;
+package org.apache.openejb.corba.security.config.css;
 
 import java.util.Iterator;
 import java.util.List;
@@ -68,16 +68,16 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.ClassLoading;
 
-import org.openejb.xbeans.csiv2.css.CSSCompoundSecMechType;
-import org.openejb.xbeans.csiv2.css.CSSCssType;
-import org.openejb.xbeans.csiv2.css.CSSGSSUPDynamicType;
-import org.openejb.xbeans.csiv2.css.CSSGSSUPStaticType;
-import org.openejb.xbeans.csiv2.css.CSSITTPrincipalNameDynamicType;
-import org.openejb.xbeans.csiv2.css.CSSITTPrincipalNameStaticType;
-import org.openejb.xbeans.csiv2.css.CSSSSLType;
-import org.openejb.xbeans.csiv2.css.CSSSasMechType;
-import org.openejb.xbeans.csiv2.css.CSSCssDocument;
-import org.openejb.xbeans.csiv2.tss.TSSAssociationOption;
+import org.apache.openejb.xbeans.csiv2.css.CSSCompoundSecMechType;
+import org.apache.openejb.xbeans.csiv2.css.CSSCssType;
+import org.apache.openejb.xbeans.csiv2.css.CSSGSSUPDynamicType;
+import org.apache.openejb.xbeans.csiv2.css.CSSGSSUPStaticType;
+import org.apache.openejb.xbeans.csiv2.css.CSSITTPrincipalNameDynamicType;
+import org.apache.openejb.xbeans.csiv2.css.CSSITTPrincipalNameStaticType;
+import org.apache.openejb.xbeans.csiv2.css.CSSSSLType;
+import org.apache.openejb.xbeans.csiv2.css.CSSSasMechType;
+import org.apache.openejb.xbeans.csiv2.css.CSSCssDocument;
+import org.apache.openejb.xbeans.csiv2.tss.TSSAssociationOption;
 
 
 /**

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditor.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditor.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditor.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.corba.security.config.tss;
+package org.apache.openejb.corba.security.config.tss;
 
 import java.util.Iterator;
 import java.util.List;
@@ -69,20 +69,20 @@
 import org.omg.CSIIOP.NoDelegation;
 import org.omg.CSIIOP.NoProtection;
 import org.omg.CSIIOP.SimpleDelegation;
-import org.openejb.xbeans.csiv2.tss.TSSAssociationOption;
-import org.openejb.xbeans.csiv2.tss.TSSCompoundSecMechType;
-import org.openejb.xbeans.csiv2.tss.TSSGSSUPType;
-import org.openejb.xbeans.csiv2.tss.TSSGeneralNameType;
-import org.openejb.xbeans.csiv2.tss.TSSGssExportedNameType;
-import org.openejb.xbeans.csiv2.tss.TSSIdentityTokenTypeList;
-import org.openejb.xbeans.csiv2.tss.TSSSSLType;
-import org.openejb.xbeans.csiv2.tss.TSSSasMechType;
-import org.openejb.xbeans.csiv2.tss.TSSTssDocument;
-import org.openejb.xbeans.csiv2.tss.TSSTssType;
+import org.apache.openejb.xbeans.csiv2.tss.TSSAssociationOption;
+import org.apache.openejb.xbeans.csiv2.tss.TSSCompoundSecMechType;
+import org.apache.openejb.xbeans.csiv2.tss.TSSGSSUPType;
+import org.apache.openejb.xbeans.csiv2.tss.TSSGeneralNameType;
+import org.apache.openejb.xbeans.csiv2.tss.TSSGssExportedNameType;
+import org.apache.openejb.xbeans.csiv2.tss.TSSIdentityTokenTypeList;
+import org.apache.openejb.xbeans.csiv2.tss.TSSSSLType;
+import org.apache.openejb.xbeans.csiv2.tss.TSSSasMechType;
+import org.apache.openejb.xbeans.csiv2.tss.TSSTssDocument;
+import org.apache.openejb.xbeans.csiv2.tss.TSSTssType;
 
 
 /**
- * A property editor for {@link org.openejb.corba.security.config.tss.TSSConfig}.
+ * A property editor for {@link org.apache.openejb.corba.security.config.tss.TSSConfig}.
  *
  * @version $Revision$ $Date$
  */
@@ -218,7 +218,7 @@
                 sasMechConfig.addIdentityToken(new TSSITTAnonymous());
             }
             if (identityTokenTypes.isSetITTPrincipalNameGSSUP()) {
-                org.openejb.xbeans.csiv2.tss.TSSITTPrincipalNameGSSUPType ittPrincipalNameGSSUP = identityTokenTypes.getITTPrincipalNameGSSUP();
+                org.apache.openejb.xbeans.csiv2.tss.TSSITTPrincipalNameGSSUPType ittPrincipalNameGSSUP = identityTokenTypes.getITTPrincipalNameGSSUP();
                 String principalClassName = ittPrincipalNameGSSUP.getPrincipalClass();
                 Class principalClass;
                 try {

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/BmpBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/BmpBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/BmpBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/BmpBuilder.java Thu Sep 28 12:39:00 2006
@@ -42,11 +42,11 @@
  *
  * $Id$
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.openejb.BmpEjbDeploymentGBean;
-import org.openejb.BmpEjbContainer;
+import org.apache.openejb.BmpEjbDeploymentGBean;
+import org.apache.openejb.BmpEjbContainer;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/CmpBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/CmpBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/CmpBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/CmpBuilder.java Thu Sep 28 12:39:00 2006
@@ -42,13 +42,13 @@
  *
  * $Id$
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.AbstractName;
-import org.openejb.CmpEjbDeploymentGBean;
-import org.openejb.CmpEjbContainer;
+import org.apache.openejb.CmpEjbDeploymentGBean;
+import org.apache.openejb.CmpEjbContainer;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/CmpSchemaBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/CmpSchemaBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/CmpSchemaBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/CmpSchemaBuilder.java Thu Sep 28 12:39:00 2006
@@ -42,13 +42,13 @@
  *
  * $Id$
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.EJBModule;
 import org.apache.geronimo.kernel.Naming;
-import org.openejb.entity.cmp.ModuleSchema;
+import org.apache.openejb.entity.cmp.ModuleSchema;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/EjbConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/EjbConfiguration.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/EjbConfiguration.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/EjbConfiguration.java Thu Sep 28 12:39:00 2006
@@ -46,7 +46,7 @@
  * ====================================================================
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import javax.enterprise.deploy.model.DeployableObject;
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/EjbConfigurer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/EjbConfigurer.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/EjbConfigurer.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/EjbConfigurer.java Thu Sep 28 12:39:00 2006
@@ -46,7 +46,7 @@
  * ====================================================================
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.ModuleType;

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

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/MdbBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/MdbBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/MdbBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/MdbBuilder.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.util.Set;
 import java.util.SortedMap;
@@ -59,8 +59,8 @@
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder;
 import org.apache.geronimo.security.deploy.DefaultPrincipal;
-import org.openejb.mdb.MdbDeploymentGBean;
-import org.openejb.MdbContainer;
+import org.apache.openejb.mdb.MdbDeploymentGBean;
+import org.apache.openejb.MdbContainer;
 
 
 /**

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbAbstractRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbAbstractRefBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbAbstractRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbAbstractRefBuilder.java Thu Sep 28 12:39:00 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,8 +36,7 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
-import org.apache.xmlbeans.QNameSet;
-import org.openejb.RpcEjbDeployment;
+import org.apache.openejb.RpcEjbDeployment;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbClientRemoteRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbClientRemoteRefBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbClientRemoteRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbClientRemoteRefBuilder.java Thu Sep 28 12:39:00 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.net.UnknownHostException;
 import java.util.Collections;
@@ -28,8 +28,8 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.openejb.client.ServerMetaData;
-import org.openejb.client.naming.RemoteEJBReference;
+import org.apache.openejb.client.ServerMetaData;
+import org.apache.openejb.client.naming.RemoteEJBReference;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java Thu Sep 28 12:39:00 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -41,8 +41,8 @@
 import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
-import org.openejb.RpcEjbDeployment;
-import org.openejb.proxy.EJBProxyReference;
+import org.apache.openejb.RpcEjbDeployment;
+import org.apache.openejb.proxy.EJBProxyReference;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java Thu Sep 28 12:39:00 2006
@@ -46,7 +46,7 @@
  * ====================================================================
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.io.File;
 import java.io.IOException;
@@ -111,15 +111,15 @@
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlDocumentProperties;
-import org.openejb.EJBModuleImplGBean;
-import org.openejb.EjbDeployment;
-import org.openejb.proxy.EJBProxyFactory;
-import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
-import org.openejb.xbeans.ejbjar.OpenejbMessageDrivenBeanType;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-import org.openejb.xbeans.ejbjar.OpenejbSessionBeanType;
-import org.openejb.xbeans.pkgen.EjbKeyGeneratorDocument;
+import org.apache.openejb.EJBModuleImplGBean;
+import org.apache.openejb.EjbDeployment;
+import org.apache.openejb.proxy.EJBProxyFactory;
+import org.apache.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbMessageDrivenBeanType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
+import org.apache.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbSessionBeanType;
+import org.apache.openejb.xbeans.pkgen.EjbKeyGeneratorDocument;
 
 
 /**

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java Thu Sep 28 12:39:00 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -43,9 +43,9 @@
 import org.apache.geronimo.xbeans.j2ee.EjbRefType;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
-import org.openejb.RpcEjbDeployment;
-import org.openejb.corba.proxy.CORBAProxyReference;
-import org.openejb.proxy.EJBProxyReference;
+import org.apache.openejb.RpcEjbDeployment;
+import org.apache.openejb.corba.proxy.CORBAProxyReference;
+import org.apache.openejb.proxy.EJBProxyReference;
 
 /**
  * @version $Revision$ $Date$

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

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/SecureBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/SecureBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/SecureBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/SecureBuilder.java Thu Sep 28 12:39:00 2006
@@ -46,7 +46,7 @@
  * ====================================================================
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import javax.security.auth.Subject;
 

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

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java Thu Sep 28 12:39:00 2006
@@ -45,13 +45,13 @@
  *
  * ====================================================================
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.openejb.StatefulEjbDeploymentGBean;
-import org.openejb.StatefulEjbContainer;
+import org.apache.openejb.StatefulEjbDeploymentGBean;
+import org.apache.openejb.StatefulEjbContainer;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatelessBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatelessBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatelessBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatelessBuilder.java Thu Sep 28 12:39:00 2006
@@ -45,14 +45,14 @@
  *
  * ====================================================================
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.util.List;
 
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.openejb.StatelessEjbDeploymentGBean;
-import org.openejb.StatelessEjbContainer;
+import org.apache.openejb.StatelessEjbDeploymentGBean;
+import org.apache.openejb.StatelessEjbContainer;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/TranqlCmpSchemaBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/TranqlCmpSchemaBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/TranqlCmpSchemaBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/TranqlCmpSchemaBuilder.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -74,35 +74,35 @@
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.Naming;
-import org.openejb.dispatch.MethodSignature;
-import org.openejb.entity.cmp.AutoIncrementTablePrimaryKeyGenerator;
-import org.openejb.entity.cmp.CmpFieldSchema;
-import org.openejb.entity.cmp.CustomPrimaryKeyGenerator;
-import org.openejb.entity.cmp.EntitySchema;
-import org.openejb.entity.cmp.ManyToManyRelationSchema;
-import org.openejb.entity.cmp.ModuleSchema;
-import org.openejb.entity.cmp.OneToManyRelationSchema;
-import org.openejb.entity.cmp.PrimaryKeyGenerator;
-import org.openejb.entity.cmp.QuerySpec;
-import org.openejb.entity.cmp.RelationSchema;
-import org.openejb.entity.cmp.RoleSchema;
-import org.openejb.entity.cmp.SequenceTableKeyGenerator;
-import org.openejb.entity.cmp.SqlPrimaryKeyGenerator;
-import org.openejb.entity.cmp.TranqlModuleCmpEngineGBean;
-import org.openejb.xbeans.ejbjar.OpenejbCmpFieldGroupMappingType;
-import org.openejb.xbeans.ejbjar.OpenejbCmrFieldGroupMappingType;
-import org.openejb.xbeans.ejbjar.OpenejbEjbRelationType;
-import org.openejb.xbeans.ejbjar.OpenejbEjbRelationshipRoleType;
-import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
-import org.openejb.xbeans.ejbjar.OpenejbEntityGroupMappingType;
-import org.openejb.xbeans.ejbjar.OpenejbGroupType;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-import org.openejb.xbeans.ejbjar.OpenejbQueryType;
-import org.openejb.xbeans.pkgen.EjbAutoIncrementTableType;
-import org.openejb.xbeans.pkgen.EjbCustomGeneratorType;
-import org.openejb.xbeans.pkgen.EjbKeyGeneratorType;
-import org.openejb.xbeans.pkgen.EjbSequenceTableType;
-import org.openejb.xbeans.pkgen.EjbSqlGeneratorType;
+import org.apache.openejb.dispatch.MethodSignature;
+import org.apache.openejb.entity.cmp.AutoIncrementTablePrimaryKeyGenerator;
+import org.apache.openejb.entity.cmp.CmpFieldSchema;
+import org.apache.openejb.entity.cmp.CustomPrimaryKeyGenerator;
+import org.apache.openejb.entity.cmp.EntitySchema;
+import org.apache.openejb.entity.cmp.ManyToManyRelationSchema;
+import org.apache.openejb.entity.cmp.ModuleSchema;
+import org.apache.openejb.entity.cmp.OneToManyRelationSchema;
+import org.apache.openejb.entity.cmp.PrimaryKeyGenerator;
+import org.apache.openejb.entity.cmp.QuerySpec;
+import org.apache.openejb.entity.cmp.RelationSchema;
+import org.apache.openejb.entity.cmp.RoleSchema;
+import org.apache.openejb.entity.cmp.SequenceTableKeyGenerator;
+import org.apache.openejb.entity.cmp.SqlPrimaryKeyGenerator;
+import org.apache.openejb.entity.cmp.TranqlModuleCmpEngineGBean;
+import org.apache.openejb.xbeans.ejbjar.OpenejbCmpFieldGroupMappingType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbCmrFieldGroupMappingType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbEjbRelationType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbEjbRelationshipRoleType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbEntityGroupMappingType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbGroupType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbQueryType;
+import org.apache.openejb.xbeans.pkgen.EjbAutoIncrementTableType;
+import org.apache.openejb.xbeans.pkgen.EjbCustomGeneratorType;
+import org.apache.openejb.xbeans.pkgen.EjbKeyGeneratorType;
+import org.apache.openejb.xbeans.pkgen.EjbSequenceTableType;
+import org.apache.openejb.xbeans.pkgen.EjbSqlGeneratorType;
 
 
 /**
@@ -586,7 +586,7 @@
             String groupName = group.getGroupName();
 
             // -- create the prefetchGroup
-            org.openejb.entity.cmp.PrefetchGroup prefetchGroup = entity.addPrefetchGroup(groupName);
+            org.apache.openejb.entity.cmp.PrefetchGroup prefetchGroup = entity.addPrefetchGroup(groupName);
 
             // cmpFields
             String[] cmpFields = group.getCmpFieldNameArray();

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/TransactionPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/TransactionPolicyHelper.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/TransactionPolicyHelper.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/TransactionPolicyHelper.java Thu Sep 28 12:39:00 2006
@@ -46,7 +46,7 @@
  * ====================================================================
  */
 
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -62,8 +62,8 @@
 import org.apache.geronimo.xbeans.j2ee.JavaTypeType;
 import org.apache.geronimo.xbeans.j2ee.MethodIntfType;
 import org.apache.geronimo.xbeans.j2ee.MethodType;
-import org.openejb.transaction.TransactionPolicyType;
-import org.openejb.MethodSpec;
+import org.apache.openejb.transaction.TransactionPolicyType;
+import org.apache.openejb.MethodSpec;
 
 /**
  * @version $Revision$ $Date$

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeanBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeanBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeanBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeanBuilder.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansEntityBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansEntityBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansEntityBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansEntityBuilder.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.net.URI;
 import java.security.Permissions;
@@ -79,13 +79,12 @@
 import org.apache.geronimo.xbeans.j2ee.EnterpriseBeansType;
 import org.apache.geronimo.xbeans.j2ee.EntityBeanType;
 import org.apache.geronimo.xbeans.j2ee.EnvEntryType;
-import org.apache.geronimo.xbeans.j2ee.MessageDestinationRefType;
 import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
 import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
 import org.apache.geronimo.xbeans.j2ee.ServiceRefType;
-import org.openejb.BmpEjbDeploymentGBean;
-import org.openejb.CmpEjbDeploymentGBean;
-import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
+import org.apache.openejb.BmpEjbDeploymentGBean;
+import org.apache.openejb.CmpEjbDeploymentGBean;
+import org.apache.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
 
 
 public class XmlBeansEntityBuilder extends XmlBeanBuilder {

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansHelper.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansHelper.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansHelper.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansHelper.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -50,9 +50,9 @@
 import java.io.IOException;
 import javax.xml.namespace.QName;
 
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-import org.openejb.xbeans.pkgen.EjbKeyGeneratorDocument;
+import org.apache.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
+import org.apache.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
+import org.apache.openejb.xbeans.pkgen.EjbKeyGeneratorDocument;
 import org.apache.geronimo.schema.NamespaceElementConverter;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.xbeans.j2ee.EjbJarType;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansMdbBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansMdbBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansMdbBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansMdbBuilder.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.beans.Introspector;
 import java.lang.reflect.InvocationTargetException;
@@ -91,8 +91,8 @@
 import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
 import org.apache.geronimo.xbeans.j2ee.ServiceRefType;
 import org.apache.geronimo.connector.deployment.AdminObjectRefBuilder;
-import org.openejb.xbeans.ejbjar.OpenejbActivationConfigPropertyType;
-import org.openejb.xbeans.ejbjar.OpenejbMessageDrivenBeanType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbActivationConfigPropertyType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbMessageDrivenBeanType;
 
 
 public class XmlBeansMdbBuilder extends XmlBeanBuilder {

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansSecurityBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansSecurityBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansSecurityBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansSecurityBuilder.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.lang.reflect.Method;
 import java.security.Permission;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansSessionBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansSessionBuilder.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansSessionBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/XmlBeansSessionBuilder.java Thu Sep 28 12:39:00 2006
@@ -45,7 +45,7 @@
  *
  * ====================================================================
  */
-package org.openejb.deployment;
+package org.apache.openejb.deployment;
 
 import java.net.URI;
 import java.net.URL;
@@ -82,10 +82,10 @@
 import org.apache.geronimo.xbeans.j2ee.WebserviceDescriptionType;
 import org.apache.geronimo.xbeans.j2ee.WebservicesDocument;
 import org.apache.xmlbeans.XmlException;
-import org.openejb.StatefulEjbDeploymentGBean;
-import org.openejb.StatelessEjbDeploymentGBean;
-import org.openejb.xbeans.ejbjar.OpenejbSessionBeanType;
-import org.openejb.xbeans.ejbjar.OpenejbWebServiceSecurityType;
+import org.apache.openejb.StatefulEjbDeploymentGBean;
+import org.apache.openejb.StatelessEjbDeploymentGBean;
+import org.apache.openejb.xbeans.ejbjar.OpenejbSessionBeanType;
+import org.apache.openejb.xbeans.ejbjar.OpenejbWebServiceSecurityType;
 
 
 public class XmlBeansSessionBuilder extends XmlBeanBuilder {

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/ant/DDLExporterTask.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/ant/DDLExporterTask.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/ant/DDLExporterTask.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/ant/DDLExporterTask.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.deployment.ant;
+package org.apache.openejb.deployment.ant;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -69,13 +69,13 @@
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Path;
 import org.apache.xmlbeans.XmlObject;
-import org.openejb.deployment.CmpSchemaBuilder;
-import org.openejb.deployment.TranqlCmpSchemaBuilder;
-import org.openejb.deployment.OpenEjbModuleBuilder;
-import org.openejb.entity.cmp.ModuleSchema;
-import org.openejb.entity.cmp.TranqlSchemaBuilder;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
+import org.apache.openejb.deployment.CmpSchemaBuilder;
+import org.apache.openejb.deployment.TranqlCmpSchemaBuilder;
+import org.apache.openejb.deployment.OpenEjbModuleBuilder;
+import org.apache.openejb.entity.cmp.ModuleSchema;
+import org.apache.openejb.entity.cmp.TranqlSchemaBuilder;
+import org.apache.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
+import org.apache.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
 import org.tranql.ddl.DDLCommandBuilder;
 import org.tranql.ddl.DDLGenerator;
 import org.tranql.ejb.EJBProxyFactory;
@@ -184,7 +184,7 @@
             // build the tranql schema objects
             // use a subclass of the tranql builder that does not create pk generators or proxy factories
             TranqlSchemaBuilder tranqlSchemaBuilder = new TranqlSchemaBuilder(moduleSchema, null, null, null, cl) {
-                protected PrimaryKeyGenerator configurePrimaryKeyGenerator(org.openejb.entity.cmp.PrimaryKeyGenerator primaryKeyGenerator, Class pkClass) {
+                protected PrimaryKeyGenerator configurePrimaryKeyGenerator(org.apache.openejb.entity.cmp.PrimaryKeyGenerator primaryKeyGenerator, Class pkClass) {
                     return null;
                 }
 

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

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/ant/OpenejbJarLocation.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/ant/OpenejbJarLocation.java?view=diff&rev=450983&r1=450979&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/ant/OpenejbJarLocation.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/ant/OpenejbJarLocation.java Thu Sep 28 12:39:00 2006
@@ -42,7 +42,7 @@
  *
  * $Id$
  */
-package org.openejb.deployment.ant;
+package org.apache.openejb.deployment.ant;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -52,7 +52,6 @@
 
 import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.xmlbeans.XmlCursor;

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml Thu Sep 28 12:39:00 2006
@@ -2,22 +2,22 @@
     >
 
     <xb:namespace uri="http://www.openejb.org/xml/ns/openejb-jar-2.2">
-        <xb:package>org.openejb.xbeans.ejbjar</xb:package>
+        <xb:package>org.apache.openejb.xbeans.ejbjar</xb:package>
         <xb:prefix>Openejb</xb:prefix>
     </xb:namespace>
 
     <xb:namespace uri="http://www.openejb.org/xml/ns/pkgen-2.0">
-        <xb:package>org.openejb.xbeans.pkgen</xb:package>
+        <xb:package>org.apache.openejb.xbeans.pkgen</xb:package>
         <xb:prefix>Ejb</xb:prefix>
     </xb:namespace>
 
     <xb:namespace uri="http://www.openejb.org/xml/ns/corba-tss-config-2.1">
-        <xb:package>org.openejb.xbeans.csiv2.tss</xb:package>
+        <xb:package>org.apache.openejb.xbeans.csiv2.tss</xb:package>
         <xb:prefix>TSS</xb:prefix>
     </xb:namespace>
 
     <xb:namespace uri="http://www.openejb.org/xml/ns/corba-css-config-2.0">
-        <xb:package>org.openejb.xbeans.csiv2.css</xb:package>
+        <xb:package>org.apache.openejb.xbeans.csiv2.css</xb:package>
         <xb:prefix>CSS</xb:prefix>
     </xb:namespace>
 

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,9 +9,9 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetoone.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetoone.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetoone.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -27,9 +27,9 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetoone.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetoone.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetoone.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,11 +9,11 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <home>org.openejb.deployment.entity.cmp.ejbql.AHome</home>
-            <remote>org.openejb.deployment.entity.cmp.ejbql.ARemote</remote>
-            <local-home>org.openejb.deployment.entity.cmp.ejbql.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.ejbql.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.ejbql.ABean</ejb-class>
+            <home>org.apache.openejb.deployment.entity.cmp.ejbql.AHome</home>
+            <remote>org.apache.openejb.deployment.entity.cmp.ejbql.ARemote</remote>
+            <local-home>org.apache.openejb.deployment.entity.cmp.ejbql.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.ejbql.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.ejbql.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,11 +9,11 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.manytomany.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.manytomany.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.manytomany.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
-            <prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+            <prim-key-class>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
             <reentrant>false</reentrant>
             <cmp-version>2.x</cmp-version>
             <abstract-schema-name>manytomanyA</abstract-schema-name>
@@ -36,9 +36,9 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.manytomany.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.manytomany.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.manytomany.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,9 +9,9 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.manytomany.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.manytomany.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.manytomany.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -29,7 +29,7 @@
                 <query-method>
                     <method-name>findByPrimaryKey</method-name>
                     <method-params>
-                        <method-param>org.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
+                        <method-param>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
                     </method-params>
                 </query-method>
                 <ejb-ql>SELECT OBJECT(A) FROM manytomanyA A</ejb-ql>
@@ -37,9 +37,9 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.manytomany.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.manytomany.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.manytomany.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.manytomany.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/cascade-delete-ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/cascade-delete-ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/cascade-delete-ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/cascade-delete-ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,11 +9,11 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetomany.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetomany.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
-            <prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+            <prim-key-class>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
             <reentrant>false</reentrant>
             <cmp-version>2.x</cmp-version>
             <abstract-schema-name>onetomanyA</abstract-schema-name>
@@ -36,11 +36,11 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
-            <prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+            <prim-key-class>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
             <reentrant>false</reentrant>
             <cmp-version>2.x</cmp-version>
             <abstract-schema-name>onetomanyB</abstract-schema-name>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,11 +9,11 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetomany.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetomany.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
-            <prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+            <prim-key-class>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
             <reentrant>false</reentrant>
             <cmp-version>2.x</cmp-version>
             <abstract-schema-name>onetomanyA</abstract-schema-name>
@@ -36,11 +36,11 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
-            <prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+            <prim-key-class>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
             <reentrant>false</reentrant>
             <cmp-version>2.x</cmp-version>
             <abstract-schema-name>onetomanyB</abstract-schema-name>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/cascade-delete-ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/cascade-delete-ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/cascade-delete-ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/cascade-delete-ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,9 +9,9 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetomany.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetomany.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -29,7 +29,7 @@
                 <query-method>
                     <method-name>findByPrimaryKey</method-name>
                     <method-params>
-                        <method-param>org.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
+                        <method-param>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
                     </method-params>
                 </query-method>
                 <ejb-ql>SELECT OBJECT(A) FROM onetomanyA A</ejb-ql>
@@ -37,9 +37,9 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -60,7 +60,7 @@
                 <query-method>
                     <method-name>findByPrimaryKey</method-name>
                     <method-params>
-                        <method-param>org.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
+                        <method-param>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
                     </method-params>
                 </query-method>
                 <ejb-ql>SELECT OBJECT(B) FROM onetomanyB B</ejb-ql>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,9 +9,9 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetomany.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetomany.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -29,7 +29,7 @@
                 <query-method>
                     <method-name>findByPrimaryKey</method-name>
                     <method-params>
-                        <method-param>org.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
+                        <method-param>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
                     </method-params>
                 </query-method>
                 <ejb-ql>SELECT OBJECT(A) FROM onetomanyA A</ejb-ql>
@@ -37,9 +37,9 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -60,7 +60,7 @@
                 <query-method>
                     <method-name>findByPrimaryKey</method-name>
                     <method-params>
-                        <method-param>org.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
+                        <method-param>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
                     </method-params>
                 </query-method>
                 <ejb-ql>SELECT OBJECT(B) FROM onetomanyB B</ejb-ql>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,11 +9,11 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetoone.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetoone.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetoone.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
-            <prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+            <prim-key-class>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
             <reentrant>false</reentrant>
             <cmp-version>2.x</cmp-version>
             <abstract-schema-name>OneToOneA</abstract-schema-name>
@@ -36,11 +36,11 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetoone.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetoone.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetoone.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
-            <prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+            <prim-key-class>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
             <reentrant>false</reentrant>
             <cmp-version>2.x</cmp-version>
             <abstract-schema-name>OneToOneB</abstract-schema-name>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,9 +9,9 @@
     <enterprise-beans>
         <entity>
             <ejb-name>A</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetoone.ALocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetoone.ALocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetoone.ABean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ALocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ALocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.ABean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -29,7 +29,7 @@
                 <query-method>
                     <method-name>findByPrimaryKey</method-name>
                     <method-params>
-                        <method-param>org.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
+                        <method-param>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
                     </method-params>
                 </query-method>
                 <ejb-ql>SELECT OBJECT(A) FROM OneToOneA A</ejb-ql>
@@ -37,9 +37,9 @@
         </entity>
         <entity>
             <ejb-name>B</ejb-name>
-            <local-home>org.openejb.deployment.entity.cmp.cmr.onetoone.BLocalHome</local-home>
-            <local>org.openejb.deployment.entity.cmp.cmr.onetoone.BLocal</local>
-            <ejb-class>org.openejb.deployment.entity.cmp.cmr.onetoone.BBean</ejb-class>
+            <local-home>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BLocalHome</local-home>
+            <local>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BLocal</local>
+            <ejb-class>org.apache.openejb.deployment.entity.cmp.cmr.onetoone.BBean</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -60,7 +60,7 @@
                 <query-method>
                     <method-name>findByPrimaryKey</method-name>
                     <method-params>
-                        <method-param>org.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
+                        <method-param>org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK</method-param>
                     </method-params>
                 </query-method>
                 <ejb-ql>SELECT OBJECT(B) FROM OneToOneB B</ejb-ql>

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/ejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/ejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -9,43 +9,43 @@
     <enterprise-beans>
         <session>
             <ejb-name>SimpleStatelessSession</ejb-name>
-            <home>org.openejb.test.simple.slsb.SimpleStatelessSessionHome</home>
-            <remote>org.openejb.test.simple.slsb.SimpleStatelessSession</remote>
-            <local-home>org.openejb.test.simple.slsb.SimpleStatelessSessionLocalHome</local-home>
-            <local>org.openejb.test.simple.slsb.SimpleStatelessSessionLocal</local>
-            <service-endpoint>org.openejb.test.simple.slsb.SimpleStatelessSessionEndpoint</service-endpoint>
-            <ejb-class>org.openejb.test.simple.slsb.SimpleStatelessSessionEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.slsb.SimpleStatelessSessionHome</home>
+            <remote>org.apache.openejb.test.simple.slsb.SimpleStatelessSession</remote>
+            <local-home>org.apache.openejb.test.simple.slsb.SimpleStatelessSessionLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.slsb.SimpleStatelessSessionLocal</local>
+            <service-endpoint>org.apache.openejb.test.simple.slsb.SimpleStatelessSessionEndpoint</service-endpoint>
+            <ejb-class>org.apache.openejb.test.simple.slsb.SimpleStatelessSessionEJB</ejb-class>
             <session-type>Stateless</session-type>
             <transaction-type>Container</transaction-type>
         </session>
         <session>
             <ejb-name>SimpleStatefulSession</ejb-name>
-            <home>org.openejb.test.simple.sfsb.SimpleStatefulSessionHome</home>
-            <remote>org.openejb.test.simple.sfsb.SimpleStatefulSession</remote>
-            <local-home>org.openejb.test.simple.sfsb.SimpleStatefulSessionLocalHome</local-home>
-            <local>org.openejb.test.simple.sfsb.SimpleStatefulSessionLocal</local>
-            <ejb-class>org.openejb.test.simple.sfsb.SimpleStatefulSessionEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.sfsb.SimpleStatefulSessionHome</home>
+            <remote>org.apache.openejb.test.simple.sfsb.SimpleStatefulSession</remote>
+            <local-home>org.apache.openejb.test.simple.sfsb.SimpleStatefulSessionLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.sfsb.SimpleStatefulSessionLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.sfsb.SimpleStatefulSessionEJB</ejb-class>
             <session-type>Stateful</session-type>
             <transaction-type>Container</transaction-type>
         </session>
         <entity>
             <ejb-name>SimpleBMPEntity</ejb-name>
-            <home>org.openejb.test.simple.bmp.SimpleBMPEntityHome</home>
-            <remote>org.openejb.test.simple.bmp.SimpleBMPEntity</remote>
-            <local-home>org.openejb.test.simple.bmp.SimpleBMPEntityLocalHome</local-home>
-            <local>org.openejb.test.simple.bmp.SimpleBMPEntityLocal</local>
-            <ejb-class>org.openejb.test.simple.bmp.SimpleBMPEntityEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.bmp.SimpleBMPEntityHome</home>
+            <remote>org.apache.openejb.test.simple.bmp.SimpleBMPEntity</remote>
+            <local-home>org.apache.openejb.test.simple.bmp.SimpleBMPEntityLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.bmp.SimpleBMPEntityLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.bmp.SimpleBMPEntityEJB</ejb-class>
             <persistence-type>Bean</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
         </entity>
         <entity>
             <ejb-name>SimpleCMPEntity</ejb-name>
-            <home>org.openejb.test.simple.cmp.SimpleCMPEntityHome</home>
-            <remote>org.openejb.test.simple.cmp.SimpleCMPEntity</remote>
-            <local-home>org.openejb.test.simple.cmp.SimpleCMPEntityLocalHome</local-home>
-            <local>org.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
-            <ejb-class>org.openejb.test.simple.cmp.SimpleCMPEntityEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.cmp.SimpleCMPEntityHome</home>
+            <remote>org.apache.openejb.test.simple.cmp.SimpleCMPEntity</remote>
+            <local-home>org.apache.openejb.test.simple.cmp.SimpleCMPEntityLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.cmp.SimpleCMPEntityEJB</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -58,11 +58,11 @@
         </entity>
         <entity>
             <ejb-name>PKGenCMPEntity</ejb-name>
-            <home>org.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
-            <remote>org.openejb.test.simple.cmp.SimpleCMPEntity</remote>
-            <local-home>org.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
-            <local>org.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
-            <ejb-class>org.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
+            <remote>org.apache.openejb.test.simple.cmp.SimpleCMPEntity</remote>
+            <local-home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -75,11 +75,11 @@
         </entity>
         <entity>
             <ejb-name>PKGenCMPEntity2</ejb-name>
-            <home>org.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
-            <remote>org.openejb.test.simple.cmp.SimpleCMPEntity</remote>
-            <local-home>org.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
-            <local>org.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
-            <ejb-class>org.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
+            <remote>org.apache.openejb.test.simple.cmp.SimpleCMPEntity</remote>
+            <local-home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -92,11 +92,11 @@
         </entity>
         <entity>
             <ejb-name>PKGenCMPEntity3</ejb-name>
-            <home>org.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
-            <remote>org.openejb.test.simple.cmp.SimpleCMPEntity</remote>
-            <local-home>org.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
-            <local>org.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
-            <ejb-class>org.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
+            <remote>org.apache.openejb.test.simple.cmp.SimpleCMPEntity</remote>
+            <local-home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -109,11 +109,11 @@
         </entity>
         <entity>
             <ejb-name>PKGenCMPEntity4</ejb-name>
-            <home>org.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
-            <remote>org.openejb.test.simple.cmp.SimpleCMPEntity</remote>
-            <local-home>org.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
-            <local>org.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
-            <ejb-class>org.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
+            <remote>org.apache.openejb.test.simple.cmp.SimpleCMPEntity</remote>
+            <local-home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -126,11 +126,11 @@
         </entity>
         <entity>
             <ejb-name>PKGenCMPEntity5</ejb-name>
-            <home>org.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
-            <remote>org.openejb.test.simple.cmp.SimpleCMPEntity</remote>
-            <local-home>org.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
-            <local>org.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
-            <ejb-class>org.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityHome</home>
+            <remote>org.apache.openejb.test.simple.cmp.SimpleCMPEntity</remote>
+            <local-home>org.apache.openejb.test.simple.cmp.PKGenCMPEntityLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.cmp.SimpleCMPEntityLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.cmp.PKGenCMPEntityEJB</ejb-class>
             <persistence-type>Container</persistence-type>
             <prim-key-class>java.lang.Integer</prim-key-class>
             <reentrant>false</reentrant>
@@ -144,13 +144,13 @@
 <!--
         <entity>
             <ejb-name>CompoundPKEntity</ejb-name>
-            <home>org.openejb.test.simple.cmp.CompoundPKEntityHome</home>
-            <remote>org.openejb.test.simple.cmp.CompoundPKEntity</remote>
-            <local-home>org.openejb.test.simple.cmp.CompoundPKEntityLocalHome</local-home>
-            <local>org.openejb.test.simple.cmp.CompoundPKEntityLocal</local>
-            <ejb-class>org.openejb.test.simple.cmp.CompoundPKEntityEJB</ejb-class>
+            <home>org.apache.openejb.test.simple.cmp.CompoundPKEntityHome</home>
+            <remote>org.apache.openejb.test.simple.cmp.CompoundPKEntity</remote>
+            <local-home>org.apache.openejb.test.simple.cmp.CompoundPKEntityLocalHome</local-home>
+            <local>org.apache.openejb.test.simple.cmp.CompoundPKEntityLocal</local>
+            <ejb-class>org.apache.openejb.test.simple.cmp.CompoundPKEntityEJB</ejb-class>
             <persistence-type>Container</persistence-type>
-            <prim-key-class>org.openejb.test.simple.cmp.CompoundPK</prim-key-class>
+            <prim-key-class>org.apache.openejb.test.simple.cmp.CompoundPK</prim-key-class>
             <reentrant>false</reentrant>
             <cmp-version>2.x</cmp-version>
             <abstract-schema-name>SimpleCMP</abstract-schema-name>
@@ -162,7 +162,7 @@
 -->
         <message-driven>
             <ejb-name>SimpleMessageDriven</ejb-name>
-            <ejb-class>org.openejb.test.simple.mdb.SimpleMessageDrivenBean</ejb-class>
+            <ejb-class>org.apache.openejb.test.simple.mdb.SimpleMessageDrivenBean</ejb-class>
             <messaging-type>javax.jms.MessageListener</messaging-type>
             <transaction-type>Container</transaction-type>
             <!--activation-config></activation-config-->

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml?view=diff&rev=450983&r1=450982&r2=450983
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml Thu Sep 28 12:39:00 2006
@@ -163,7 +163,7 @@
         </message-driven>
 
     </enterprise-beans>
-    <gbean name="CMPPKGenerator" class="org.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapperGBean">
+    <gbean name="CMPPKGenerator" class="org.apache.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapperGBean">
         <reference name="TransactionManager">
             <name>TransactionManager</name>
         </reference>
@@ -174,7 +174,7 @@
         <attribute name="sequenceName">PKGENCMP</attribute>
         <attribute name="batchSize">1</attribute>
     </gbean>
-    <gbean name="CMPPKGenerator2" class="org.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapperGBean">
+    <gbean name="CMPPKGenerator2" class="org.apache.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapperGBean">
         <reference name="TransactionManager">
             <name>TransactionManager</name>
         </reference>