geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096958 [1/2] - in /geronimo/server/trunk: ./ framework/assemblies/geronimo-framework/ plugins/j2ee/geronimo-j2ee-builder/ plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ plugins/j2ee/geronimo-j2ee-bui...
Date Tue, 26 Apr 2011 23:20:55 GMT
Author: djencks
Date: Tue Apr 26 23:20:54 2011
New Revision: 1096958

URL: http://svn.apache.org/viewvc?rev=1096958&view=rev
Log:
get geronio-j2eme, geronimo-j2ee-builder, and j2ee-server to build. Convert buider to jaxb

Added:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/JndiPlan.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/AbstractClusteringType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/AbstractSecurityType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ApplicationType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ArtifactType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/EnvironmentType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ExtModuleType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/JaxbUtil.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ModuleType.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ObjectFactory.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/package-info.java   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-module-1.2.xsd   (with props)
Modified:
    geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/BundleDeploymentContext.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.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/xsd/geronimo-application-2.0.xsd
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.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-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/ServerTest.java
    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/test/java/org/apache/geronimo/web25/deployment/WebFragmentTest.java
    geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/plan/plan.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml?rev=1096958&r1=1096957&r2=1096958&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Tue Apr 26 23:20:54 2011
@@ -201,6 +201,13 @@
                     </bootFeatures>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ianal-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
 
         </plugins>
     </build>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=1096958&r1=1096957&r2=1096958&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Tue Apr 26 23:20:54 2011
@@ -141,6 +141,21 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.codehaus.mojo</groupId>-->
+                <!--<artifactId>jaxb2-maven-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<goals>-->
+                            <!--<goal>xjc</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+                <!--<configuration>-->
+                    <!--<packageName>org.apache.geronimo.j2ee.deployment.model</packageName>-->
+                    <!--<extension>true</extension>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
 
             <!--<plugin>-->
                 <!--<groupId>org.apache.maven.plugins</groupId>-->
@@ -263,10 +278,10 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.codehaus.mojo</groupId>-->
+                <!--<artifactId>xmlbeans-maven-plugin</artifactId>-->
+            <!--</plugin>-->
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java?rev=1096958&r1=1096957&r2=1096958&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java Tue Apr 26 23:20:54 2011
@@ -20,16 +20,16 @@ import java.util.Map;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.j2ee.deployment.model.app.ApplicationType;
 import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.openejb.jee.Application;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Revision$ $Date$
  */
-public class ApplicationInfo extends Module<Application, XmlObject> {
+public class ApplicationInfo extends Module<Application, ApplicationType> {
     
     private ConfigurationModuleType type;
 
@@ -39,7 +39,7 @@ public class ApplicationInfo extends Mod
                            String name,
                            JarFile earFile,
                            Application specDD,
-                           XmlObject vendorDD,
+                           ApplicationType vendorDD,
                            String originalSpecDD) {
         this(type, environment, baseName, name, earFile, specDD, vendorDD, originalSpecDD, null);        
     }
@@ -50,7 +50,7 @@ public class ApplicationInfo extends Mod
                            String name,
                            JarFile earFile,
                            Application specDD,
-                           XmlObject vendorDD,
+                           ApplicationType vendorDD,
                            String originalSpecDD,
                            Map<JndiKey, Map<String, Object>> jndiContext) {
         super(true, baseName, name, environment, earFile, "", specDD, vendorDD, originalSpecDD, null, jndiContext, null);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/BundleDeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/BundleDeploymentContext.java?rev=1096958&r1=1096957&r2=1096958&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/BundleDeploymentContext.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/BundleDeploymentContext.java Tue Apr 26 23:20:54 2011
@@ -34,6 +34,7 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
 /**
+ *  //TODO still needed?
  * @version $Rev:386276 $ $Date$
  */
 public class BundleDeploymentContext extends EARContext {
@@ -43,7 +44,6 @@ public class BundleDeploymentContext ext
     public BundleDeploymentContext(Environment environment,
                                    ConfigurationModuleType moduleType,
                                    Naming naming,
-                                   ConfigurationManager configurationManager,
                                    BundleContext bundleContext,
                                    AbstractNameQuery serverName,
                                    AbstractName baseName,
@@ -53,23 +53,24 @@ public class BundleDeploymentContext ext
                                    Map messageDestinations,
                                    Bundle bundle) throws DeploymentException {
         super(null, null,
-              environment, moduleType, naming, configurationManager, new BundleResourceContext(bundle), bundleContext,
+              environment, moduleType, naming, new BundleResourceContext(bundle), bundleContext,
               serverName, baseName, transactionManagerObjectName, connectionTrackerObjectName,
               corbaGBeanObjectName, messageDestinations);
         this.bundle = bundle;
     }
 
-    @Override
-    public void initializeConfiguration() throws DeploymentException {
-        try {
-            ConfigurationData configurationData = new ConfigurationData(moduleType, null, childConfigurationDatas, environment, baseDir, inPlaceConfigurationDir, naming);
-            configurationData.setBundle(bundle);
-            configurationManager.loadConfiguration(configurationData);
-            this.configuration = configurationManager.getConfiguration(environment.getConfigId());
-        } catch (Exception e) {
-            throw new DeploymentException("Unable to create configuration for deployment", e);
-        }
-    }
+
+//    @Override
+//    public void initializeConfiguration() throws DeploymentException {
+//        try {
+//            ConfigurationData configurationData = new ConfigurationData(moduleType, null, childConfigurationDatas, environment, baseDir, inPlaceConfigurationDir, naming);
+//            configurationData.setBundle(bundle);
+//            configurationManager.loadConfiguration(configurationData);
+//            this.configuration = configurationManager.getConfiguration(environment.getConfigId());
+//        } catch (Exception e) {
+//            throw new DeploymentException("Unable to create configuration for deployment", e);
+//        }
+//    }
 
     @Override
     public void getCompleteManifestClassPath(Deployable deployable,

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=1096958&r1=1096957&r2=1096958&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Tue Apr 26 23:20:54 2011
@@ -17,6 +17,8 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -41,19 +43,13 @@ import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 
 import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ConfigurationBuilder;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
-import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
-import org.apache.geronimo.deployment.service.EnvironmentBuilder;
-import org.apache.geronimo.deployment.xbeans.ArtifactType;
-import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.deployment.xbeans.PatternType;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -65,6 +61,13 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.j2ee.deployment.model.app.ApplicationType;
+import org.apache.geronimo.j2ee.deployment.model.app.ArtifactType;
+import org.apache.geronimo.j2ee.deployment.model.app.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.model.app.ExtModuleType;
+import org.apache.geronimo.j2ee.deployment.model.app.JaxbUtil;
+import org.apache.geronimo.j2ee.deployment.model.app.ModuleType;
+import org.apache.geronimo.j2ee.deployment.model.app.ObjectFactory;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.jndi.ApplicationJndi;
 import org.apache.geronimo.j2ee.jndi.JndiKey;
@@ -84,24 +87,15 @@ import org.apache.geronimo.kernel.config
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.MissingDependencyException;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.util.FileUtils;
 import org.apache.geronimo.kernel.util.JarUtils;
 import org.apache.geronimo.kernel.util.NestedJarFile;
 import org.apache.geronimo.management.J2EEResource;
 import org.apache.geronimo.management.J2EEServer;
-import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationDocument;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationType;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerExtModuleType;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerModuleType;
 import org.apache.openejb.jee.Application;
-//import org.apache.openejb.jee.Module;
 import org.apache.openejb.jee.JaxbJavaee;
 import org.apache.openejb.jee.Web;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
@@ -117,7 +111,7 @@ public class EARConfigBuilder implements
     private static final Logger log = LoggerFactory.getLogger(EARConfigBuilder.class);
     private static final String LINE_SEP = System.getProperty("line.separator");
 
-    private final static QName APPLICATION_QNAME = GerApplicationDocument.type.getDocumentElementName();
+//    private final static QName APPLICATION_QNAME = GerApplicationDocument.type.getDocumentElementName();
     private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
 
     static {
@@ -133,12 +127,12 @@ public class EARConfigBuilder implements
     private final SingleElementCollection connectorConfigBuilder;
     private final SingleElementCollection appClientConfigBuilder;
     private final SingleElementCollection resourceReferenceBuilder;
-    private final NamespaceDrivenBuilderCollection serviceBuilders;
+//    private final NamespaceDrivenBuilderCollection serviceBuilders;
     private final Collection<ModuleBuilderExtension> BValModuleBuilders;
     private final Collection<ModuleBuilderExtension> persistenceUnitBuilders;
     private final NamingBuilder namingBuilders;
 
-    private final Environment defaultEnvironment;
+//    private final Environment defaultEnvironment;
     private final AbstractNameQuery serverName;
     private final AbstractNameQuery transactionManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
@@ -162,7 +156,8 @@ public class EARConfigBuilder implements
         }
     };
 
-    public EARConfigBuilder(@ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
+    public EARConfigBuilder(
+//            @ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
                             @ParamAttribute(name = "transactionManagerAbstractName") AbstractNameQuery transactionManagerAbstractName,
                             @ParamAttribute(name = "connectionTrackerAbstractName") AbstractNameQuery connectionTrackerAbstractName,
                             @ParamAttribute(name = "corbaGBeanAbstractName") AbstractNameQuery corbaGBeanAbstractName,
@@ -174,14 +169,15 @@ public class EARConfigBuilder implements
                             @ParamReference(name = "ConnectorConfigBuilder", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilder> connectorConfigBuilder,
                             @ParamReference(name = "ActivationSpecInfoLocator", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilder> resourceReferenceBuilder,
                             @ParamReference(name = "AppClientConfigBuilder", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilder> appClientConfigBuilder,
-                            @ParamReference(name = "ServiceBuilders", namingType = NameFactory.MODULE_BUILDER) Collection<NamespaceDrivenBuilder> serviceBuilders,
+//                            @ParamReference(name = "ServiceBuilders", namingType = NameFactory.MODULE_BUILDER) Collection<NamespaceDrivenBuilder> serviceBuilders,
                             @ParamReference(name = "BValModuleBuilders", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilderExtension> BValModuleBuilders,
                             @ParamReference(name = "PersistenceUnitBuilders", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilderExtension> persistenceUnitBuilders,
                             @ParamReference(name = "NamingBuilders", namingType = NameFactory.MODULE_BUILDER) NamingBuilder namingBuilders,
                             @ParamReference(name = "ArtifactResolvers", namingType = "ArtifactResolver") Collection<? extends ArtifactResolver> artifactResolvers,
                             @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
                             @ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext) throws GBeanNotFoundException {
-        this(defaultEnvironment,
+        this(
+//                defaultEnvironment,
                 transactionManagerAbstractName,
                 connectionTrackerAbstractName,
                 corbaGBeanAbstractName,
@@ -194,7 +190,7 @@ public class EARConfigBuilder implements
                 new SingleElementCollection<ModuleBuilder>(connectorConfigBuilder),
                 new SingleElementCollection<ModuleBuilder>(resourceReferenceBuilder),
                 new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
-                serviceBuilders,
+//                serviceBuilders,
                 BValModuleBuilders,
                 persistenceUnitBuilders,
                 namingBuilders,
@@ -203,7 +199,8 @@ public class EARConfigBuilder implements
                 bundleContext);
     }
 
-    public EARConfigBuilder(Environment defaultEnvironment,
+    public EARConfigBuilder(
+//            Environment defaultEnvironment,
                             AbstractNameQuery transactionManagerAbstractName,
                             AbstractNameQuery connectionTrackerAbstractName,
                             AbstractNameQuery corbaGBeanAbstractName,
@@ -221,7 +218,8 @@ public class EARConfigBuilder implements
                             NamingBuilder namingBuilders,
                             Naming naming,
                             Collection<? extends ArtifactResolver> artifactResolvers, BundleContext bundleContext) {
-        this(defaultEnvironment,
+        this(
+//                defaultEnvironment,
                 transactionManagerAbstractName,
                 connectionTrackerAbstractName,
                 corbaGBeanAbstractName,
@@ -234,7 +232,7 @@ public class EARConfigBuilder implements
                 new SingleElementCollection<ModuleBuilder>(connectorConfigBuilder),
                 new SingleElementCollection<ActivationSpecInfoLocator>(activationSpecInfoLocator),
                 new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
-                serviceBuilder == null ? Collections.<NamespaceDrivenBuilder>emptySet() : Collections.singleton(serviceBuilder),
+//                serviceBuilder == null ? Collections.<NamespaceDrivenBuilder>emptySet() : Collections.singleton(serviceBuilder),
                 BValModuleBuilder == null ? Collections.<ModuleBuilderExtension>emptySet() : Collections.singleton(BValModuleBuilder),
                 persistenceUnitBuilder == null ? Collections.<ModuleBuilderExtension>emptySet() : Collections.singleton(persistenceUnitBuilder),
                 namingBuilders,
@@ -243,7 +241,8 @@ public class EARConfigBuilder implements
                 bundleContext);
     }
 
-    private EARConfigBuilder(Environment defaultEnvironment,
+    private EARConfigBuilder(
+//            Environment defaultEnvironment,
                              AbstractNameQuery transactionManagerAbstractName,
                              AbstractNameQuery connectionTrackerAbstractName,
                              AbstractNameQuery corbaGBeanAbstractName,
@@ -256,7 +255,7 @@ public class EARConfigBuilder implements
                              SingleElementCollection connectorConfigBuilder,
                              SingleElementCollection resourceReferenceBuilder,
                              SingleElementCollection appClientConfigBuilder,
-                             Collection<NamespaceDrivenBuilder> serviceBuilders,
+//                             Collection<NamespaceDrivenBuilder> serviceBuilders,
                              Collection<ModuleBuilderExtension> BValModuleBuilders,
                              Collection<ModuleBuilderExtension> persistenceUnitBuilders,
                              NamingBuilder namingBuilders,
@@ -265,14 +264,14 @@ public class EARConfigBuilder implements
                              BundleContext bundleContext) {
         this.configurationManager = configurationManager;
         this.repositories = repositories;
-        this.defaultEnvironment = defaultEnvironment;
+//        this.defaultEnvironment = defaultEnvironment;
 
         this.ejbConfigBuilder = ejbConfigBuilder;
         this.resourceReferenceBuilder = resourceReferenceBuilder;
         this.webConfigBuilder = webConfigBuilder;
         this.connectorConfigBuilder = connectorConfigBuilder;
         this.appClientConfigBuilder = appClientConfigBuilder;
-        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
+//        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
         this.BValModuleBuilders = BValModuleBuilders;
         this.persistenceUnitBuilders = persistenceUnitBuilders;
         this.namingBuilders = namingBuilders;
@@ -288,11 +287,11 @@ public class EARConfigBuilder implements
     }
 
     public void doStart() throws Exception {
-        XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+//        XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
     }
 
     public void doStop() {
-        XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+//        XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
     }
 
     public void doFail() {
@@ -401,36 +400,74 @@ public class EARConfigBuilder implements
 
         }
 
-        GerApplicationType gerApplication = null;
+        ApplicationType applicationType = null;
         try {
-            // load the geronimo-application.xml from either the supplied plan or from the earFile
-            XmlObject rawPlan;
-            try {
-                if (planFile != null) {
-                    rawPlan = XmlBeansUtil.parse(planFile.toURI().toURL(), getClass().getClassLoader());
-                    gerApplication = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, APPLICATION_QNAME, GerApplicationType.type);
-                    if (gerApplication == null) {
-                        return null;
+            if (planFile != null) {
+                InputStream in = new FileInputStream(planFile);
+                try {
+    //                    moduleType = JaxbUtil.unmarshal(ModuleType.class, in, false);
+                    applicationType = JaxbUtil.unmarshalApplication(in, false);
+    //                } catch (XMLStreamException e) {
+    //                     return null;
+                } catch (JAXBException e) {
+                    return null;
+                } finally {
+                    in.close();
+                }
+    //                xmlObject = XmlBeansUtil.parse(planFile.toURI().toURL(), getClass().getClassLoader());
+            } else {
+                URL path = JarUtils.createJarURL(earFile, "META-INF/geronimo-service.xml");
+                try {
+                    InputStream in = path.openStream();
+                    try {
+    //                        moduleType = JaxbUtil.unmarshal(ModuleType.class, in, false);
+                        applicationType = JaxbUtil.unmarshalApplication(in, false);
+                    } catch (JAXBException e) {
+                        throw new DeploymentException("Could not unmarshall plan", e);
+                    } finally {
+                        in.close();
                     }
-                } else {
-                    URL path = JarUtils.createJarURL(earFile, "META-INF/geronimo-application.xml");
-                    rawPlan = XmlBeansUtil.parse(path, getClass().getClassLoader());
-                    gerApplication = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, APPLICATION_QNAME, GerApplicationType.type);
+                } catch (FileNotFoundException e) {
+                    // no plan
                 }
-            } catch (IOException e) {
-                //TODO isn't this an error?
             }
-
-            // if we got one extract the validate it otherwise create a default one
-            if (gerApplication == null) {
-                gerApplication = createDefaultPlan(application, earFile);
-            }
-        } catch (XmlException e) {
-            throw new DeploymentException(e);
+        } catch (XMLStreamException e) {
+            throw new DeploymentException("Could not unmarshall plan", e);
+        } catch (IOException e) {
+            throw new DeploymentException("Could not unmarshall plan", e);
+        }
+        if (applicationType == null) {
+            applicationType = createDefaultPlan(application, earFile);
         }
+//        try {
+//            // load the geronimo-application.xml from either the supplied plan or from the earFile
+//            XmlObject rawPlan;
+//            try {
+//                if (planFile != null) {
+//                    rawPlan = XmlBeansUtil.parse(planFile.toURI().toURL(), getClass().getClassLoader());
+//                    applicationType = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, APPLICATION_QNAME, GerApplicationType.type);
+//                    if (applicationType == null) {
+//                        return null;
+//                    }
+//                } else {
+//                    URL path = JarUtils.createJarURL(earFile, "META-INF/geronimo-application.xml");
+//                    rawPlan = XmlBeansUtil.parse(path, getClass().getClassLoader());
+//                    applicationType = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, APPLICATION_QNAME, GerApplicationType.type);
+//                }
+//            } catch (IOException e) {
+//                //TODO isn't this an error?
+//            }
+//
+//            // if we got one extract the validate it otherwise create a default one
+//            if (applicationType == null) {
+//                applicationType = createDefaultPlan(application, earFile);
+//            }
+//        } catch (XmlException e) {
+//            throw new DeploymentException(e);
+//        }
 
-        EnvironmentType environmentType = gerApplication.getEnvironment();
-        Environment environment = EnvironmentBuilder.buildEnvironment(environmentType, defaultEnvironment);
+        EnvironmentType environmentType = applicationType.getEnvironment();
+        Environment environment = buildEnvironment(environmentType);
         idBuilder.resolve(environment, earFile == null ? planFile.getName() : new File(earFile.getName()).getName(), "ear");
         // Make this EAR's settings the default for child modules
         idBuilder.setDefaultGroup(environment.getConfigId().getGroupId());
@@ -438,7 +475,7 @@ public class EARConfigBuilder implements
 
         Artifact artifact = environment.getConfigId();
         AbstractName earName = naming.createRootName(artifact, artifact.toString(), NameFactory.J2EE_APPLICATION);
-        namingBuilders.buildEnvironment(application, gerApplication, environment);
+        namingBuilders.buildEnvironment(application, applicationType, environment);
 
         // get the modules either the application plan or for a stand alone module from the specific deployer
         // todo change module so you can extract the real module path back out.. then we can eliminate
@@ -457,11 +494,11 @@ public class EARConfigBuilder implements
                 applicationName,
                 earFile,
                 application,
-                gerApplication,
+                applicationType,
                 application.toString()
         );
         try {
-            addModules(earFile, application, gerApplication, environment, applicationInfo, idBuilder);
+            addModules(earFile, application, applicationType, environment, applicationInfo, idBuilder);
             if (applicationInfo.getModules().isEmpty()) {
                 //if no application.xml and no modules detected, return null for stand-alone module processing
                 return null;
@@ -486,6 +523,20 @@ public class EARConfigBuilder implements
         return applicationInfo;
     }
 
+    private Environment buildEnvironment(EnvironmentType environmentType) {
+        Environment environment = new Environment();
+        ArtifactType artifactType = environmentType.getModuleId();
+        Artifact artifact = new Artifact(artifactType.getGroupId(), artifactType.getArtifactId(), artifactType.getVersion(), artifactType.getType());
+        environment.setConfigId(artifact);
+        environment.setBundleActivator(environmentType.getBundleActivator());
+        environment.addDynamicImportPackages(environmentType.getDynamicImportPackage());
+        environment.addExportPackages(environmentType.getExportPackage());
+        environment.addImportPackages(environmentType.getImportPackage());
+        environment.addRequireBundles(environmentType.getRequireBundle());
+
+        return environment;
+    }
+
     private void addModulesToDefaultPlan(Application application, Set<Module<?, ?>> modules) {
         for (Module module : modules) {
             ConfigurationModuleType configurationModuleType = module.getType();
@@ -507,11 +558,14 @@ public class EARConfigBuilder implements
         }
     }
 
-    private GerApplicationType createDefaultPlan(Application application, JarFile module) {
+    private ApplicationType createDefaultPlan(Application application, JarFile module) {
         // construct the empty geronimo-application.xml
-        GerApplicationType gerApplication = GerApplicationType.Factory.newInstance();
-        EnvironmentType environmentType = gerApplication.addNewEnvironment();
-        ArtifactType artifactType = environmentType.addNewModuleId();
+        ObjectFactory objectFactory = new ObjectFactory();
+        ApplicationType applicationType = objectFactory.createApplicationType();
+        EnvironmentType environmentType = objectFactory.createEnvironmentType();
+        applicationType.setEnvironment(environmentType);
+        ArtifactType artifactType = objectFactory.createArtifactType();
+        environmentType.setModuleId(artifactType);
 
         artifactType.setGroupId(Artifact.DEFAULT_GROUP_ID);
 
@@ -531,7 +585,7 @@ public class EARConfigBuilder implements
         artifactType.setArtifactId(id);
         artifactType.setVersion("" + System.currentTimeMillis());
         artifactType.setType("car");
-        return gerApplication;
+        return applicationType;
     }
 
     public Artifact getConfigurationID(Object plan, JarFile module, ModuleIDBuilder idBuilder) throws IOException, DeploymentException {
@@ -577,7 +631,6 @@ public class EARConfigBuilder implements
                     applicationInfo.getEnvironment(),
                     applicationType,
                     naming,
-                    configurationManager,
                     bundleContext,
                     serverName,
                     applicationInfo.getModuleName(),
@@ -617,7 +670,7 @@ public class EARConfigBuilder implements
                 }
             }
 
-            GerApplicationType geronimoApplication = (GerApplicationType) applicationInfo.getVendorDD();
+            ApplicationType geronimoApplication = applicationInfo.getVendorDD();
 
             // each module installs it's files into the output context.. this is different for each module type
             for (Module module : applicationInfo.getModules()) {
@@ -656,9 +709,9 @@ public class EARConfigBuilder implements
             }
 
             // add gbeans declared in the geronimo-application.xml
-            if (geronimoApplication != null) {
-                serviceBuilders.build(geronimoApplication, earContext, earContext);
-            }
+//            if (geronimoApplication != null) {
+//                serviceBuilders.build(geronimoApplication, earContext, earContext);
+//            }
 
             if (ConfigurationModuleType.EAR == applicationType) {
                 
@@ -824,7 +877,7 @@ public class EARConfigBuilder implements
         return filter;
     }
 
-    private void addModules(JarFile earFile, Application application, GerApplicationType gerApplication, Environment environment, Module applicationInfo, ModuleIDBuilder idBuilder) throws DeploymentException {
+    private void addModules(JarFile earFile, Application application, ApplicationType gerApplication, Environment environment, Module applicationInfo, ModuleIDBuilder idBuilder) throws DeploymentException {
         Map<String, Object> altVendorDDs = new HashMap<String, Object>();
         try {
             mapVendorPlans(gerApplication, altVendorDDs, earFile);
@@ -993,36 +1046,36 @@ public class EARConfigBuilder implements
                 throw new DeploymentException("Geronimo ear plan contains modules that are not in the ear: " + missingModules);
             }
             //deploy the extension modules
-            for (GerExtModuleType gerExtModule : gerApplication.getExtModuleArray()) {
+            for (ExtModuleType gerExtModule : gerApplication.getExtModule()) {
                 String moduleName;
                 ModuleBuilder builder;
                 Object moduleContextInfo = null;
                 String moduleTypeName;
 
-                if (gerExtModule.isSetEjb()) {
-                    moduleName = gerExtModule.getEjb().getStringValue();
+                if (gerExtModule.getEjb() != null) {
+                    moduleName = gerExtModule.getEjb();
                     builder = getEjbConfigBuilder();
                     if (builder == null) {
                         throw new DeploymentException("Cannot deploy ejb application; No ejb deployer defined: " + moduleName);
                     }
                     moduleTypeName = "an EJB";
-                } else if (gerExtModule.isSetWeb()) {
-                    moduleName = gerExtModule.getWeb().getStringValue();
+                } else if (gerExtModule.getWeb() != null) {
+                    moduleName = gerExtModule.getWeb();
                     if (getWebConfigBuilder() == null) {
                         throw new DeploymentException("Cannot deploy web application; No war deployer defined: " + moduleName);
                     }
                     builder = getWebConfigBuilder();
                     moduleTypeName = "a war";
                     //ext modules must use vendor plan to set context-root
-                } else if (gerExtModule.isSetConnector()) {
-                    moduleName = gerExtModule.getConnector().getStringValue();
+                } else if (gerExtModule.getConnector() != null) {
+                    moduleName = gerExtModule.getConnector();
                     if (getConnectorConfigBuilder() == null) {
                         throw new DeploymentException("Cannot deploy resource adapter; No rar deployer defined: " + moduleName);
                     }
                     builder = getConnectorConfigBuilder();
                     moduleTypeName = "a connector";
-                } else if (gerExtModule.isSetJava()) {
-                    moduleName = gerExtModule.getJava().getStringValue();
+                } else if (gerExtModule.getJava() != null) {
+                    moduleName = gerExtModule.getJava();
                     if (getAppClientConfigBuilder() == null) {
                         throw new DeploymentException("Cannot deploy app client; No app client deployer defined: " + moduleName);
                     }
@@ -1032,14 +1085,10 @@ public class EARConfigBuilder implements
                     throw new DeploymentException("Could not find a module builder for module: " + gerExtModule);
                 }
                 //dd is included explicitly
-                XmlObject[] anys = gerExtModule.selectChildren(GerExtModuleType.type.qnameSetForWildcardElements());
-                if (anys.length != 1) {
-                    throw new DeploymentException("Unexpected count of xs:any elements in embedded vendor plan " + anys.length + " qnameset: " + GerExtModuleType.type.qnameSetForWildcardElements());
-                }
-                Object vendorDD = anys[0];
+                Object vendorDD = gerExtModule.getAny();
 
                 JarFile moduleFile;
-                if (gerExtModule.isSetInternalPath()) {
+//                if (gerExtModule.isSetInternalPath()) {
                     String modulePath = gerExtModule.getInternalPath().trim();
                     applicationInfo.getModuleLocations().add(modulePath);
                     try {
@@ -1047,35 +1096,35 @@ public class EARConfigBuilder implements
                     } catch (IOException e) {
                         throw new DeploymentException("Invalid moduleFile: " + modulePath, e);
                     }
-                } else {
-                    PatternType patternType = gerExtModule.getExternalPath();
-                    String groupId = trim(patternType.getGroupId());
-                    String artifactId = trim(patternType.getArtifactId());
-                    String version = trim(patternType.getVersion());
-                    String type = trim(patternType.getType());
-                    Artifact artifact = new Artifact(groupId, artifactId, version, type);
-                    try {
-                        artifact = getArtifactResolver().resolveInClassLoader(artifact);
-                    } catch (MissingDependencyException e) {
-                        throw new DeploymentException("Could not resolve external rar location in repository: " + artifact, e);
-                    }
-                    File location = null;
-                    for (Repository repository : repositories) {
-                        if (repository.contains(artifact)) {
-                            location = repository.getLocation(artifact);
-                            break;
-                        }
-                    }
-                    if (location == null) {
-                        throw new DeploymentException(moduleTypeName + " is missing in repositories: " + artifact);
-                    }
-                    try {
-                        moduleFile = new JarFile(location);
-                    } catch (IOException e) {
-                        throw new DeploymentException("Could not access contents of " + moduleTypeName, e);
-                    }
-
-                }
+////                } else {
+////                    PatternType patternType = gerExtModule.getExternalPath();
+////                    String groupId = trim(patternType.getGroupId());
+////                    String artifactId = trim(patternType.getArtifactId());
+////                    String version = trim(patternType.getVersion());
+////                    String type = trim(patternType.getType());
+////                    Artifact artifact = new Artifact(groupId, artifactId, version, type);
+////                    try {
+////                        artifact = getArtifactResolver().resolveInClassLoader(artifact);
+////                    } catch (MissingDependencyException e) {
+////                        throw new DeploymentException("Could not resolve external rar location in repository: " + artifact, e);
+////                    }
+////                    File location = null;
+////                    for (Repository repository : repositories) {
+////                        if (repository.contains(artifact)) {
+////                            location = repository.getLocation(artifact);
+////                            break;
+////                        }
+////                    }
+//                    if (location == null) {
+//                        throw new DeploymentException(moduleTypeName + " is missing in repositories: " + artifact);
+//                    }
+//                    try {
+//                        moduleFile = new JarFile(location);
+//                    } catch (IOException e) {
+//                        throw new DeploymentException("Could not access contents of " + moduleTypeName, e);
+//                    }
+//
+//                }
 
                 Module module = builder.createModule(vendorDD,
                         moduleFile,
@@ -1121,37 +1170,32 @@ public class EARConfigBuilder implements
         return libDir != null && entry.getName().startsWith(libDir);
     }
 
-    private void mapVendorPlans(GerApplicationType gerApplication, Map<String, Object> altVendorDDs, JarFile earFile) throws DeploymentException {
+    private void mapVendorPlans(ApplicationType gerApplication, Map<String, Object> altVendorDDs, JarFile earFile) throws DeploymentException {
         //build map from module path to alt vendor dd
-        for (GerModuleType gerModule : gerApplication.getModuleArray()) {
+        for (ModuleType moduleType : gerApplication.getModule()) {
             String path = null;
-            if (gerModule.isSetEjb()) {
-                path = gerModule.getEjb().getStringValue();
-            } else if (gerModule.isSetWeb()) {
-                path = gerModule.getWeb().getStringValue();
-            } else if (gerModule.isSetConnector()) {
-                path = gerModule.getConnector().getStringValue();
-            } else if (gerModule.isSetJava()) {
-                path = gerModule.getJava().getStringValue();
+            if (moduleType.getEjb() != null) {
+                path = moduleType.getEjb();
+            } else if (moduleType.getWeb() != null) {
+                path = moduleType.getWeb();
+            } else if (moduleType.getConnector() != null) {
+                path = moduleType.getConnector();
+            } else if (moduleType.getJava() != null) {
+                path = moduleType.getJava();
             }
 //            if (!paths.contains(path)) {
 //                throw new DeploymentException("Geronimo deployment plan refers to module '" + path + "' but that was not defined in the META-INF/application.xml");
 //            }
 
-            if (gerModule.isSetAltDd()) {
+            if (moduleType.getAltDd() != null) {
                 // the the url of the alt dd
                 try {
-                    altVendorDDs.put(path, JarUtils.toTempFile(earFile, gerModule.getAltDd().getStringValue()));
+                    altVendorDDs.put(path, JarUtils.toTempFile(earFile, moduleType.getAltDd()));
                 } catch (IOException e) {
-                    throw new DeploymentException("Invalid alt vendor dd url: " + gerModule.getAltDd().getStringValue(), e);
+                    throw new DeploymentException("Invalid alt vendor dd url: " + moduleType.getAltDd(), e);
                 }
             } else {
-                //dd is included explicitly
-                XmlObject[] anys = gerModule.selectChildren(GerModuleType.type.qnameSetForWildcardElements());
-                if (anys.length != 1) {
-                    throw new DeploymentException("Unexpected count of xs:any elements in embedded vendor plan " + anys.length + " qnameset: " + GerModuleType.type.qnameSetForWildcardElements());
-                }
-                altVendorDDs.put(path, anys[0]);
+                altVendorDDs.put(path, moduleType.getAny());
             }
         }
     }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=1096958&r1=1096957&r2=1096958&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java Tue Apr 26 23:20:54 2011
@@ -56,7 +56,6 @@ public class EARContext extends Deployme
                       Environment environment,
                       ConfigurationModuleType moduleType,
                       Naming naming,
-                      ConfigurationManager configurationManager,
                       BundleContext bundleContext,
                       AbstractNameQuery serverName,
                       AbstractName baseName,
@@ -69,8 +68,7 @@ public class EARContext extends Deployme
              environment,
              moduleType,
              naming,
-             configurationManager,
-             bundleContext,
+                bundleContext,
              serverName,
              baseName,
              transactionManagerObjectName,
@@ -84,7 +82,6 @@ public class EARContext extends Deployme
                       Environment environment,
                       ConfigurationModuleType moduleType,
                       Naming naming,
-                      ConfigurationManager configurationManager,
                       BundleContext bundleContext,
                       AbstractNameQuery serverName,
                       AbstractName baseName,
@@ -92,7 +89,7 @@ public class EARContext extends Deployme
                       AbstractNameQuery connectionTrackerObjectName,
                       AbstractNameQuery corbaGBeanObjectName,
                       Map messageDestinations) throws DeploymentException {
-        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, configurationManager, bundleContext);
+        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, bundleContext);
 
         this.serverName = serverName;
         this.transactionManagerObjectName = transactionManagerObjectName;
@@ -119,7 +116,7 @@ public class EARContext extends Deployme
                       AbstractNameQuery connectionTrackerName,
                       AbstractNameQuery corbaGBeanName,
                       EARContext parent) throws DeploymentException {
-        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, parent.getNaming(), parent.getConfigurationManager(), parent.getBundleContext());
+        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, parent.getNaming(), parent.getBundleContext());
         this.serverName = parent.getServerName();
 
         this.transactionManagerObjectName = transactionManagerName;
@@ -134,7 +131,6 @@ public class EARContext extends Deployme
                          Environment environment,
                          ConfigurationModuleType moduleType,
                          Naming naming,
-                         ConfigurationManager configurationManager,
                          ResourceContext resourceContext,
                          BundleContext bundleContext,
                          AbstractNameQuery serverName,
@@ -144,7 +140,7 @@ public class EARContext extends Deployme
                          AbstractNameQuery corbaGBeanObjectName,
                          Map messageDestinations) throws DeploymentException {
         super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming,
-              configurationManager, resourceContext, bundleContext);
+               resourceContext, bundleContext);
 
         this.serverName = serverName;
         this.transactionManagerObjectName = transactionManagerObjectName;

Added: 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=1096958&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/JndiPlan.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/JndiPlan.java Tue Apr 26 23:20:54 2011
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.geronimo.j2ee.deployment;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public interface JndiPlan {
+}

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

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

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

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=1096958&r1=1096957&r2=1096958&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:20:54 2011
@@ -56,11 +56,11 @@ public interface NamingBuilder extends A
         }
     };
 
-    void buildEnvironment(JndiConsumer specDD, XmlObject plan, Environment environment) throws DeploymentException;
+    void buildEnvironment(JndiConsumer specDD, JndiPlan plan, Environment environment) throws DeploymentException;
 
-    void initContext(JndiConsumer specDD, XmlObject plan, Module module) throws DeploymentException;
+    void initContext(JndiConsumer specDD, JndiPlan plan, Module module) throws DeploymentException;
     
-    void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException;
+    void buildNaming(JndiConsumer specDD, JndiPlan plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException;
 
     /**
      * Returns sort order priority.  Lower numbers indicate higher priority.

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=1096958&r1=1096957&r2=1096958&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:20:54 2011
@@ -46,19 +46,19 @@ public class NamingBuilderCollection ext
         super(builders);
     }
 
-    public void buildEnvironment(JndiConsumer specDD, XmlObject plan, Environment environment) throws DeploymentException {
+    public void buildEnvironment(JndiConsumer specDD, JndiPlan plan, Environment environment) throws DeploymentException {
         for (NamingBuilder namingBuilder : getSortedBuilders()) {
             namingBuilder.buildEnvironment(specDD, plan, environment);
         }
     }
 
-    public void initContext(JndiConsumer specDD, XmlObject plan, Module module) throws DeploymentException {
+    public void initContext(JndiConsumer specDD, JndiPlan plan, Module module) throws DeploymentException {
         for (NamingBuilder namingBuilder : getSortedBuilders()) {
             namingBuilder.initContext(specDD, plan, module);
         }
     }
 
-    public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
+    public void buildNaming(JndiConsumer specDD, JndiPlan plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
         for (NamingBuilder namingBuilder : getSortedBuilders()) {
             if (EARConfigBuilder.createPlanMode.get().booleanValue()) {
                 try {

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/AbstractClusteringType.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/AbstractClusteringType.java?rev=1096958&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/AbstractClusteringType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/AbstractClusteringType.java Tue Apr 26 23:20:54 2011
@@ -0,0 +1,39 @@
+//
+// 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 10:34:25 AM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.app;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for abstract-clusteringType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="abstract-clusteringType">
+ *   &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-clusteringType")
+public abstract class AbstractClusteringType {
+
+
+}

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

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

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

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/AbstractSecurityType.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/AbstractSecurityType.java?rev=1096958&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/AbstractSecurityType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/AbstractSecurityType.java Tue Apr 26 23:20:54 2011
@@ -0,0 +1,46 @@
+//
+// 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 10:34:25 AM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.app;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *                 An abstract abstract-securityType used to indicate, all web and
+ *                 EJB modules must make the appropriate access checks as outlined
+ *                 in the JACC spec. This type will be extended and implemented by
+ *                 geronimo-security-2.0.xsd file.
+ *             
+ * 
+ * <p>Java class for abstract-securityType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="abstract-securityType">
+ *   &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-securityType")
+public abstract class AbstractSecurityType {
+
+
+}

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

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

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

Added: 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=1096958&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ApplicationType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ApplicationType.java Tue Apr 26 23:20:54 2011
@@ -0,0 +1,208 @@
+//
+// 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 10:34:25 AM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.app;
+
+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.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
+
+
+/**
+ * 
+ *                 The complex type for root element, it defines the elements of
+ *                 root element for Geronimo enterprise application deployment
+ *                 plan. Basically it is a sequence of elements environment,
+ *                 module, ext-module, security, and services.
+ *             
+ * 
+ * <p>Java class for applicationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="applicationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/deployment-1.2}environment"/>
+ *         &lt;element name="module" type="{http://geronimo.apache.org/xml/ns/j2ee/application-2.0}moduleType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="ext-module" type="{http://geronimo.apache.org/xml/ns/j2ee/application-2.0}ext-moduleType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/j2ee/application-2.0}security" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="application-name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "applicationType", propOrder = {
+    "environment",
+    "module",
+    "extModule",
+    "security"
+})
+public class ApplicationType implements JndiPlan {
+
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
+    protected EnvironmentType environment;
+    protected List<ModuleType> module;
+    @XmlElement(name = "ext-module")
+    protected List<ExtModuleType> extModule;
+    protected AbstractSecurityType security;
+    @XmlAttribute(name = "application-name")
+    protected String applicationName;
+
+    /**
+     * 
+     *                         Reference to environment element defined in imported
+     *                         "geronimo-module-1.2.xsd"
+     *                     
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnvironmentType }
+     *     
+     */
+    public EnvironmentType getEnvironment() {
+        return environment;
+    }
+
+    /**
+     * Sets the value of the environment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnvironmentType }
+     *     
+     */
+    public void setEnvironment(EnvironmentType value) {
+        this.environment = value;
+    }
+
+    /**
+     * Gets the value of the module 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 module property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getModule().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ModuleType }
+     * 
+     * 
+     */
+    public List<ModuleType> getModule() {
+        if (module == null) {
+            module = new ArrayList<ModuleType>();
+        }
+        return this.module;
+    }
+
+    /**
+     * Gets the value of the extModule 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 extModule property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getExtModule().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ExtModuleType }
+     * 
+     * 
+     */
+    public List<ExtModuleType> getExtModule() {
+        if (extModule == null) {
+            extModule = new ArrayList<ExtModuleType>();
+        }
+        return this.extModule;
+    }
+
+    /**
+     * 
+     *                         Reference to security element defined in this schema. If
+     *                         this optional element is present, all web and EJB
+     *                         modules must make the appropriate access checks as
+     *                         outlined in the JACC spec. This element groups the
+     *                         security role mapping settings for the application.
+     *                     
+     * 
+     * @return
+     *     possible object is
+     *     {@link AbstractSecurityType }
+     *     
+     */
+    public AbstractSecurityType getSecurity() {
+        return security;
+    }
+
+    /**
+     * Sets the value of the security property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AbstractSecurityType }
+     *     
+     */
+    public void setSecurity(AbstractSecurityType value) {
+        this.security = value;
+    }
+
+    /**
+     * Gets the value of the applicationName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    /**
+     * Sets the value of the applicationName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setApplicationName(String value) {
+        this.applicationName = value;
+    }
+
+}

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

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

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

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ArtifactType.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/ArtifactType.java?rev=1096958&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ArtifactType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/ArtifactType.java Tue Apr 26 23:20:54 2011
@@ -0,0 +1,184 @@
+//
+// 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 10:34:25 AM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.app;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *                 
+ *                 Refers to either another module running in the server, or
+ *                 an entry in the server's Repository.  In either case this effectively uses a
+ *                 URI.
+ * 
+ *                 When this is pointing to a repository entry, the URI must have a form
+ *                 acceptable to the repository, which is currently a URI consisting of
+ *                 Maven-style identifiers separated by slashes (groupId/artifactId/version/type,
+ *                 for example, the URI "postgresql/postgresql-8.0-jdbc/313/jar" for a file like
+ *                 "repository/postgresql/postgresql-8.0-jdbc-313.jar").
+ * 
+ *                 When this is pointing to a module, the URI should match the
+ *                 module's moduleId.  This also looks
+ *                 like a Maven-style URI discussed above.
+ * 
+ *                 The artifactType element can take either a straight URI (as in the examples
+ *                 above), or maven-style identifier fragments (groupId, type, artifactId, and
+ *                 version), which it will compose into a URI by adding up the fragments with
+ *                 slashes in between.
+ * 
+ *                 There is a correspondence between the xml format and a URI.  For example, the URI
+ * 
+ *                 postgresql/postgresql-8.0-jdbc/313/jar
+ * 
+ *                 corresponds to the xml:
+ * 
+ *                 <groupId>postgresql</groupId>
+ *                 <artifactId>postgresql-8.0-jdbc</artifactId>
+ *                 <version>313</version>
+ *                 <type>jar</type>
+ * 	            
+ *             
+ * 
+ * <p>Java class for artifactType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="artifactType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="groupId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="artifactId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "artifactType", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", propOrder = {
+    "groupId",
+    "artifactId",
+    "version",
+    "type"
+})
+public class ArtifactType {
+
+    protected String groupId;
+    @XmlElement(required = true)
+    protected String artifactId;
+    protected String version;
+    protected String type;
+
+    /**
+     * Gets the value of the groupId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * Sets the value of the groupId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGroupId(String value) {
+        this.groupId = value;
+    }
+
+    /**
+     * Gets the value of the artifactId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    /**
+     * Sets the value of the artifactId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArtifactId(String value) {
+        this.artifactId = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+}

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

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

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

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/EnvironmentType.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/EnvironmentType.java?rev=1096958&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/EnvironmentType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/app/EnvironmentType.java Tue Apr 26 23:20:54 2011
@@ -0,0 +1,263 @@
+//
+// 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 10:34:25 AM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.app;
+
+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 environmentType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="environmentType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="moduleId" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}artifactType" minOccurs="0"/>
+ *         &lt;element name="bundle-activator" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="bundle-classPath" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="import-package" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="export-package" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="require-bundle" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="dynamic-import-package" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "environmentType", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", propOrder = {
+    "moduleId",
+    "bundleActivator",
+    "bundleClassPath",
+    "importPackage",
+    "exportPackage",
+    "requireBundle",
+    "dynamicImportPackage"
+})
+public class EnvironmentType {
+
+    protected ArtifactType moduleId;
+    @XmlElement(name = "bundle-activator")
+    protected String bundleActivator;
+    @XmlElement(name = "bundle-classPath")
+    protected List<String> bundleClassPath;
+    @XmlElement(name = "import-package")
+    protected List<String> importPackage;
+    @XmlElement(name = "export-package")
+    protected List<String> exportPackage;
+    @XmlElement(name = "require-bundle")
+    protected List<String> requireBundle;
+    @XmlElement(name = "dynamic-import-package")
+    protected List<String> dynamicImportPackage;
+
+    /**
+     * Gets the value of the moduleId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ArtifactType }
+     *     
+     */
+    public ArtifactType getModuleId() {
+        return moduleId;
+    }
+
+    /**
+     * Sets the value of the moduleId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ArtifactType }
+     *     
+     */
+    public void setModuleId(ArtifactType value) {
+        this.moduleId = value;
+    }
+
+    /**
+     * Gets the value of the bundleActivator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBundleActivator() {
+        return bundleActivator;
+    }
+
+    /**
+     * Sets the value of the bundleActivator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBundleActivator(String value) {
+        this.bundleActivator = value;
+    }
+
+    /**
+     * Gets the value of the bundleClassPath 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 bundleClassPath property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getBundleClassPath().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getBundleClassPath() {
+        if (bundleClassPath == null) {
+            bundleClassPath = new ArrayList<String>();
+        }
+        return this.bundleClassPath;
+    }
+
+    /**
+     * Gets the value of the importPackage 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 importPackage property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getImportPackage().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getImportPackage() {
+        if (importPackage == null) {
+            importPackage = new ArrayList<String>();
+        }
+        return this.importPackage;
+    }
+
+    /**
+     * Gets the value of the exportPackage 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 exportPackage property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getExportPackage().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getExportPackage() {
+        if (exportPackage == null) {
+            exportPackage = new ArrayList<String>();
+        }
+        return this.exportPackage;
+    }
+
+    /**
+     * Gets the value of the requireBundle 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 requireBundle property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRequireBundle().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getRequireBundle() {
+        if (requireBundle == null) {
+            requireBundle = new ArrayList<String>();
+        }
+        return this.requireBundle;
+    }
+
+    /**
+     * Gets the value of the dynamicImportPackage 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 dynamicImportPackage property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getDynamicImportPackage().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getDynamicImportPackage() {
+        if (dynamicImportPackage == null) {
+            dynamicImportPackage = new ArrayList<String>();
+        }
+        return this.dynamicImportPackage;
+    }
+
+}

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

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

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



Mime
View raw message