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

Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java (from r500059, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationTable.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java?view=diff&rev=500061&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationTable.java&r1=500059&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationTable.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java Thu Jan 25 15:47:53 2007
@@ -14,19 +14,16 @@
  * 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;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Properties;
 
-import org.apache.openejb.util.JarUtils;
 import org.apache.openejb.util.OpenEjbVersion;
 import org.apache.openejb.ClassLoaderUtil;
 import org.apache.openejb.loader.SystemInstance;

Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationWarning.java (from r500059, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationWarning.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationWarning.java?view=diff&rev=500061&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationWarning.java&r1=500059&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationWarning.java&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ValidationWarning.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationWarning.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;
 
 public class ValidationWarning extends ValidationException {
 

Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentFactory.java (from r500059, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/VmDeploymentFactory.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentFactory.java?view=diff&rev=500061&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/VmDeploymentFactory.java&r1=500059&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentFactory.java&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/VmDeploymentFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentFactory.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 javax.enterprise.deploy.spi.DeploymentManager;
 import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;

Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java (from r500059, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/VmDeploymentManager.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java?view=diff&rev=500061&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/VmDeploymentManager.java&r1=500059&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/VmDeploymentManager.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.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 javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.ActionType;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java Thu Jan 25 15:47:53 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.alt.config.rules;
+package org.apache.openejb.config.rules;
 
 import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.alt.config.Bean;
-import org.apache.openejb.alt.config.EjbSet;
-import org.apache.openejb.alt.config.ValidationFailure;
-import org.apache.openejb.alt.config.ValidationRule;
+import org.apache.openejb.config.Bean;
+import org.apache.openejb.config.EjbSet;
+import org.apache.openejb.config.ValidationFailure;
+import org.apache.openejb.config.ValidationRule;
 import org.apache.openejb.util.SafeToolkit;
 
 import javax.ejb.EJBLocalHome;
@@ -131,13 +131,13 @@
 
     public void check_isEjbClass(Bean b) {
 
-        if (b instanceof org.apache.openejb.alt.config.SessionBean) {
+        if (b instanceof org.apache.openejb.config.SessionBean) {
 
             // DMB: Beans in ejb 3 are not required to implement javax.ejb.SessionBean
             // but it would still be nice to think of some sort of check to do here.
             // compareTypes(b, b.getEjbClass(), javax.ejb.SessionBean.class);
 
-        } else if (b instanceof org.apache.openejb.alt.config.EntityBean) {
+        } else if (b instanceof org.apache.openejb.config.EntityBean) {
 
             compareTypes(b, b.getEjbClass(), javax.ejb.EntityBean.class);
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java Thu Jan 25 15:47:53 2007
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.alt.config.rules;
+package org.apache.openejb.config.rules;
 
 import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.alt.config.Bean;
-import org.apache.openejb.alt.config.EjbSet;
-import org.apache.openejb.alt.config.EntityBean;
-import org.apache.openejb.alt.config.SessionBean;
-import org.apache.openejb.alt.config.ValidationFailure;
-import org.apache.openejb.alt.config.ValidationRule;
-import org.apache.openejb.alt.config.ValidationWarning;
+import org.apache.openejb.config.Bean;
+import org.apache.openejb.config.EjbSet;
+import org.apache.openejb.config.EntityBean;
+import org.apache.openejb.config.SessionBean;
+import org.apache.openejb.config.ValidationFailure;
+import org.apache.openejb.config.ValidationRule;
+import org.apache.openejb.config.ValidationWarning;
 import org.apache.openejb.util.SafeToolkit;
 
 import javax.ejb.EJBLocalObject;
@@ -153,7 +153,7 @@
 
     public boolean check_hasCreateMethod(Bean b, Class bean, Class home) {
 
-        if (b instanceof org.apache.openejb.alt.config.SessionBean && !javax.ejb.SessionBean.class.isAssignableFrom(bean)){
+        if (b instanceof org.apache.openejb.config.SessionBean && !javax.ejb.SessionBean.class.isAssignableFrom(bean)){
             // This is a pojo-style bean
             return false;
         }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ClassName.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ClassName.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ClassName.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ClassName.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/ClassNameDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ClassNameDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ClassNameDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ClassNameDescriptor.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.ClassName.class;
+        return org.apache.openejb.config.sys.ClassName.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.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 ConnectionManager implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class ConnectionManager 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.ConnectionManager) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.ConnectionManager.class, reader);
+        return (org.apache.openejb.config.sys.ConnectionManager) Unmarshaller.unmarshal(org.apache.openejb.config.sys.ConnectionManager.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManagerDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManagerDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManagerDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManagerDescriptor.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.ConnectionManager.class;
+        return org.apache.openejb.config.sys.ConnectionManager.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.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 Connector implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class Connector 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.Connector) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.Connector.class, reader);
+        return (org.apache.openejb.config.sys.Connector) Unmarshaller.unmarshal(org.apache.openejb.config.sys.Connector.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectorDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectorDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectorDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectorDescriptor.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.Connector.class;
+        return org.apache.openejb.config.sys.Connector.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.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 Container implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class Container 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.Container) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.Container.class, reader);
+        return (org.apache.openejb.config.sys.Container) Unmarshaller.unmarshal(org.apache.openejb.config.sys.Container.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerDescriptor.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;
 
 //---------------------------------/
 
@@ -251,7 +251,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.Container.class;
+        return org.apache.openejb.config.sys.Container.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerTypes.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerTypes.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerTypes.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerTypes.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/ContainerTypesDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerTypesDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerTypesDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ContainerTypesDescriptor.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.ContainerTypes.class;
+        return org.apache.openejb.config.sys.ContainerTypes.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Deployments.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Deployments.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Deployments.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Deployments.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;
 
 //---------------------------------/
 
@@ -95,7 +95,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.Deployments) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.Deployments.class, reader);
+        return (org.apache.openejb.config.sys.Deployments) Unmarshaller.unmarshal(org.apache.openejb.config.sys.Deployments.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/DeploymentsDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/DeploymentsDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/DeploymentsDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/DeploymentsDescriptor.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;
 
 //---------------------------------/
 
@@ -138,7 +138,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.Deployments.class;
+        return org.apache.openejb.config.sys.Deployments.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JarFileLocation.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JarFileLocation.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JarFileLocation.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JarFileLocation.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/JarFileLocationDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JarFileLocationDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JarFileLocationDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JarFileLocationDescriptor.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.JarFileLocation.class;
+        return org.apache.openejb.config.sys.JarFileLocation.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.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 JndiProvider implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class JndiProvider 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.JndiProvider) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.JndiProvider.class, reader);
+        return (org.apache.openejb.config.sys.JndiProvider) Unmarshaller.unmarshal(org.apache.openejb.config.sys.JndiProvider.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProviderDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProviderDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProviderDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProviderDescriptor.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.JndiProvider.class;
+        return org.apache.openejb.config.sys.JndiProvider.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Lookup.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Lookup.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Lookup.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Lookup.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;
 
 //---------------------------------/
 
@@ -81,7 +81,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.Lookup) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.Lookup.class, reader);
+        return (org.apache.openejb.config.sys.Lookup) Unmarshaller.unmarshal(org.apache.openejb.config.sys.Lookup.class, reader);
     }
 
     public void validate()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/LookupDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/LookupDescriptor.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/LookupDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/LookupDescriptor.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;
 
 //---------------------------------/
 
@@ -137,7 +137,7 @@
     }
 
     public java.lang.Class getJavaClass() {
-        return org.apache.openejb.alt.config.sys.Lookup.class;
+        return org.apache.openejb.config.sys.Lookup.class;
     }
 
     public java.lang.String getNameSpacePrefix() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java?view=diff&rev=500061&r1=500059&r2=500061
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.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;
 
 //---------------------------------/
 
@@ -39,13 +39,13 @@
 
     private java.util.Vector _jndiProviderList;
 
-    private org.apache.openejb.alt.config.sys.SecurityService _securityService;
+    private org.apache.openejb.config.sys.SecurityService _securityService;
 
-    private org.apache.openejb.alt.config.sys.TransactionManager _transactionManager;
+    private org.apache.openejb.config.sys.TransactionManager _transactionManager;
 
-    private org.apache.openejb.alt.config.sys.ConnectionManager _connectionManager;
+    private org.apache.openejb.config.sys.ConnectionManager _connectionManager;
 
-    private org.apache.openejb.alt.config.sys.ProxyFactory _proxyFactory;
+    private org.apache.openejb.config.sys.ProxyFactory _proxyFactory;
 
     private java.util.Vector _connectorList;
 
@@ -65,52 +65,52 @@
     }
 
 
-    public void addConnector(org.apache.openejb.alt.config.sys.Connector vConnector)
+    public void addConnector(org.apache.openejb.config.sys.Connector vConnector)
             throws java.lang.IndexOutOfBoundsException {
         _connectorList.addElement(vConnector);
     }
 
-    public void addConnector(int index, org.apache.openejb.alt.config.sys.Connector vConnector)
+    public void addConnector(int index, org.apache.openejb.config.sys.Connector vConnector)
             throws java.lang.IndexOutOfBoundsException {
         _connectorList.insertElementAt(vConnector, index);
     }
 
-    public void addContainer(org.apache.openejb.alt.config.sys.Container vContainer)
+    public void addContainer(org.apache.openejb.config.sys.Container vContainer)
             throws java.lang.IndexOutOfBoundsException {
         _containerList.addElement(vContainer);
     }
 
-    public void addContainer(int index, org.apache.openejb.alt.config.sys.Container vContainer)
+    public void addContainer(int index, org.apache.openejb.config.sys.Container vContainer)
             throws java.lang.IndexOutOfBoundsException {
         _containerList.insertElementAt(vContainer, index);
     }
 
-    public void addDeployments(org.apache.openejb.alt.config.sys.Deployments vDeployments)
+    public void addDeployments(org.apache.openejb.config.sys.Deployments vDeployments)
             throws java.lang.IndexOutOfBoundsException {
         _deploymentsList.addElement(vDeployments);
     }
 
-    public void addDeployments(int index, org.apache.openejb.alt.config.sys.Deployments vDeployments)
+    public void addDeployments(int index, org.apache.openejb.config.sys.Deployments vDeployments)
             throws java.lang.IndexOutOfBoundsException {
         _deploymentsList.insertElementAt(vDeployments, index);
     }
 
-    public void addJndiProvider(org.apache.openejb.alt.config.sys.JndiProvider vJndiProvider)
+    public void addJndiProvider(org.apache.openejb.config.sys.JndiProvider vJndiProvider)
             throws java.lang.IndexOutOfBoundsException {
         _jndiProviderList.addElement(vJndiProvider);
     }
 
-    public void addJndiProvider(int index, org.apache.openejb.alt.config.sys.JndiProvider vJndiProvider)
+    public void addJndiProvider(int index, org.apache.openejb.config.sys.JndiProvider vJndiProvider)
             throws java.lang.IndexOutOfBoundsException {
         _jndiProviderList.insertElementAt(vJndiProvider, index);
     }
 
-    public void addResource(org.apache.openejb.alt.config.sys.Resource vResource)
+    public void addResource(org.apache.openejb.config.sys.Resource vResource)
             throws java.lang.IndexOutOfBoundsException {
         _resourceList.addElement(vResource);
     }
 
-    public void addResource(int index, org.apache.openejb.alt.config.sys.Resource vResource)
+    public void addResource(int index, org.apache.openejb.config.sys.Resource vResource)
             throws java.lang.IndexOutOfBoundsException {
         _resourceList.insertElementAt(vResource, index);
     }
@@ -135,25 +135,25 @@
         return _resourceList.elements();
     }
 
-    public org.apache.openejb.alt.config.sys.ConnectionManager getConnectionManager() {
+    public org.apache.openejb.config.sys.ConnectionManager getConnectionManager() {
         return this._connectionManager;
     }
 
-    public org.apache.openejb.alt.config.sys.Connector getConnector(int index)
+    public org.apache.openejb.config.sys.Connector getConnector(int index)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _connectorList.size())) {
             throw new IndexOutOfBoundsException();
         }
 
-        return (org.apache.openejb.alt.config.sys.Connector) _connectorList.elementAt(index);
+        return (org.apache.openejb.config.sys.Connector) _connectorList.elementAt(index);
     }
 
-    public org.apache.openejb.alt.config.sys.Connector[] getConnector() {
+    public org.apache.openejb.config.sys.Connector[] getConnector() {
         int size = _connectorList.size();
-        org.apache.openejb.alt.config.sys.Connector[] mArray = new org.apache.openejb.alt.config.sys.Connector[size];
+        org.apache.openejb.config.sys.Connector[] mArray = new org.apache.openejb.config.sys.Connector[size];
         for (int index = 0; index < size; index++) {
-            mArray[index] = (org.apache.openejb.alt.config.sys.Connector) _connectorList.elementAt(index);
+            mArray[index] = (org.apache.openejb.config.sys.Connector) _connectorList.elementAt(index);
         }
         return mArray;
     }
@@ -162,21 +162,21 @@
         return _connectorList.size();
     }
 
-    public org.apache.openejb.alt.config.sys.Container getContainer(int index)
+    public org.apache.openejb.config.sys.Container getContainer(int index)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _containerList.size())) {
             throw new IndexOutOfBoundsException();
         }
 
-        return (org.apache.openejb.alt.config.sys.Container) _containerList.elementAt(index);
+        return (org.apache.openejb.config.sys.Container) _containerList.elementAt(index);
     }
 
-    public org.apache.openejb.alt.config.sys.Container[] getContainer() {
+    public org.apache.openejb.config.sys.Container[] getContainer() {
         int size = _containerList.size();
-        org.apache.openejb.alt.config.sys.Container[] mArray = new org.apache.openejb.alt.config.sys.Container[size];
+        org.apache.openejb.config.sys.Container[] mArray = new org.apache.openejb.config.sys.Container[size];
         for (int index = 0; index < size; index++) {
-            mArray[index] = (org.apache.openejb.alt.config.sys.Container) _containerList.elementAt(index);
+            mArray[index] = (org.apache.openejb.config.sys.Container) _containerList.elementAt(index);
         }
         return mArray;
     }
@@ -189,21 +189,21 @@
         return this._content;
     }
 
-    public org.apache.openejb.alt.config.sys.Deployments getDeployments(int index)
+    public org.apache.openejb.config.sys.Deployments getDeployments(int index)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _deploymentsList.size())) {
             throw new IndexOutOfBoundsException();
         }
 
-        return (org.apache.openejb.alt.config.sys.Deployments) _deploymentsList.elementAt(index);
+        return (org.apache.openejb.config.sys.Deployments) _deploymentsList.elementAt(index);
     }
 
-    public org.apache.openejb.alt.config.sys.Deployments[] getDeployments() {
+    public org.apache.openejb.config.sys.Deployments[] getDeployments() {
         int size = _deploymentsList.size();
-        org.apache.openejb.alt.config.sys.Deployments[] mArray = new org.apache.openejb.alt.config.sys.Deployments[size];
+        org.apache.openejb.config.sys.Deployments[] mArray = new org.apache.openejb.config.sys.Deployments[size];
         for (int index = 0; index < size; index++) {
-            mArray[index] = (org.apache.openejb.alt.config.sys.Deployments) _deploymentsList.elementAt(index);
+            mArray[index] = (org.apache.openejb.config.sys.Deployments) _deploymentsList.elementAt(index);
         }
         return mArray;
     }
@@ -212,21 +212,21 @@
         return _deploymentsList.size();
     }
 
-    public org.apache.openejb.alt.config.sys.JndiProvider getJndiProvider(int index)
+    public org.apache.openejb.config.sys.JndiProvider getJndiProvider(int index)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _jndiProviderList.size())) {
             throw new IndexOutOfBoundsException();
         }
 
-        return (org.apache.openejb.alt.config.sys.JndiProvider) _jndiProviderList.elementAt(index);
+        return (org.apache.openejb.config.sys.JndiProvider) _jndiProviderList.elementAt(index);
     }
 
-    public org.apache.openejb.alt.config.sys.JndiProvider[] getJndiProvider() {
+    public org.apache.openejb.config.sys.JndiProvider[] getJndiProvider() {
         int size = _jndiProviderList.size();
-        org.apache.openejb.alt.config.sys.JndiProvider[] mArray = new org.apache.openejb.alt.config.sys.JndiProvider[size];
+        org.apache.openejb.config.sys.JndiProvider[] mArray = new org.apache.openejb.config.sys.JndiProvider[size];
         for (int index = 0; index < size; index++) {
-            mArray[index] = (org.apache.openejb.alt.config.sys.JndiProvider) _jndiProviderList.elementAt(index);
+            mArray[index] = (org.apache.openejb.config.sys.JndiProvider) _jndiProviderList.elementAt(index);
         }
         return mArray;
     }
@@ -235,25 +235,25 @@
         return _jndiProviderList.size();
     }
 
-    public org.apache.openejb.alt.config.sys.ProxyFactory getProxyFactory() {
+    public org.apache.openejb.config.sys.ProxyFactory getProxyFactory() {
         return this._proxyFactory;
     }
 
-    public org.apache.openejb.alt.config.sys.Resource getResource(int index)
+    public org.apache.openejb.config.sys.Resource getResource(int index)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _resourceList.size())) {
             throw new IndexOutOfBoundsException();
         }
 
-        return (org.apache.openejb.alt.config.sys.Resource) _resourceList.elementAt(index);
+        return (org.apache.openejb.config.sys.Resource) _resourceList.elementAt(index);
     }
 
-    public org.apache.openejb.alt.config.sys.Resource[] getResource() {
+    public org.apache.openejb.config.sys.Resource[] getResource() {
         int size = _resourceList.size();
-        org.apache.openejb.alt.config.sys.Resource[] mArray = new org.apache.openejb.alt.config.sys.Resource[size];
+        org.apache.openejb.config.sys.Resource[] mArray = new org.apache.openejb.config.sys.Resource[size];
         for (int index = 0; index < size; index++) {
-            mArray[index] = (org.apache.openejb.alt.config.sys.Resource) _resourceList.elementAt(index);
+            mArray[index] = (org.apache.openejb.config.sys.Resource) _resourceList.elementAt(index);
         }
         return mArray;
     }
@@ -262,11 +262,11 @@
         return _resourceList.size();
     }
 
-    public org.apache.openejb.alt.config.sys.SecurityService getSecurityService() {
+    public org.apache.openejb.config.sys.SecurityService getSecurityService() {
         return this._securityService;
     }
 
-    public org.apache.openejb.alt.config.sys.TransactionManager getTransactionService() {
+    public org.apache.openejb.config.sys.TransactionManager getTransactionService() {
         return this._transactionManager;
     }
 
@@ -312,41 +312,41 @@
         _resourceList.removeAllElements();
     }
 
-    public org.apache.openejb.alt.config.sys.Connector removeConnector(int index) {
+    public org.apache.openejb.config.sys.Connector removeConnector(int index) {
         java.lang.Object obj = _connectorList.elementAt(index);
         _connectorList.removeElementAt(index);
-        return (org.apache.openejb.alt.config.sys.Connector) obj;
+        return (org.apache.openejb.config.sys.Connector) obj;
     }
 
-    public org.apache.openejb.alt.config.sys.Container removeContainer(int index) {
+    public org.apache.openejb.config.sys.Container removeContainer(int index) {
         java.lang.Object obj = _containerList.elementAt(index);
         _containerList.removeElementAt(index);
-        return (org.apache.openejb.alt.config.sys.Container) obj;
+        return (org.apache.openejb.config.sys.Container) obj;
     }
 
-    public org.apache.openejb.alt.config.sys.Deployments removeDeployments(int index) {
+    public org.apache.openejb.config.sys.Deployments removeDeployments(int index) {
         java.lang.Object obj = _deploymentsList.elementAt(index);
         _deploymentsList.removeElementAt(index);
-        return (org.apache.openejb.alt.config.sys.Deployments) obj;
+        return (org.apache.openejb.config.sys.Deployments) obj;
     }
 
-    public org.apache.openejb.alt.config.sys.JndiProvider removeJndiProvider(int index) {
+    public org.apache.openejb.config.sys.JndiProvider removeJndiProvider(int index) {
         java.lang.Object obj = _jndiProviderList.elementAt(index);
         _jndiProviderList.removeElementAt(index);
-        return (org.apache.openejb.alt.config.sys.JndiProvider) obj;
+        return (org.apache.openejb.config.sys.JndiProvider) obj;
     }
 
-    public org.apache.openejb.alt.config.sys.Resource removeResource(int index) {
+    public org.apache.openejb.config.sys.Resource removeResource(int index) {
         java.lang.Object obj = _resourceList.elementAt(index);
         _resourceList.removeElementAt(index);
-        return (org.apache.openejb.alt.config.sys.Resource) obj;
+        return (org.apache.openejb.config.sys.Resource) obj;
     }
 
-    public void setConnectionManager(org.apache.openejb.alt.config.sys.ConnectionManager connectionManager) {
+    public void setConnectionManager(org.apache.openejb.config.sys.ConnectionManager connectionManager) {
         this._connectionManager = connectionManager;
     }
 
-    public void setConnector(int index, org.apache.openejb.alt.config.sys.Connector vConnector)
+    public void setConnector(int index, org.apache.openejb.config.sys.Connector vConnector)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _connectorList.size())) {
@@ -355,7 +355,7 @@
         _connectorList.setElementAt(vConnector, index);
     }
 
-    public void setConnector(org.apache.openejb.alt.config.sys.Connector[] connectorArray) {
+    public void setConnector(org.apache.openejb.config.sys.Connector[] connectorArray) {
 
         _connectorList.removeAllElements();
         for (int i = 0; i < connectorArray.length; i++) {
@@ -363,7 +363,7 @@
         }
     }
 
-    public void setContainer(int index, org.apache.openejb.alt.config.sys.Container vContainer)
+    public void setContainer(int index, org.apache.openejb.config.sys.Container vContainer)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _containerList.size())) {
@@ -372,7 +372,7 @@
         _containerList.setElementAt(vContainer, index);
     }
 
-    public void setContainer(org.apache.openejb.alt.config.sys.Container[] containerArray) {
+    public void setContainer(org.apache.openejb.config.sys.Container[] containerArray) {
 
         _containerList.removeAllElements();
         for (int i = 0; i < containerArray.length; i++) {
@@ -384,7 +384,7 @@
         this._content = content;
     }
 
-    public void setDeployments(int index, org.apache.openejb.alt.config.sys.Deployments vDeployments)
+    public void setDeployments(int index, org.apache.openejb.config.sys.Deployments vDeployments)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _deploymentsList.size())) {
@@ -393,7 +393,7 @@
         _deploymentsList.setElementAt(vDeployments, index);
     }
 
-    public void setDeployments(org.apache.openejb.alt.config.sys.Deployments[] deploymentsArray) {
+    public void setDeployments(org.apache.openejb.config.sys.Deployments[] deploymentsArray) {
 
         _deploymentsList.removeAllElements();
         for (int i = 0; i < deploymentsArray.length; i++) {
@@ -401,7 +401,7 @@
         }
     }
 
-    public void setJndiProvider(int index, org.apache.openejb.alt.config.sys.JndiProvider vJndiProvider)
+    public void setJndiProvider(int index, org.apache.openejb.config.sys.JndiProvider vJndiProvider)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _jndiProviderList.size())) {
@@ -410,7 +410,7 @@
         _jndiProviderList.setElementAt(vJndiProvider, index);
     }
 
-    public void setJndiProvider(org.apache.openejb.alt.config.sys.JndiProvider[] jndiProviderArray) {
+    public void setJndiProvider(org.apache.openejb.config.sys.JndiProvider[] jndiProviderArray) {
 
         _jndiProviderList.removeAllElements();
         for (int i = 0; i < jndiProviderArray.length; i++) {
@@ -418,11 +418,11 @@
         }
     }
 
-    public void setProxyFactory(org.apache.openejb.alt.config.sys.ProxyFactory proxyFactory) {
+    public void setProxyFactory(org.apache.openejb.config.sys.ProxyFactory proxyFactory) {
         this._proxyFactory = proxyFactory;
     }
 
-    public void setResource(int index, org.apache.openejb.alt.config.sys.Resource vResource)
+    public void setResource(int index, org.apache.openejb.config.sys.Resource vResource)
             throws java.lang.IndexOutOfBoundsException {
 
         if ((index < 0) || (index > _resourceList.size())) {
@@ -431,7 +431,7 @@
         _resourceList.setElementAt(vResource, index);
     }
 
-    public void setResource(org.apache.openejb.alt.config.sys.Resource[] resourceArray) {
+    public void setResource(org.apache.openejb.config.sys.Resource[] resourceArray) {
 
         _resourceList.removeAllElements();
         for (int i = 0; i < resourceArray.length; i++) {
@@ -439,17 +439,17 @@
         }
     }
 
-    public void setSecurityService(org.apache.openejb.alt.config.sys.SecurityService securityService) {
+    public void setSecurityService(org.apache.openejb.config.sys.SecurityService securityService) {
         this._securityService = securityService;
     }
 
-    public void setTransactionService(org.apache.openejb.alt.config.sys.TransactionManager transactionManager) {
+    public void setTransactionService(org.apache.openejb.config.sys.TransactionManager transactionManager) {
         this._transactionManager = transactionManager;
     }
 
     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.Openejb) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.Openejb.class, reader);
+        return (org.apache.openejb.config.sys.Openejb) Unmarshaller.unmarshal(org.apache.openejb.config.sys.Openejb.class, reader);
     }
 
     public void validate()