From scm-return-46092-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org  Tue Apr 26 23:21:39 2011
Return-Path: <scm-return-46092-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C5432125F
	for <apmail-geronimo-scm-archive@www.apache.org>; Tue, 26 Apr 2011 23:21:39 +0000 (UTC)
Received: (qmail 48706 invoked by uid 500); 26 Apr 2011 23:21:39 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 48668 invoked by uid 500); 26 Apr 2011 23:21:39 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 48659 invoked by uid 99); 26 Apr 2011 23:21:39 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 23:21:39 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 23:21:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1B1A32388978; Tue, 26 Apr 2011 23:21:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1096959 [1/3] - in /geronimo/server/trunk:
 framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/
 plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/
 plugins/j2ee/geronimo-j2ee...
Date: Tue, 26 Apr 2011 23:21:15 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110426232116.1B1A32388978@eris.apache.org>

Author: djencks
Date: Tue Apr 26 23:21:13 2011
New Revision: 1096959

URL: http://svn.apache.org/viewvc?rev=1096959&view=rev
Log:
convert geronimo-naming-builder to jaxb, simplify NamingBuilder interfaces to not rely on xmlbeans

Added:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/AbstractNamingEntryType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbLocalRefType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbRefType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EnvEntryType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanLocatorType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanRefType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/MessageDestinationType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ObjectFactory.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PatternType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextRefType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextTypeType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceUnitRefType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PortCompletionType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PortPropertyType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PortType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PropertyType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ResourceEnvRefType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ResourceLocatorType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ResourceRefType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceCompletionType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceRefType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/package-info.java   (with props)
Removed:
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LocalRefDConfigBean.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/RemoteRefDConfigBean.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/EjbLocalRef.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/EjbRef.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/GBeanLocator.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/HasPattern.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/MessageDestination.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/Pattern.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/ResourceEnvRef.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/ResourceRef.java
Modified:
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/JndiPlan.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ApplicationType.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/JaxbUtil.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentSetter.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ServiceRefBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UserTransactionRefBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java Tue Apr 26 23:21:13 2011
@@ -19,19 +19,17 @@ package org.apache.geronimo.deployment;
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
-import org.apache.xmlbeans.QNameSet;
 
 /**
  * @version $Rev$ $Date$
  */
 public abstract class AbstractBuilderCollection<T extends AbstractNamespaceBuilder> {
     protected final Collection<T> builders;
-    protected QNameSet specQNames = QNameSet.EMPTY;
-    protected QNameSet planQNames = QNameSet.EMPTY;
+//    protected QNameSet specQNames = QNameSet.EMPTY;
+//    protected QNameSet planQNames = QNameSet.EMPTY;
 
     protected AbstractBuilderCollection(Collection<T> builders) {
         this.builders = builders == null ? Collections.<T>emptySet() : builders;
@@ -44,11 +42,11 @@ public abstract class AbstractBuilderCol
 
                 public void memberRemoved(ReferenceCollectionEvent event) {
                     T builder = (T) event.getMember();
-                    QNameSet builderSpecQNames = builder.getSpecQNameSet();
-                    specQNames = specQNames.intersect(builderSpecQNames.inverse());
-                    QNameSet builderPlanQNames = builder.getPlanQNameSet();
-                    planQNames = planQNames.intersect(builderPlanQNames.inverse());
-                    XmlBeansUtil.unregisterSubstitutionGroupElements(builder.getBaseQName(), builderPlanQNames);
+//                    QNameSet builderSpecQNames = builder.getSpecQNameSet();
+//                    specQNames = specQNames.intersect(builderSpecQNames.inverse());
+//                    QNameSet builderPlanQNames = builder.getPlanQNameSet();
+//                    planQNames = planQNames.intersect(builderPlanQNames.inverse());
+//                    XmlBeansUtil.unregisterSubstitutionGroupElements(builder.getBaseQName(), builderPlanQNames);
                 }
             });
         }
@@ -59,36 +57,36 @@ public abstract class AbstractBuilderCol
 
 
     protected void addBuilder(T builder) {
-        QNameSet builderSpecQNames = builder.getSpecQNameSet();
-        QNameSet builderPlanQNames = builder.getPlanQNameSet();
-        if (builderSpecQNames == null) {
-            throw new IllegalStateException("Builder " + builder + " is missing spec qnames");
-        }
-        if (builderPlanQNames == null) {
-            throw new IllegalStateException("Builder " + builder + " is missing plan qnames");
-        }
-        if (!specQNames.isDisjoint(builderSpecQNames) && !planQNames.isDisjoint(builderPlanQNames)) {
-            throw new IllegalArgumentException("Duplicate builderSpecQNames in builder set: " + builderSpecQNames + " and duplicate builderPlanQNames in builder set: " + builderPlanQNames);
-        }
-        try {
-            specQNames = specQNames.union(builderSpecQNames);
-            planQNames = planQNames.union(builderPlanQNames);
-        } catch (NullPointerException e) {
-            throw (IllegalArgumentException) new IllegalArgumentException("could not merge qnamesets for builder " + builder).initCause(e);
-
-        }
+//        QNameSet builderSpecQNames = builder.getSpecQNameSet();
+//        QNameSet builderPlanQNames = builder.getPlanQNameSet();
+//        if (builderSpecQNames == null) {
+//            throw new IllegalStateException("Builder " + builder + " is missing spec qnames");
+//        }
+//        if (builderPlanQNames == null) {
+//            throw new IllegalStateException("Builder " + builder + " is missing plan qnames");
+//        }
+//        if (!specQNames.isDisjoint(builderSpecQNames) && !planQNames.isDisjoint(builderPlanQNames)) {
+//            throw new IllegalArgumentException("Duplicate builderSpecQNames in builder set: " + builderSpecQNames + " and duplicate builderPlanQNames in builder set: " + builderPlanQNames);
+//        }
+//        try {
+//            specQNames = specQNames.union(builderSpecQNames);
+//            planQNames = planQNames.union(builderPlanQNames);
+//        } catch (NullPointerException e) {
+//            throw (IllegalArgumentException) new IllegalArgumentException("could not merge qnamesets for builder " + builder).initCause(e);
+//
+//        }
         //really?
-        XmlBeansUtil.registerSubstitutionGroupElements(builder.getBaseQName(), builderPlanQNames);
-    }
-
-    public QNameSet getSpecQNameSet() {
-        return specQNames;
+//        XmlBeansUtil.registerSubstitutionGroupElements(builder.getBaseQName(), builderPlanQNames);
     }
 
-    public QNameSet getPlanQNameSet() {
-        return null;
-    }
-    
+//    public QNameSet getSpecQNameSet() {
+//        return specQNames;
+//    }
+//
+//    public QNameSet getPlanQNameSet() {
+//        return null;
+//    }
+//
     public String toString(){
         
         return builders.toString();

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java Tue Apr 26 23:21:13 2011
@@ -16,17 +16,8 @@
  */
 package org.apache.geronimo.deployment;
 
-import javax.xml.namespace.QName;
-
-import org.apache.xmlbeans.QNameSet;
-
 /**
  * @version $Rev$ $Date$
  */
 public interface AbstractNamespaceBuilder {
-    QNameSet getSpecQNameSet();
-
-    QNameSet getPlanQNameSet();
-
-    QName getBaseQName();
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java Tue Apr 26 23:21:13 2011
@@ -19,15 +19,14 @@ package org.apache.geronimo.deployment;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
  */
 public interface NamespaceDrivenBuilder extends AbstractNamespaceBuilder {
 
-    void buildEnvironment(XmlObject container, Environment environment) throws DeploymentException;
+    void buildEnvironment(Object container, Environment environment) throws DeploymentException;
  
-    void build(XmlObject container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException;
+    void build(Object container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException;
 
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java Tue Apr 26 23:21:13 2011
@@ -21,7 +21,6 @@ import java.util.Collection;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
@@ -32,13 +31,13 @@ public class NamespaceDrivenBuilderColle
         super(builders);
     }
 
-    public void buildEnvironment(XmlObject container, Environment environment) throws DeploymentException {
+    public void buildEnvironment(Object container, Environment environment) throws DeploymentException {
         for (NamespaceDrivenBuilder builder : builders) {
             builder.buildEnvironment(container, environment);
         }
     }
 
-    public void build(XmlObject container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException {
+    public void build(Object container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException {
         for (NamespaceDrivenBuilder builder : builders) {
             builder.build(container, applicationContext, moduleContext);
         }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/JndiPlan.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/JndiPlan.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/JndiPlan.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/JndiPlan.java Tue Apr 26 23:21:13 2011
@@ -20,8 +20,31 @@
 
 package org.apache.geronimo.j2ee.deployment;
 
+import java.util.List;
+
+import org.apache.geronimo.j2ee.deployment.model.naming.EjbLocalRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.EjbRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.EnvEntryType;
+import org.apache.geronimo.j2ee.deployment.model.naming.GbeanRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceContextRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceUnitRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ResourceEnvRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ResourceRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ServiceRefType;
+
 /**
  * @version $Rev:$ $Date:$
  */
 public interface JndiPlan {
+
+    List<EnvEntryType> getEnvEntry();
+    List<EjbRefType> getEjbRef();
+    List<EjbLocalRefType> getEjbLocalRef();
+    List<ResourceRefType> getResourceRef();
+    List<ResourceEnvRefType> getResourceEnvRef();
+    List<PersistenceContextRefType> getPersistenceContextRef();
+    List<PersistenceUnitRefType> getPersistenceUnitRef();
+    List<GbeanRefType> getGBeanRef();
+
+    List<ServiceRefType> getServiceRef();
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java Tue Apr 26 23:21:13 2011
@@ -17,26 +17,23 @@
 
 package org.apache.geronimo.j2ee.deployment;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.AbstractNamespaceBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.j2ee.annotation.Holder;
-import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.openejb.jee.JndiConsumer;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
  */
-public interface NamingBuilder extends AbstractNamespaceBuilder {
+public interface NamingBuilder {
 
     int NORMAL_PRIORITY = 50;
     
-    XmlObject[] NO_REFS = new XmlObject[] {};
+//    XmlObject[] NO_REFS = new XmlObject[] {};
 
     EARContext.Key<Holder> INJECTION_KEY = new EARContext.Key<Holder>() {
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java Tue Apr 26 23:21:13 2011
@@ -24,26 +24,23 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.namespace.QName;
-
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.AbstractBuilderCollection;
-import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.openejb.jee.JndiConsumer;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
  */
 @GBean(j2eeType = NameFactory.MODULE_BUILDER)
-public class NamingBuilderCollection extends AbstractBuilderCollection<NamingBuilder> implements NamingBuilder {
+public class NamingBuilderCollection implements NamingBuilder {
+
+    private Collection<NamingBuilder> builders;
 
     public NamingBuilderCollection(@ParamReference(name = "NamingBuilders", namingType = NameFactory.MODULE_BUILDER)Collection<NamingBuilder> builders) {
-        super(builders);
+        this.builders = builders;
     }
 
     public void buildEnvironment(JndiConsumer specDD, JndiPlan plan, Environment environment) throws DeploymentException {
@@ -88,16 +85,4 @@ public class NamingBuilderCollection ext
         return NORMAL_PRIORITY;
     }
 
-    public QName getBaseQName() {
-        return new QName("foo");
-    }
-
-    public QNameSet getSpecQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
-    public QNameSet getPlanQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ApplicationType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ApplicationType.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ApplicationType.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ApplicationType.java Tue Apr 26 23:21:13 2011
@@ -9,13 +9,24 @@
 package org.apache.geronimo.j2ee.deployment.model.app;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import org.apache.geronimo.j2ee.deployment.JndiPlan;
+import org.apache.geronimo.j2ee.deployment.model.naming.EjbLocalRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.EjbRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.EnvEntryType;
+import org.apache.geronimo.j2ee.deployment.model.naming.GbeanRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceContextRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceUnitRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ResourceEnvRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ResourceRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ServiceRefType;
 
 
 /**
@@ -48,12 +59,22 @@ import org.apache.geronimo.j2ee.deployme
  * 
  * 
  */
+@XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "applicationType", propOrder = {
     "environment",
     "module",
     "extModule",
-    "security"
+    "security",
+        "envEntry",
+        "ejbRef",
+        "ejbLocalRef",
+        "gbeanRef",
+        "persistenceContextRef",
+         "persistenceUnitRef",
+         "resourceEnvRef",
+          "resourceRef",
+        "serviceRef"
 })
 public class ApplicationType implements JndiPlan {
 
@@ -66,6 +87,33 @@ public class ApplicationType implements 
     @XmlAttribute(name = "application-name")
     protected String applicationName;
 
+    @XmlElement(name = "env-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<EnvEntryType> envEntry;
+
+    @XmlElement(name = "ejb-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<EjbRefType> ejbRef;
+
+    @XmlElement(name = "ejb-local-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<EjbLocalRefType> ejbLocalRef;
+
+    @XmlElement(name = "gbean-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<GbeanRefType> gbeanRef;
+
+    @XmlElement(name = "persistence-context-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<PersistenceContextRefType> persistenceContextRef;
+
+    @XmlElement(name = "persistence-unit-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<PersistenceUnitRefType> persistenceUnitRef;
+
+    @XmlElement(name = "resource-env-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ResourceEnvRefType> resourceEnvRef;
+
+    @XmlElement(name = "resource-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ResourceRefType> resourceRef;
+
+    @XmlElement(name = "service-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ServiceRefType> serviceRef;
+
     /**
      * 
      *                         Reference to environment element defined in imported
@@ -205,4 +253,69 @@ public class ApplicationType implements 
         this.applicationName = value;
     }
 
+
+    //JndiPlan methods
+
+    public List<EnvEntryType> getEnvEntry() {
+        if (envEntry == null) {
+            envEntry = new ArrayList<EnvEntryType>();
+        }
+        return envEntry;
+    }
+
+    public List<EjbRefType> getEjbRef() {
+        if (ejbRef == null) {
+            ejbRef = new ArrayList<EjbRefType>();
+        }
+        return ejbRef;
+    }
+
+    public List<EjbLocalRefType> getEjbLocalRef() {
+        if (ejbLocalRef == null) {
+            ejbLocalRef = new ArrayList<EjbLocalRefType>();
+        }
+        return ejbLocalRef;
+    }
+
+    public List<ResourceRefType> getResourceRef() {
+        if (resourceRef == null) {
+            resourceRef = new ArrayList<ResourceRefType>();
+        }
+        return resourceRef;
+    }
+
+    public List<ResourceEnvRefType> getResourceEnvRef() {
+        if (resourceEnvRef == null) {
+            resourceEnvRef = new ArrayList<ResourceEnvRefType>();
+        }
+        return resourceEnvRef;
+    }
+
+    public List<PersistenceContextRefType> getPersistenceContextRef() {
+        if (persistenceContextRef == null) {
+            persistenceContextRef = new ArrayList<PersistenceContextRefType>();
+        }
+        return persistenceContextRef;
+    }
+
+    public List<PersistenceUnitRefType> getPersistenceUnitRef() {
+        if (persistenceUnitRef == null) {
+            persistenceUnitRef = new ArrayList<PersistenceUnitRefType>();
+        }
+        return persistenceUnitRef;
+    }
+
+    public List<GbeanRefType> getGBeanRef() {
+        if (gbeanRef == null) {
+            gbeanRef = new ArrayList<GbeanRefType>();
+        }
+        return gbeanRef;
+    }
+
+    public List<ServiceRefType> getServiceRef() {
+        if (serviceRef == null) {
+            serviceRef = new ArrayList<ServiceRefType>();
+        }
+        return serviceRef;
+    }
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/JaxbUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/JaxbUtil.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/JaxbUtil.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/JaxbUtil.java Tue Apr 26 23:21:13 2011
@@ -52,7 +52,7 @@ import org.xml.sax.helpers.XMLFilterImpl
 public class JaxbUtil {
 
     public static final XMLInputFactory XMLINPUT_FACTORY = XMLInputFactory.newInstance();
-    private static final JAXBContext APPLICATION_CONTEXT;
+    private static  JAXBContext APPLICATION_CONTEXT;
     static {
         try {
             APPLICATION_CONTEXT = JAXBContext.newInstance(ApplicationType.class);

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/AbstractNamingEntryType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/AbstractNamingEntryType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/AbstractNamingEntryType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/AbstractNamingEntryType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,45 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for abstract-naming-entryType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="abstract-naming-entryType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "abstract-naming-entryType")
+@XmlSeeAlso({
+    PersistenceUnitRefType.class,
+    GbeanRefType.class,
+    PersistenceContextRefType.class
+})
+public abstract class AbstractNamingEntryType {
+
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/AbstractNamingEntryType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/AbstractNamingEntryType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/AbstractNamingEntryType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbLocalRefType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbLocalRefType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbLocalRefType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbLocalRefType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,126 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ejb-local-refType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ejb-local-refType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ref-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;choice>
+ *           &lt;element name="pattern" type="{http://geronimo.apache.org/xml/ns/naming-1.2}patternType"/>
+ *           &lt;element name="ejb-link" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ejb-local-refType", propOrder = {
+    "refName",
+    "pattern",
+    "ejbLink"
+})
+public class EjbLocalRefType {
+
+    @XmlElement(name = "ref-name", required = true)
+    protected String refName;
+    protected PatternType pattern;
+    @XmlElement(name = "ejb-link")
+    protected String ejbLink;
+
+    /**
+     * Gets the value of the refName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRefName() {
+        return refName;
+    }
+
+    /**
+     * Sets the value of the refName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRefName(String value) {
+        this.refName = value;
+    }
+
+    /**
+     * Gets the value of the pattern property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PatternType }
+     *     
+     */
+    public PatternType getPattern() {
+        return pattern;
+    }
+
+    /**
+     * Sets the value of the pattern property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PatternType }
+     *     
+     */
+    public void setPattern(PatternType value) {
+        this.pattern = value;
+    }
+
+    /**
+     * Gets the value of the ejbLink property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEjbLink() {
+        return ejbLink;
+    }
+
+    /**
+     * Sets the value of the ejbLink property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEjbLink(String value) {
+        this.ejbLink = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbLocalRefType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbLocalRefType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbLocalRefType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbRefType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbRefType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbRefType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbRefType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,235 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ejb-refType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ejb-refType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ref-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;choice>
+ *           &lt;element name="pattern" type="{http://geronimo.apache.org/xml/ns/naming-1.2}patternType"/>
+ *           &lt;group ref="{http://geronimo.apache.org/xml/ns/naming-1.2}corbaNameGroup"/>
+ *           &lt;element name="ejb-link" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ejb-refType", propOrder = {
+    "refName",
+    "pattern",
+    "nsCorbaloc",
+    "name",
+    "css",
+    "cssLink",
+    "ejbLink"
+})
+public class EjbRefType {
+
+    @XmlElement(name = "ref-name", required = true)
+    protected String refName;
+    protected PatternType pattern;
+    @XmlElement(name = "ns-corbaloc")
+    @XmlSchemaType(name = "anyURI")
+    protected String nsCorbaloc;
+    protected String name;
+    protected PatternType css;
+    @XmlElement(name = "css-link")
+    protected String cssLink;
+    @XmlElement(name = "ejb-link")
+    protected String ejbLink;
+
+    /**
+     * Gets the value of the refName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRefName() {
+        return refName;
+    }
+
+    /**
+     * Sets the value of the refName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRefName(String value) {
+        this.refName = value;
+    }
+
+    /**
+     * Gets the value of the pattern property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PatternType }
+     *     
+     */
+    public PatternType getPattern() {
+        return pattern;
+    }
+
+    /**
+     * Sets the value of the pattern property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PatternType }
+     *     
+     */
+    public void setPattern(PatternType value) {
+        this.pattern = value;
+    }
+
+    /**
+     * Gets the value of the nsCorbaloc property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNsCorbaloc() {
+        return nsCorbaloc;
+    }
+
+    /**
+     * Sets the value of the nsCorbaloc property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNsCorbaloc(String value) {
+        this.nsCorbaloc = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the css property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PatternType }
+     *     
+     */
+    public PatternType getCss() {
+        return css;
+    }
+
+    /**
+     * Sets the value of the css property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PatternType }
+     *     
+     */
+    public void setCss(PatternType value) {
+        this.css = value;
+    }
+
+    /**
+     * Gets the value of the cssLink property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCssLink() {
+        return cssLink;
+    }
+
+    /**
+     * Sets the value of the cssLink property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCssLink(String value) {
+        this.cssLink = value;
+    }
+
+    /**
+     * Gets the value of the ejbLink property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEjbLink() {
+        return ejbLink;
+    }
+
+    /**
+     * Sets the value of the ejbLink property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEjbLink(String value) {
+        this.ejbLink = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbRefType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbRefType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EjbRefType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EnvEntryType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EnvEntryType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EnvEntryType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EnvEntryType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for env-entryType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="env-entryType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="env-entry-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="env-entry-value" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "env-entryType", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", propOrder = {
+    "envEntryName",
+    "envEntryValue"
+})
+public class EnvEntryType {
+
+    @XmlElement(name = "env-entry-name", required = true)
+    protected String envEntryName;
+    @XmlElement(name = "env-entry-value", required = true)
+    protected String envEntryValue;
+
+    /**
+     * Gets the value of the envEntryName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEnvEntryName() {
+        return envEntryName;
+    }
+
+    /**
+     * Sets the value of the envEntryName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEnvEntryName(String value) {
+        this.envEntryName = value;
+    }
+
+    /**
+     * Gets the value of the envEntryValue property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEnvEntryValue() {
+        return envEntryValue;
+    }
+
+    /**
+     * Sets the value of the envEntryValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEnvEntryValue(String value) {
+        this.envEntryValue = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EnvEntryType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EnvEntryType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/EnvEntryType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanLocatorType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanLocatorType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanLocatorType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanLocatorType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,98 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for gbean-locatorType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="gbean-locatorType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;choice>
+ *           &lt;element name="pattern" type="{http://geronimo.apache.org/xml/ns/naming-1.2}patternType"/>
+ *           &lt;element name="gbean-link" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "gbean-locatorType", propOrder = {
+    "pattern",
+    "gbeanLink"
+})
+public class GbeanLocatorType {
+
+    protected PatternType pattern;
+    @XmlElement(name = "gbean-link")
+    protected String gbeanLink;
+
+    /**
+     * Gets the value of the pattern property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PatternType }
+     *     
+     */
+    public PatternType getPattern() {
+        return pattern;
+    }
+
+    /**
+     * Sets the value of the pattern property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PatternType }
+     *     
+     */
+    public void setPattern(PatternType value) {
+        this.pattern = value;
+    }
+
+    /**
+     * Gets the value of the gbeanLink property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGbeanLink() {
+        return gbeanLink;
+    }
+
+    /**
+     * Sets the value of the gbeanLink property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGbeanLink(String value) {
+        this.gbeanLink = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanLocatorType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanLocatorType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanLocatorType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanRefType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanRefType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanRefType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanRefType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,140 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for gbean-refType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="gbean-refType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://geronimo.apache.org/xml/ns/naming-1.2}abstract-naming-entryType">
+ *       &lt;sequence>
+ *         &lt;element name="ref-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="ref-type" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *           &lt;element name="pattern" type="{http://geronimo.apache.org/xml/ns/naming-1.2}patternType"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "gbean-refType", propOrder = {
+    "refName",
+    "refType",
+    "pattern"
+})
+public class GbeanRefType
+    extends AbstractNamingEntryType
+{
+
+    @XmlElement(name = "ref-name", required = true)
+    protected String refName;
+    @XmlElement(name = "ref-type")
+    protected List<String> refType;
+    protected List<PatternType> pattern;
+
+    /**
+     * Gets the value of the refName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRefName() {
+        return refName;
+    }
+
+    /**
+     * Sets the value of the refName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRefName(String value) {
+        this.refName = value;
+    }
+
+    /**
+     * Gets the value of the refType property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the refType property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRefType().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getRefType() {
+        if (refType == null) {
+            refType = new ArrayList<String>();
+        }
+        return this.refType;
+    }
+
+    /**
+     * Gets the value of the pattern property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the pattern property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPattern().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PatternType }
+     * 
+     * 
+     */
+    public List<PatternType> getPattern() {
+        if (pattern == null) {
+            pattern = new ArrayList<PatternType>();
+        }
+        return this.pattern;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanRefType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanRefType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/GbeanRefType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/MessageDestinationType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/MessageDestinationType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/MessageDestinationType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/MessageDestinationType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,156 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for message-destinationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="message-destinationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="message-destination-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;choice>
+ *           &lt;element name="pattern" type="{http://geronimo.apache.org/xml/ns/naming-1.2}patternType"/>
+ *           &lt;sequence>
+ *             &lt;element name="admin-object-module" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *             &lt;element name="admin-object-link" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;/sequence>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "message-destinationType", propOrder = {
+    "messageDestinationName",
+    "pattern",
+    "adminObjectModule",
+    "adminObjectLink"
+})
+public class MessageDestinationType {
+
+    @XmlElement(name = "message-destination-name", required = true)
+    protected String messageDestinationName;
+    protected PatternType pattern;
+    @XmlElement(name = "admin-object-module")
+    protected String adminObjectModule;
+    @XmlElement(name = "admin-object-link")
+    protected String adminObjectLink;
+
+    /**
+     * Gets the value of the messageDestinationName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getMessageDestinationName() {
+        return messageDestinationName;
+    }
+
+    /**
+     * Sets the value of the messageDestinationName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMessageDestinationName(String value) {
+        this.messageDestinationName = value;
+    }
+
+    /**
+     * Gets the value of the pattern property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PatternType }
+     *     
+     */
+    public PatternType getPattern() {
+        return pattern;
+    }
+
+    /**
+     * Sets the value of the pattern property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PatternType }
+     *     
+     */
+    public void setPattern(PatternType value) {
+        this.pattern = value;
+    }
+
+    /**
+     * Gets the value of the adminObjectModule property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAdminObjectModule() {
+        return adminObjectModule;
+    }
+
+    /**
+     * Sets the value of the adminObjectModule property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAdminObjectModule(String value) {
+        this.adminObjectModule = value;
+    }
+
+    /**
+     * Gets the value of the adminObjectLink property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAdminObjectLink() {
+        return adminObjectLink;
+    }
+
+    /**
+     * Sets the value of the adminObjectLink property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAdminObjectLink(String value) {
+        this.adminObjectLink = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/MessageDestinationType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/MessageDestinationType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/MessageDestinationType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ObjectFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ObjectFactory.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ObjectFactory.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ObjectFactory.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,336 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the org.apache.geronimo.j2ee.deployment.model.naming package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _ServiceRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "service-ref");
+    private final static QName _PersistenceUnitRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "persistence-unit-ref");
+    private final static QName _EjbRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "ejb-ref");
+    private final static QName _MessageDestination_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "message-destination");
+    private final static QName _WebContainer_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "web-container");
+    private final static QName _AbstractNamingEntry_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "abstract-naming-entry");
+    private final static QName _ResourceEnvRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "resource-env-ref");
+    private final static QName _Workmanager_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "workmanager");
+    private final static QName _EnvEntry_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "env-entry");
+    private final static QName _CmpConnectionFactory_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "cmp-connection-factory");
+    private final static QName _ResourceRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "resource-ref");
+    private final static QName _ResourceAdapter_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "resource-adapter");
+    private final static QName _EjbLocalRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "ejb-local-ref");
+    private final static QName _GbeanRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "gbean-ref");
+    private final static QName _PersistenceContextRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "persistence-context-ref");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.j2ee.deployment.model.naming
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ResourceLocatorType }
+     * 
+     */
+    public ResourceLocatorType createResourceLocatorType() {
+        return new ResourceLocatorType();
+    }
+
+    /**
+     * Create an instance of {@link GbeanRefType }
+     * 
+     */
+    public GbeanRefType createGbeanRefType() {
+        return new GbeanRefType();
+    }
+
+    /**
+     * Create an instance of {@link PersistenceUnitRefType }
+     * 
+     */
+    public PersistenceUnitRefType createPersistenceUnitRefType() {
+        return new PersistenceUnitRefType();
+    }
+
+    /**
+     * Create an instance of {@link PortType }
+     * 
+     */
+    public PortType createPortType() {
+        return new PortType();
+    }
+
+    /**
+     * Create an instance of {@link PatternType }
+     * 
+     */
+    public PatternType createPatternType() {
+        return new PatternType();
+    }
+
+    /**
+     * Create an instance of {@link PropertyType }
+     * 
+     */
+    public PropertyType createPropertyType() {
+        return new PropertyType();
+    }
+
+    /**
+     * Create an instance of {@link ResourceRefType }
+     * 
+     */
+    public ResourceRefType createResourceRefType() {
+        return new ResourceRefType();
+    }
+
+    /**
+     * Create an instance of {@link ServiceCompletionType }
+     * 
+     */
+    public ServiceCompletionType createServiceCompletionType() {
+        return new ServiceCompletionType();
+    }
+
+    /**
+     * Create an instance of {@link ServiceRefType }
+     * 
+     */
+    public ServiceRefType createServiceRefType() {
+        return new ServiceRefType();
+    }
+
+    /**
+     * Create an instance of {@link EjbLocalRefType }
+     * 
+     */
+    public EjbLocalRefType createEjbLocalRefType() {
+        return new EjbLocalRefType();
+    }
+
+    /**
+     * Create an instance of {@link GbeanLocatorType }
+     * 
+     */
+    public GbeanLocatorType createGbeanLocatorType() {
+        return new GbeanLocatorType();
+    }
+
+    /**
+     * Create an instance of {@link PortCompletionType }
+     * 
+     */
+    public PortCompletionType createPortCompletionType() {
+        return new PortCompletionType();
+    }
+
+    /**
+     * Create an instance of {@link PortPropertyType }
+     * 
+     */
+    public PortPropertyType createPortPropertyType() {
+        return new PortPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link EnvEntryType }
+     * 
+     */
+    public EnvEntryType createEnvEntryType() {
+        return new EnvEntryType();
+    }
+
+    /**
+     * Create an instance of {@link EjbRefType }
+     * 
+     */
+    public EjbRefType createEjbRefType() {
+        return new EjbRefType();
+    }
+
+    /**
+     * Create an instance of {@link PersistenceContextRefType }
+     * 
+     */
+    public PersistenceContextRefType createPersistenceContextRefType() {
+        return new PersistenceContextRefType();
+    }
+
+    /**
+     * Create an instance of {@link ResourceEnvRefType }
+     * 
+     */
+    public ResourceEnvRefType createResourceEnvRefType() {
+        return new ResourceEnvRefType();
+    }
+
+    /**
+     * Create an instance of {@link MessageDestinationType }
+     * 
+     */
+    public MessageDestinationType createMessageDestinationType() {
+        return new MessageDestinationType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "service-ref")
+    public JAXBElement<ServiceRefType> createServiceRef(ServiceRefType value) {
+        return new JAXBElement<ServiceRefType>(_ServiceRef_QNAME, ServiceRefType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PersistenceUnitRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "persistence-unit-ref", substitutionHeadNamespace = "http://geronimo.apache.org/xml/ns/naming-1.2", substitutionHeadName = "abstract-naming-entry")
+    public JAXBElement<PersistenceUnitRefType> createPersistenceUnitRef(PersistenceUnitRefType value) {
+        return new JAXBElement<PersistenceUnitRefType>(_PersistenceUnitRef_QNAME, PersistenceUnitRefType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EjbRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "ejb-ref")
+    public JAXBElement<EjbRefType> createEjbRef(EjbRefType value) {
+        return new JAXBElement<EjbRefType>(_EjbRef_QNAME, EjbRefType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link MessageDestinationType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "message-destination")
+    public JAXBElement<MessageDestinationType> createMessageDestination(MessageDestinationType value) {
+        return new JAXBElement<MessageDestinationType>(_MessageDestination_QNAME, MessageDestinationType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GbeanLocatorType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "web-container")
+    public JAXBElement<GbeanLocatorType> createWebContainer(GbeanLocatorType value) {
+        return new JAXBElement<GbeanLocatorType>(_WebContainer_QNAME, GbeanLocatorType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractNamingEntryType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "abstract-naming-entry")
+    public JAXBElement<AbstractNamingEntryType> createAbstractNamingEntry(AbstractNamingEntryType value) {
+        return new JAXBElement<AbstractNamingEntryType>(_AbstractNamingEntry_QNAME, AbstractNamingEntryType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceEnvRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "resource-env-ref")
+    public JAXBElement<ResourceEnvRefType> createResourceEnvRef(ResourceEnvRefType value) {
+        return new JAXBElement<ResourceEnvRefType>(_ResourceEnvRef_QNAME, ResourceEnvRefType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GbeanLocatorType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "workmanager")
+    public JAXBElement<GbeanLocatorType> createWorkmanager(GbeanLocatorType value) {
+        return new JAXBElement<GbeanLocatorType>(_Workmanager_QNAME, GbeanLocatorType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EnvEntryType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "env-entry")
+    public JAXBElement<EnvEntryType> createEnvEntry(EnvEntryType value) {
+        return new JAXBElement<EnvEntryType>(_EnvEntry_QNAME, EnvEntryType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceLocatorType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "cmp-connection-factory")
+    public JAXBElement<ResourceLocatorType> createCmpConnectionFactory(ResourceLocatorType value) {
+        return new JAXBElement<ResourceLocatorType>(_CmpConnectionFactory_QNAME, ResourceLocatorType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "resource-ref")
+    public JAXBElement<ResourceRefType> createResourceRef(ResourceRefType value) {
+        return new JAXBElement<ResourceRefType>(_ResourceRef_QNAME, ResourceRefType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceLocatorType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "resource-adapter")
+    public JAXBElement<ResourceLocatorType> createResourceAdapter(ResourceLocatorType value) {
+        return new JAXBElement<ResourceLocatorType>(_ResourceAdapter_QNAME, ResourceLocatorType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EjbLocalRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "ejb-local-ref")
+    public JAXBElement<EjbLocalRefType> createEjbLocalRef(EjbLocalRefType value) {
+        return new JAXBElement<EjbLocalRefType>(_EjbLocalRef_QNAME, EjbLocalRefType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GbeanRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "gbean-ref", substitutionHeadNamespace = "http://geronimo.apache.org/xml/ns/naming-1.2", substitutionHeadName = "abstract-naming-entry")
+    public JAXBElement<GbeanRefType> createGbeanRef(GbeanRefType value) {
+        return new JAXBElement<GbeanRefType>(_GbeanRef_QNAME, GbeanRefType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PersistenceContextRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "persistence-context-ref", substitutionHeadNamespace = "http://geronimo.apache.org/xml/ns/naming-1.2", substitutionHeadName = "abstract-naming-entry")
+    public JAXBElement<PersistenceContextRefType> createPersistenceContextRef(PersistenceContextRefType value) {
+        return new JAXBElement<PersistenceContextRefType>(_PersistenceContextRef_QNAME, PersistenceContextRefType.class, null, value);
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ObjectFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ObjectFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PatternType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PatternType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PatternType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PatternType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,123 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for patternType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="patternType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="filter" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="module" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "patternType", propOrder = {
+    "filter",
+    "module",
+    "name"
+})
+public class PatternType {
+
+    protected String filter;
+    protected String module;
+    @XmlElement(required = true)
+    protected String name;
+
+    /**
+     * Gets the value of the filter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFilter() {
+        return filter;
+    }
+
+    /**
+     * Sets the value of the filter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFilter(String value) {
+        this.filter = value;
+    }
+
+    /**
+     * Gets the value of the module property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getModule() {
+        return module;
+    }
+
+    /**
+     * Sets the value of the module property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setModule(String value) {
+        this.module = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PatternType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PatternType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PatternType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain