You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/26 00:47:57 UTC

svn commit: r500061 [3/3] - in /incubator/openejb/trunk/openejb3/container/openejb-core: ./ src/main/java/org/apache/openejb/alt/config/ src/main/java/org/apache/openejb/assembler/classic/ src/main/java/org/apache/openejb/config/ src/main/java/org/apac...

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/OpenejbDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/OpenejbDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/OpenejbDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/OpenejbDescriptor.java Thu Jan 25 15:47:53 2007
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -87,7 +87,7 @@
         desc.setValidator(fieldValidator);
 
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.Container.class, "_containerList", "Container", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.Container.class, "_containerList", "Container", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -99,7 +99,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.addContainer((org.apache.openejb.alt.config.sys.Container) value);
+                    target.addContainer((org.apache.openejb.config.sys.Container) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -107,7 +107,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.Container();
+                return new org.apache.openejb.config.sys.Container();
             }
         });
         desc.setHandler(handler);
@@ -122,7 +122,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.JndiProvider.class, "_jndiProviderList", "JndiProvider", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.JndiProvider.class, "_jndiProviderList", "JndiProvider", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -134,7 +134,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.addJndiProvider((org.apache.openejb.alt.config.sys.JndiProvider) value);
+                    target.addJndiProvider((org.apache.openejb.config.sys.JndiProvider) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -142,7 +142,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.JndiProvider();
+                return new org.apache.openejb.config.sys.JndiProvider();
             }
         });
         desc.setHandler(handler);
@@ -156,7 +156,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.SecurityService.class, "_securityService", "SecurityService", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.SecurityService.class, "_securityService", "SecurityService", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -168,7 +168,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.setSecurityService((org.apache.openejb.alt.config.sys.SecurityService) value);
+                    target.setSecurityService((org.apache.openejb.config.sys.SecurityService) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -176,7 +176,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.SecurityService();
+                return new org.apache.openejb.config.sys.SecurityService();
             }
         });
         desc.setHandler(handler);
@@ -189,7 +189,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.TransactionManager.class, "_transactionService", "TransactionService", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.TransactionManager.class, "_transactionService", "TransactionService", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -201,7 +201,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.setTransactionService((org.apache.openejb.alt.config.sys.TransactionManager) value);
+                    target.setTransactionService((org.apache.openejb.config.sys.TransactionManager) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -209,7 +209,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.TransactionManager();
+                return new org.apache.openejb.config.sys.TransactionManager();
             }
         });
         desc.setHandler(handler);
@@ -222,7 +222,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.ConnectionManager.class, "_connectionManager", "ConnectionManager", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.ConnectionManager.class, "_connectionManager", "ConnectionManager", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -234,7 +234,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.setConnectionManager((org.apache.openejb.alt.config.sys.ConnectionManager) value);
+                    target.setConnectionManager((org.apache.openejb.config.sys.ConnectionManager) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -242,7 +242,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.ConnectionManager();
+                return new org.apache.openejb.config.sys.ConnectionManager();
             }
         });
         desc.setHandler(handler);
@@ -255,7 +255,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.ProxyFactory.class, "_proxyFactory", "ProxyFactory", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.ProxyFactory.class, "_proxyFactory", "ProxyFactory", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -267,7 +267,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.setProxyFactory((org.apache.openejb.alt.config.sys.ProxyFactory) value);
+                    target.setProxyFactory((org.apache.openejb.config.sys.ProxyFactory) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -275,7 +275,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.ProxyFactory();
+                return new org.apache.openejb.config.sys.ProxyFactory();
             }
         });
         desc.setHandler(handler);
@@ -288,7 +288,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.Connector.class, "_connectorList", "Connector", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.Connector.class, "_connectorList", "Connector", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -300,7 +300,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.addConnector((org.apache.openejb.alt.config.sys.Connector) value);
+                    target.addConnector((org.apache.openejb.config.sys.Connector) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -308,7 +308,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.Connector();
+                return new org.apache.openejb.config.sys.Connector();
             }
         });
         desc.setHandler(handler);
@@ -322,7 +322,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.Resource.class, "_resourceList", "Resource", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.Resource.class, "_resourceList", "Resource", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -334,7 +334,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.addResource((org.apache.openejb.alt.config.sys.Resource) value);
+                    target.addResource((org.apache.openejb.config.sys.Resource) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -342,7 +342,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.Resource();
+                return new org.apache.openejb.config.sys.Resource();
             }
         });
         desc.setHandler(handler);
@@ -356,7 +356,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.Deployments.class, "_deploymentsList", "Deployments", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.Deployments.class, "_deploymentsList", "Deployments", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -368,7 +368,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     Openejb target = (Openejb) object;
-                    target.addDeployments((org.apache.openejb.alt.config.sys.Deployments) value);
+                    target.addDeployments((org.apache.openejb.config.sys.Deployments) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -376,7 +376,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.Deployments();
+                return new org.apache.openejb.config.sys.Deployments();
             }
         });
         desc.setHandler(handler);
@@ -405,7 +405,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.Openejb.class;
+        return org.apache.openejb.config.sys.Openejb.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesFile.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesFile.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesFile.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesFile.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -71,7 +71,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.apache.openejb.alt.config.sys.PropertiesFile) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.PropertiesFile.class, reader);
+        return (org.apache.openejb.config.sys.PropertiesFile) Unmarshaller.unmarshal(org.apache.openejb.config.sys.PropertiesFile.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesFileDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesFileDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesFileDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesFileDescriptor.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -103,7 +103,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.PropertiesFile.class;
+        return org.apache.openejb.config.sys.PropertiesFile.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProviderTypes.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProviderTypes.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProviderTypes.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProviderTypes.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProviderTypesDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProviderTypesDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProviderTypesDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProviderTypesDescriptor.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -57,7 +57,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.ProviderTypes.class;
+        return org.apache.openejb.config.sys.ProviderTypes.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,14 +21,14 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
 
-public class ProxyFactory implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class ProxyFactory implements java.io.Serializable, org.apache.openejb.config.Service {
 
 
     private java.lang.String _id;
@@ -102,7 +102,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.apache.openejb.alt.config.sys.ProxyFactory) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.ProxyFactory.class, reader);
+        return (org.apache.openejb.config.sys.ProxyFactory) Unmarshaller.unmarshal(org.apache.openejb.config.sys.ProxyFactory.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactoryDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactoryDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactoryDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactoryDescriptor.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -212,7 +212,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.ProxyFactory.class;
+        return org.apache.openejb.config.sys.ProxyFactory.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,14 +21,14 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
 
-public class Resource implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class Resource implements java.io.Serializable, org.apache.openejb.config.Service {
 
 
     private java.lang.String _id;
@@ -112,7 +112,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.apache.openejb.alt.config.sys.Resource) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.Resource.class, reader);
+        return (org.apache.openejb.config.sys.Resource) Unmarshaller.unmarshal(org.apache.openejb.config.sys.Resource.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ResourceDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ResourceDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ResourceDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ResourceDescriptor.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -248,7 +248,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.Resource.class;
+        return org.apache.openejb.config.sys.Resource.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,14 +21,14 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
 
-public class SecurityService implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class SecurityService implements java.io.Serializable, org.apache.openejb.config.Service {
 
 
     private java.lang.String _id;
@@ -102,7 +102,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.apache.openejb.alt.config.sys.SecurityService) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.SecurityService.class, reader);
+        return (org.apache.openejb.config.sys.SecurityService) Unmarshaller.unmarshal(org.apache.openejb.config.sys.SecurityService.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityServiceDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityServiceDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityServiceDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityServiceDescriptor.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -212,7 +212,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.SecurityService.class;
+        return org.apache.openejb.config.sys.SecurityService.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -45,9 +45,9 @@
 
     private java.lang.String _content = "";
 
-    private org.apache.openejb.alt.config.sys.PropertiesFile _propertiesFile;
+    private org.apache.openejb.config.sys.PropertiesFile _propertiesFile;
 
-    private org.apache.openejb.alt.config.sys.Lookup _lookup;
+    private org.apache.openejb.config.sys.Lookup _lookup;
 
 
     public ServiceProvider() {
@@ -80,11 +80,11 @@
         return this._id;
     }
 
-    public org.apache.openejb.alt.config.sys.Lookup getLookup() {
+    public org.apache.openejb.config.sys.Lookup getLookup() {
         return this._lookup;
     }
 
-    public org.apache.openejb.alt.config.sys.PropertiesFile getPropertiesFile() {
+    public org.apache.openejb.config.sys.PropertiesFile getPropertiesFile() {
         return this._propertiesFile;
     }
 
@@ -138,11 +138,11 @@
         this._id = id;
     }
 
-    public void setLookup(org.apache.openejb.alt.config.sys.Lookup lookup) {
+    public void setLookup(org.apache.openejb.config.sys.Lookup lookup) {
         this._lookup = lookup;
     }
 
-    public void setPropertiesFile(org.apache.openejb.alt.config.sys.PropertiesFile propertiesFile) {
+    public void setPropertiesFile(org.apache.openejb.config.sys.PropertiesFile propertiesFile) {
         this._propertiesFile = propertiesFile;
     }
 
@@ -152,7 +152,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.apache.openejb.alt.config.sys.ServiceProvider) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.ServiceProvider.class, reader);
+        return (org.apache.openejb.config.sys.ServiceProvider) Unmarshaller.unmarshal(org.apache.openejb.config.sys.ServiceProvider.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProviderDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProviderDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProviderDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProviderDescriptor.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -310,7 +310,7 @@
         desc.setValidator(fieldValidator);
 
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.PropertiesFile.class, "_propertiesFile", "properties-file", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.PropertiesFile.class, "_propertiesFile", "properties-file", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -322,7 +322,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     ServiceProvider target = (ServiceProvider) object;
-                    target.setPropertiesFile((org.apache.openejb.alt.config.sys.PropertiesFile) value);
+                    target.setPropertiesFile((org.apache.openejb.config.sys.PropertiesFile) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -330,7 +330,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.PropertiesFile();
+                return new org.apache.openejb.config.sys.PropertiesFile();
             }
         });
         desc.setHandler(handler);
@@ -343,7 +343,7 @@
         }
         desc.setValidator(fieldValidator);
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.Lookup.class, "_lookup", "lookup", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.Lookup.class, "_lookup", "lookup", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -355,7 +355,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     ServiceProvider target = (ServiceProvider) object;
-                    target.setLookup((org.apache.openejb.alt.config.sys.Lookup) value);
+                    target.setLookup((org.apache.openejb.config.sys.Lookup) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -363,7 +363,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.Lookup();
+                return new org.apache.openejb.config.sys.Lookup();
             }
         });
         desc.setHandler(handler);
@@ -391,7 +391,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.ServiceProvider.class;
+        return org.apache.openejb.config.sys.ServiceProvider.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServicesJar.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServicesJar.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServicesJar.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServicesJar.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -42,12 +42,12 @@
     }
 
 
-    public void addServiceProvider(org.apache.openejb.alt.config.sys.ServiceProvider vServiceProvider)
+    public void addServiceProvider(org.apache.openejb.config.sys.ServiceProvider vServiceProvider)
             throws java.lang.IndexOutOfBoundsException {
         _serviceProviderList.addElement(vServiceProvider);
     }
 
-    public void addServiceProvider(int index, org.apache.openejb.alt.config.sys.ServiceProvider vServiceProvider)
+    public void addServiceProvider(int index, org.apache.openejb.config.sys.ServiceProvider vServiceProvider)
             throws java.lang.IndexOutOfBoundsException {
         _serviceProviderList.insertElementAt(vServiceProvider, index);
     }
@@ -56,21 +56,21 @@
         return _serviceProviderList.elements();
     }
 
-    public org.apache.openejb.alt.config.sys.ServiceProvider getServiceProvider(int index)
+    public org.apache.openejb.config.sys.ServiceProvider getServiceProvider(int index)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _serviceProviderList.size())) {
             throw new IndexOutOfBoundsException();
         }
 
-        return (org.apache.openejb.alt.config.sys.ServiceProvider) _serviceProviderList.elementAt(index);
+        return (org.apache.openejb.config.sys.ServiceProvider) _serviceProviderList.elementAt(index);
     }
 
-    public org.apache.openejb.alt.config.sys.ServiceProvider[] getServiceProvider() {
+    public org.apache.openejb.config.sys.ServiceProvider[] getServiceProvider() {
         int size = _serviceProviderList.size();
-        org.apache.openejb.alt.config.sys.ServiceProvider[] mArray = new org.apache.openejb.alt.config.sys.ServiceProvider[size];
+        org.apache.openejb.config.sys.ServiceProvider[] mArray = new org.apache.openejb.config.sys.ServiceProvider[size];
         for (int index = 0; index < size; index++) {
-            mArray[index] = (org.apache.openejb.alt.config.sys.ServiceProvider) _serviceProviderList.elementAt(index);
+            mArray[index] = (org.apache.openejb.config.sys.ServiceProvider) _serviceProviderList.elementAt(index);
         }
         return mArray;
     }
@@ -105,13 +105,13 @@
         _serviceProviderList.removeAllElements();
     }
 
-    public org.apache.openejb.alt.config.sys.ServiceProvider removeServiceProvider(int index) {
+    public org.apache.openejb.config.sys.ServiceProvider removeServiceProvider(int index) {
         java.lang.Object obj = _serviceProviderList.elementAt(index);
         _serviceProviderList.removeElementAt(index);
-        return (org.apache.openejb.alt.config.sys.ServiceProvider) obj;
+        return (org.apache.openejb.config.sys.ServiceProvider) obj;
     }
 
-    public void setServiceProvider(int index, org.apache.openejb.alt.config.sys.ServiceProvider vServiceProvider)
+    public void setServiceProvider(int index, org.apache.openejb.config.sys.ServiceProvider vServiceProvider)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _serviceProviderList.size())) {
@@ -120,7 +120,7 @@
         _serviceProviderList.setElementAt(vServiceProvider, index);
     }
 
-    public void setServiceProvider(org.apache.openejb.alt.config.sys.ServiceProvider[] serviceProviderArray) {
+    public void setServiceProvider(org.apache.openejb.config.sys.ServiceProvider[] serviceProviderArray) {
 
         _serviceProviderList.removeAllElements();
         for (int i = 0; i < serviceProviderArray.length; i++) {
@@ -130,7 +130,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.apache.openejb.alt.config.sys.ServicesJar) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.ServicesJar.class, reader);
+        return (org.apache.openejb.config.sys.ServicesJar) Unmarshaller.unmarshal(org.apache.openejb.config.sys.ServicesJar.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServicesJarDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServicesJarDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServicesJarDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServicesJarDescriptor.java Thu Jan 25 15:47:53 2007
@@ -1,19 +1,19 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -49,7 +49,7 @@
         org.exolab.castor.xml.FieldValidator fieldValidator = null;
 
 
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.ServiceProvider.class, "_serviceProviderList", "ServiceProvider", org.exolab.castor.xml.NodeType.Element);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.config.sys.ServiceProvider.class, "_serviceProviderList", "ServiceProvider", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue(java.lang.Object object)
                     throws IllegalStateException {
@@ -61,7 +61,7 @@
                     throws IllegalStateException, IllegalArgumentException {
                 try {
                     ServicesJar target = (ServicesJar) object;
-                    target.addServiceProvider((org.apache.openejb.alt.config.sys.ServiceProvider) value);
+                    target.addServiceProvider((org.apache.openejb.config.sys.ServiceProvider) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -69,7 +69,7 @@
             }
 
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new org.apache.openejb.alt.config.sys.ServiceProvider();
+                return new org.apache.openejb.config.sys.ServiceProvider();
             }
         });
         desc.setHandler(handler);
@@ -99,7 +99,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.ServicesJar.class;
+        return org.apache.openejb.config.sys.ServicesJar.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java Thu Jan 25 15:47:53 2007
@@ -21,14 +21,14 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
 
-public class TransactionManager implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class TransactionManager implements java.io.Serializable, org.apache.openejb.config.Service {
 
 
     private java.lang.String _id;
@@ -102,7 +102,7 @@
 
     public static java.lang.Object unmarshal(java.io.Reader reader)
             throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
-        return (org.apache.openejb.alt.config.sys.TransactionManager) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.TransactionManager.class, reader);
+        return (org.apache.openejb.config.sys.TransactionManager) Unmarshaller.unmarshal(org.apache.openejb.config.sys.TransactionManager.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManagerDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManagerDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManagerDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManagerDescriptor.java Thu Jan 25 15:47:53 2007
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-package org.apache.openejb.alt.config.sys;
+package org.apache.openejb.config.sys;
 
 //---------------------------------/
 
@@ -212,7 +212,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.TransactionManager.class;
+        return org.apache.openejb.config.sys.TransactionManager.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java?view=diff&rev=500061&r1=500060&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java Thu Jan 25 15:47:53 2007
@@ -49,7 +49,7 @@
             *      probably just be deleted.
             */
             props.put(EnvProps.ASSEMBLER, "org.apache.openejb.assembler.classic.Assembler");
-            props.put(EnvProps.CONFIGURATION_FACTORY, "org.apache.openejb.alt.config.ConfigurationFactory");
+            props.put(EnvProps.CONFIGURATION_FACTORY, "org.apache.openejb.config.ConfigurationFactory");
             props.put(EnvProps.CONFIGURATION, "conf/default.openejb.conf");
 
             props.putAll(SystemInstance.get().getProperties());

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java?view=diff&rev=500061&r1=500060&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java Thu Jan 25 15:47:53 2007
@@ -58,7 +58,7 @@
         // Nothing may depend on the Assembler except the config code or spring assembler
         String springAssembler = "org.apache.openejb.assembler.spring";
         String dynamicAssembler = "org.apache.openejb.assembler.dynamic";
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.assembler.classic", "org.apache.openejb.alt.config", springAssembler, "org.apache.openejb.assembler.dynamic");
+        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.assembler.classic", "org.apache.openejb.config", springAssembler, "org.apache.openejb.assembler.dynamic");
 
         // Nothing may depend on the Spring Assembler
         assertNotDependentOn("org.apache.openejb", springAssembler);
@@ -67,13 +67,13 @@
         assertNotDependentOn("org.apache.openejb", dynamicAssembler);
 
         // Nothing may depend on the JAXB Tree except the Config code
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.jee", "org.apache.openejb.alt.config");
+        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.jee", "org.apache.openejb.config");
 
         // Nothing may depend on the Config code except it's subpackages and the Spring Assembler
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.alt.config", "org.apache.openejb.alt.config.rules", "org.apache.openejb.alt.config.sys", springAssembler, dynamicAssembler);
+        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.config", "org.apache.openejb.config.rules", "org.apache.openejb.config.sys", springAssembler, dynamicAssembler);
 
         // The assembler may not be dependent on the config factory Implementation
-        assertNotDependentOn("org.apache.openejb.assembler.classic", "org.apache.openejb.alt.config");
+        assertNotDependentOn("org.apache.openejb.assembler.classic", "org.apache.openejb.config");
 
         // Nothing should be dependent on any one particular container implementation   (except the Spring and Dynamic Assembler)
         // TODO: This needs fixing... containers are supposed to be pluggable

Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java (from r500059, incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/alt/config/JaxbUnmarshallerTest.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java?view=diff&rev=500061&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/alt/config/JaxbUnmarshallerTest.java&r1=500059&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/alt/config/JaxbUnmarshallerTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java Thu Jan 25 15:47:53 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.openejb.alt.config;
+package org.apache.openejb.config;
 
 import java.io.File;
 import java.net.URL;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java?view=diff&rev=500061&r1=500060&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java Thu Jan 25 15:47:53 2007
@@ -22,8 +22,8 @@
 import org.apache.openejb.jee.StatefulBean;
 import org.apache.openejb.jee.oejb3.OpenejbJar;
 import org.apache.openejb.jee.oejb3.EjbDeployment;
-import org.apache.openejb.alt.config.EjbModule;
-import org.apache.openejb.alt.config.EjbJarInfoBuilder;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.EjbJarInfoBuilder;
 import org.apache.openejb.core.CoreDeploymentInfo;
 import org.apache.openejb.ri.sp.PseudoTransactionService;
 import org.apache.openejb.ri.sp.PseudoSecurityService;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java?view=diff&rev=500061&r1=500060&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java Thu Jan 25 15:47:53 2007
@@ -25,8 +25,8 @@
 import org.apache.openejb.util.proxy.ProxyManager;
 import org.apache.openejb.util.proxy.Jdk13ProxyFactory;
 import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.alt.config.EjbModule;
-import org.apache.openejb.alt.config.EjbJarInfoBuilder;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.EjbJarInfoBuilder;
 import org.apache.openejb.jee.oejb3.EjbDeployment;
 import org.apache.openejb.jee.oejb3.OpenejbJar;
 import org.apache.openejb.assembler.classic.EjbJarBuilder;