geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1100440 [2/4] - in /geronimo/server/branches/3.0-osgi: framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ plugi...
Date Sat, 07 May 2011 03:47:50 GMT
Modified: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/XmlUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/XmlUtil.java?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/XmlUtil.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/XmlUtil.java Sat May  7 03:47:48 2011
@@ -18,43 +18,47 @@
 package org.apache.geronimo.openejb.deployment;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.HashSet;
-import java.util.List;
+import java.io.InputStream;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
-import javax.xml.namespace.QName;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.service.EnvironmentBuilder;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.ClassLoadingRule;
-import org.apache.geronimo.kernel.repository.ClassLoadingRules;
-import org.apache.geronimo.kernel.repository.Dependency;
-import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.util.IOUtils;
-import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbEjbJarDocument;
-import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbGeronimoEjbJarType;
-import org.apache.geronimo.schema.SchemaConversionUtils;
+import org.apache.geronimo.deployment.service.plan.ArtifactType;
+import org.apache.geronimo.deployment.service.plan.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.model.app.ApplicationType;
+import org.apache.geronimo.openejb.deployment.model.GeronimoEjbJarType;
 import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.oejb2.ArtifactType;
-import org.apache.openejb.jee.oejb2.DependencyType;
-import org.apache.openejb.jee.oejb2.EnvironmentType;
-import org.apache.openejb.jee.oejb2.GeronimoEjbJarType;
-import org.apache.openejb.jee.oejb2.ImportType;
-import org.apache.xmlbeans.XmlObject;
 
 public final class XmlUtil {
-    public static final QName OPENEJBJAR_QNAME = OpenejbEjbJarDocument.type.getDocumentElementName();
-    private static final QName CMP_VERSION = new QName(SchemaConversionUtils.J2EE_NAMESPACE, "cmp-version");
+//    public static final QName OPENEJBJAR_QNAME = OpenejbEjbJarDocument.type.getDocumentElementName();
 
     private XmlUtil() {
     }
 
+    public static final XMLInputFactory XMLINPUT_FACTORY = XMLInputFactory.newInstance();
+    private static  JAXBContext GERONIMO_OPENEJB_CONTEXT;
+    static {
+        try {
+            GERONIMO_OPENEJB_CONTEXT = JAXBContext.newInstance(GeronimoEjbJarType.class);
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static GeronimoEjbJarType unmarshalGeronimoEjb(InputStream in, boolean validate) throws XMLStreamException, JAXBException {
+        XMLStreamReader xmlStream = XMLINPUT_FACTORY.createXMLStreamReader(in);
+        Unmarshaller unmarshaller = GERONIMO_OPENEJB_CONTEXT.createUnmarshaller();
+        JAXBElement<GeronimoEjbJarType> element = unmarshaller.unmarshal(xmlStream, GeronimoEjbJarType.class);
+        GeronimoEjbJarType applicationType = element.getValue();
+        return applicationType;
+    }
+
     public static <T> String marshal(T object) throws DeploymentException {
         try {
             Class type = object.getClass();
@@ -78,98 +82,56 @@ public final class XmlUtil {
     }
 
 
-    public static OpenejbGeronimoEjbJarType convertToXmlbeans(GeronimoEjbJarType geronimoEjbJarType) throws DeploymentException {
-        //
-        // it would be nice if Jaxb had a way to convert the object to a
-        // sax reader that could be fed directly into xmlbeans
-        //
-        JAXBElement root = new JAXBElement(new QName("http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0","ejb-jar"), GeronimoEjbJarType.class, geronimoEjbJarType);
-
-        // marshal to xml
 
-        String xml = marshal(root);
-        try {
-            XmlObject xmlObject = XmlBeansUtil.parse(xml);
-            OpenejbGeronimoEjbJarType geronimoOpenejb = (OpenejbGeronimoEjbJarType) SchemaConversionUtils.fixGeronimoSchema(xmlObject, OPENEJBJAR_QNAME, OpenejbGeronimoEjbJarType.type);
-            return geronimoOpenejb;
-        } catch (Throwable e) {
-            String filePath = "<error: could not be written>";
-            FileOutputStream out = null;
-            try {
-                File tempFile = File.createTempFile("openejb-jar-", ".xml");
-                out = new FileOutputStream(tempFile);
-                out.write(xml.getBytes());
-                filePath = tempFile.getAbsolutePath();
-            } catch (Exception notImportant) {
-            } finally {
-                IOUtils.close(out);
-            }
-            throw new DeploymentException("Error parsing geronimo-openejb.xml with xmlbeans.  For debug purposes, XML content written to: " + filePath, e);
-        }
-    }
-
-    public static Environment buildEnvironment(EnvironmentType environmentType, Environment defaultEnvironment) {
-        Environment environment = new Environment();
-        if (environmentType != null) {
-            if (environmentType.getModuleId() != null) {
-                environment.setConfigId(toArtifact(environmentType.getModuleId(), null));
-            }
-
-            if (environmentType.getDependencies() != null) {
-                for (DependencyType dependencyType : environmentType.getDependencies().getDependency()) {
-                    Dependency dependency = toDependency(dependencyType);
-                    environment.addDependency(dependency);
-                }
-            }
-
-            environment.setSuppressDefaultEnvironment(environmentType.isSuppressDefaultEnvironment());
-
-            ClassLoadingRules classLoadingRules = environment.getClassLoadingRules();
-            classLoadingRules.setInverseClassLoading(environmentType.isInverseClassloading());
-
-            if (environmentType.getHiddenClasses() != null) {
-                ClassLoadingRule hiddenRule = classLoadingRules.getHiddenRule();
-                List<String> filter = environmentType.getHiddenClasses().getFilter();
-                hiddenRule.setClassPrefixes(new HashSet<String>(filter));
-            }
-
-            if (environmentType.getNonOverridableClasses() != null) {
-                ClassLoadingRule nonOverrideableRule = classLoadingRules.getNonOverrideableRule();
-                List<String> filter = environmentType.getNonOverridableClasses().getFilter();
-                nonOverrideableRule.setClassPrefixes(new HashSet<String>(filter));
-            }
-        }
-        if (!environment.isSuppressDefaultEnvironment()) {
-            EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
-        }
-
-        return environment;
-    }
-
-    private static Dependency toDependency(DependencyType dependencyType) {
-        Artifact artifact = toArtifact(dependencyType, null);
-        if (ImportType.CLASSES.equals(dependencyType.getImport())) {
-            return new Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.CLASSES);
-        } else if (ImportType.SERVICES.equals(dependencyType.getImport())) {
-            return new Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.SERVICES);
-        } else if (dependencyType.getImport() == null) {
-            return new Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.ALL);
-        } else {
-            throw new IllegalArgumentException("Unknown import type: " + dependencyType.getImport());
-        }
-    }
-
-    private static Artifact toArtifact(ArtifactType artifactType, String defaultType) {
-        String groupId = artifactType.getGroupId();
-        String type = artifactType.getType();
-        if (type == null) type = defaultType;
-        String artifactId = artifactType.getArtifactId();
-        String version = artifactType.getVersion();
-        return new Artifact(groupId, artifactId, version, type);
-    }
+//    public static Environment buildEnvironment(EnvironmentType environmentType, Environment defaultEnvironment) {
+//        Environment environment = new Environment();
+//        if (environmentType != null) {
+//            if (environmentType.getModuleId() != null) {
+//                environment.setConfigId(toArtifact(environmentType.getModuleId(), null));
+//            }
+//
+//            if (environmentType.getDependencies() != null) {
+//                for (DependencyType dependencyType : environmentType.getDependencies().getDependency()) {
+//                    Dependency dependency = toDependency(dependencyType);
+//                    environment.addDependency(dependency);
+//                }
+//            }
+//
+//            environment.setSuppressDefaultEnvironment(environmentType.isSuppressDefaultEnvironment());
+//
+//            ClassLoadingRules classLoadingRules = environment.getClassLoadingRules();
+//            classLoadingRules.setInverseClassLoading(environmentType.isInverseClassloading());
+//
+//            if (environmentType.getHiddenClasses() != null) {
+//                ClassLoadingRule hiddenRule = classLoadingRules.getHiddenRule();
+//                List<String> filter = environmentType.getHiddenClasses().getFilter();
+//                hiddenRule.setClassPrefixes(new HashSet<String>(filter));
+//            }
+//
+//            if (environmentType.getNonOverridableClasses() != null) {
+//                ClassLoadingRule nonOverrideableRule = classLoadingRules.getNonOverrideableRule();
+//                List<String> filter = environmentType.getNonOverridableClasses().getFilter();
+//                nonOverrideableRule.setClassPrefixes(new HashSet<String>(filter));
+//            }
+//        }
+//        if (!environment.isSuppressDefaultEnvironment()) {
+//            EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
+//        }
+//
+//        return environment;
+//    }
+
+
+//    private static Artifact toArtifact(ArtifactType artifactType, String defaultType) {
+//        String groupId = artifactType.getGroupId();
+//        String type = artifactType.getType();
+//        if (type == null) type = defaultType;
+//        String artifactId = artifactType.getArtifactId();
+//        String version = artifactType.getVersion();
+//        return new Artifact(groupId, artifactId, version, type);
+//    }
 
-    public static GeronimoEjbJarType createDefaultPlan(String name, EjbJar ejbJar) {
-        String id = ejbJar.getId();
+    public static GeronimoEjbJarType createDefaultPlan(String name, String id) {
         if (id == null) {
             id = name;
             if (id.endsWith(".jar")) {

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractClusteringType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractClusteringType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractClusteringType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractClusteringType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+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", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0")
+public abstract class AbstractClusteringType {
+
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractClusteringType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractClusteringType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractClusteringType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractSecurityType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractSecurityType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractSecurityType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractSecurityType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,46 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+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", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0")
+public abstract class AbstractSecurityType {
+
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractSecurityType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractSecurityType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AbstractSecurityType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ApplicationType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ApplicationType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ApplicationType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ApplicationType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,202 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+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.deployment.service.plan.EnvironmentType;
+
+
+/**
+ * 
+ *                 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 name="security" type="{http://geronimo.apache.org/xml/ns/j2ee/application-2.0}abstract-securityType" 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", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0", propOrder = {
+    "environment",
+    "module",
+    "extModule",
+    "security"
+})
+public class ApplicationType {
+
+    @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;
+    }
+
+    /**
+     * Gets the value of the security property.
+     * 
+     * @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/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ApplicationType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ApplicationType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ApplicationType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AuthMethodType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AuthMethodType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AuthMethodType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AuthMethodType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,61 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for auth-methodType.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="auth-methodType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="BASIC"/>
+ *     &lt;enumeration value="DIGEST"/>
+ *     &lt;enumeration value="CLIENT-CERT"/>
+ *     &lt;enumeration value="NONE"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "auth-methodType")
+@XmlEnum
+public enum AuthMethodType {
+
+    BASIC("BASIC"),
+    DIGEST("DIGEST"),
+    @XmlEnumValue("CLIENT-CERT")
+    CLIENT_CERT("CLIENT-CERT"),
+    NONE("NONE");
+    private final String value;
+
+    AuthMethodType(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static AuthMethodType fromValue(String v) {
+        for (AuthMethodType c: AuthMethodType.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AuthMethodType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AuthMethodType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/AuthMethodType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/EmptyType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/EmptyType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/EmptyType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/EmptyType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,37 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for emptyType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="emptyType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "emptyType")
+public class EmptyType {
+
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/EmptyType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/EmptyType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/EmptyType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ExtModuleType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ExtModuleType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ExtModuleType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ExtModuleType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,233 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.w3c.dom.Element;
+
+
+/**
+ * 
+ *                 It is used to define modules included in this application
+ *                 externally and is not a part of the archive. It defines optional
+ *                 internal-path or external-path to module/repository element
+ *                 being referenced.
+ *             
+ * 
+ * <p>Java class for ext-moduleType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ext-moduleType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;choice>
+ *           &lt;element name="connector" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *           &lt;element name="ejb" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *           &lt;element name="java" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *           &lt;element name="web" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *         &lt;/choice>
+ *         &lt;choice>
+ *           &lt;element name="internal-path" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *         &lt;/choice>
+ *         &lt;any processContents='lax' namespace='##other'/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ext-moduleType", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0", propOrder = {
+    "connector",
+    "ejb",
+    "java",
+    "web",
+    "internalPath",
+    "any"
+})
+public class ExtModuleType {
+
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String connector;
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String ejb;
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String java;
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String web;
+    @XmlElement(name = "internal-path")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String internalPath;
+    @XmlAnyElement(lax = true)
+    protected Object any;
+
+    /**
+     * Gets the value of the connector property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConnector() {
+        return connector;
+    }
+
+    /**
+     * Sets the value of the connector property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConnector(String value) {
+        this.connector = value;
+    }
+
+    /**
+     * Gets the value of the ejb property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEjb() {
+        return ejb;
+    }
+
+    /**
+     * Sets the value of the ejb property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEjb(String value) {
+        this.ejb = value;
+    }
+
+    /**
+     * Gets the value of the java property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getJava() {
+        return java;
+    }
+
+    /**
+     * Sets the value of the java property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setJava(String value) {
+        this.java = value;
+    }
+
+    /**
+     * Gets the value of the web property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getWeb() {
+        return web;
+    }
+
+    /**
+     * Sets the value of the web property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setWeb(String value) {
+        this.web = value;
+    }
+
+    /**
+     * Gets the value of the internalPath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getInternalPath() {
+        return internalPath;
+    }
+
+    /**
+     * Sets the value of the internalPath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setInternalPath(String value) {
+        this.internalPath = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Element }
+     *     {@link Object }
+     *     
+     */
+    public Object getAny() {
+        return any;
+    }
+
+    /**
+     * Sets the value of the any property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Element }
+     *     {@link Object }
+     *     
+     */
+    public void setAny(Object value) {
+        this.any = value;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ExtModuleType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ExtModuleType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ExtModuleType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/GeronimoEjbJarType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/GeronimoEjbJarType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/GeronimoEjbJarType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/GeronimoEjbJarType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,440 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+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;
+import org.apache.geronimo.deployment.service.plan.EnvironmentType;
+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.MessageDestinationType;
+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;
+import org.apache.geronimo.security.deployment.model.security.SecurityRefType;
+import org.apache.geronimo.security.deployment.model.security.SecurityType;
+import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for geronimo-ejb-jarType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="geronimo-ejb-jarType">
+ *   &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" minOccurs="0"/>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/j2ee/application-2.0}clustering" minOccurs="0"/>
+ *         &lt;element name="openejb-jar" type="{http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0}openejb-jarType" minOccurs="0"/>
+ *         &lt;group ref="{http://geronimo.apache.org/xml/ns/naming-1.2}jndiEnvironmentRefsGroup" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/naming-1.2}message-destination" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="tss-link" type="{http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0}tss-linkType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="web-service-binding" type="{http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0}web-service-bindingType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;choice minOccurs="0">
+ *           &lt;element ref="{http://geronimo.apache.org/xml/ns/security-2.0}security"/>
+ *           &lt;element ref="{http://geronimo.apache.org/xml/ns/security-2.0}security-ref"/>
+ *         &lt;/choice>
+ *         &lt;any processContents='lax' namespace='http://java.sun.com/xml/ns/persistence' maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "geronimo-ejb-jarType", propOrder = {
+    "environment",
+    "clustering",
+    "openejbJar",
+        "envEntry",
+        "ejbRef",
+        "ejbLocalRef",
+        "gbeanRef",
+        "persistenceContextRef",
+         "persistenceUnitRef",
+         "resourceEnvRef",
+          "resourceRef",
+        "serviceRef",
+    "messageDestination",
+    "tssLink",
+    "webServiceBinding",
+    "security",
+    "securityRef",
+    "persistence"
+})
+public class GeronimoEjbJarType implements JndiPlan {
+
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+    protected EnvironmentType environment;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0")
+    protected AbstractClusteringType clustering;
+    @XmlElement(name = "openejb-jar")
+    protected OpenejbJarType openejbJar;
+
+    @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;
+
+    @XmlElement(name = "message-destination", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<MessageDestinationType> messageDestination;
+    @XmlElement(name = "tss-link")
+    protected List<TssLinkType> tssLink;
+    @XmlElement(name = "web-service-binding")
+    protected List<WebServiceBindingType> webServiceBinding;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/security-2.0")
+    protected SecurityType security;
+    @XmlElement(name = "security-ref", namespace = "http://geronimo.apache.org/xml/ns/security-2.0")
+    protected SecurityRefType securityRef;
+    @XmlElement(name = "persistence", namespace = "http://java.sun.com/xml/ns/persistence")
+    protected List<Persistence> persistence;
+
+    /**
+     * Gets the value of the environment property.
+     * 
+     * @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;
+    }
+
+    /**
+     * 
+     *                         Reference to abstract clustering element defined in
+     *                         imported "geronimo-application-2.0.xsd"
+     *                     
+     * 
+     * @return
+     *     possible object is
+     *     {@link AbstractClusteringType }
+     *     
+     */
+    public AbstractClusteringType getClustering() {
+        return clustering;
+    }
+
+    /**
+     * Sets the value of the clustering property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AbstractClusteringType }
+     *     
+     */
+    public void setClustering(AbstractClusteringType value) {
+        this.clustering = value;
+    }
+
+    /**
+     * Gets the value of the openejbJar property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OpenejbJarType }
+     *     
+     */
+    public OpenejbJarType getOpenejbJar() {
+        return openejbJar;
+    }
+
+    /**
+     * Sets the value of the openejbJar property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OpenejbJarType }
+     *     
+     */
+    public void setOpenejbJar(OpenejbJarType value) {
+        this.openejbJar = 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;
+    }
+    /**
+     * Gets the value of the messageDestination 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 messageDestination property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getMessageDestination().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MessageDestinationType }
+     * 
+     * 
+     */
+    public List<MessageDestinationType> getMessageDestination() {
+        if (messageDestination == null) {
+            messageDestination = new ArrayList<MessageDestinationType>();
+        }
+        return this.messageDestination;
+    }
+
+    /**
+     * Gets the value of the tssLink 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 tssLink property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTssLink().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TssLinkType }
+     * 
+     * 
+     */
+    public List<TssLinkType> getTssLink() {
+        if (tssLink == null) {
+            tssLink = new ArrayList<TssLinkType>();
+        }
+        return this.tssLink;
+    }
+
+    /**
+     * Gets the value of the webServiceBinding 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 webServiceBinding property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getWebServiceBinding().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link WebServiceBindingType }
+     * 
+     * 
+     */
+    public List<WebServiceBindingType> getWebServiceBinding() {
+        if (webServiceBinding == null) {
+            webServiceBinding = new ArrayList<WebServiceBindingType>();
+        }
+        return this.webServiceBinding;
+    }
+
+    /**
+     * Gets the value of the security property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SecurityType }
+     *     
+     */
+    public SecurityType getSecurity() {
+        return security;
+    }
+
+    /**
+     * Sets the value of the security property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SecurityType }
+     *     
+     */
+    public void setSecurity(SecurityType value) {
+        this.security = value;
+    }
+
+    /**
+     * Gets the value of the securityRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SecurityRefType }
+     *     
+     */
+    public SecurityRefType getSecurityRef() {
+        return securityRef;
+    }
+
+    /**
+     * Sets the value of the securityRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SecurityRefType }
+     *     
+     */
+    public void setSecurityRef(SecurityRefType value) {
+        this.securityRef = value;
+    }
+
+    /**
+     * Gets the value of the any 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 any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Element }
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Persistence> getPersistence() {
+        if (persistence == null) {
+            persistence = new ArrayList<Persistence>();
+        }
+        return this.persistence;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/GeronimoEjbJarType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/GeronimoEjbJarType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/GeronimoEjbJarType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ModuleType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ModuleType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ModuleType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ModuleType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,233 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.w3c.dom.Element;
+
+
+/**
+ * 
+ *                 Mirrors the moduleType defined by application_1_4.xsd and adds
+ *                 an optional alt-dd element defining a Geronimo specific
+ *                 deployment descriptor for J2EE connector, ejb, web, or java
+ *                 client modules.
+ *             
+ * 
+ * <p>Java class for moduleType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="moduleType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;choice>
+ *           &lt;element name="connector" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *           &lt;element name="ejb" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *           &lt;element name="java" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *           &lt;element name="web" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *         &lt;/choice>
+ *         &lt;choice>
+ *           &lt;element name="alt-dd" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *           &lt;any processContents='lax' namespace='##other'/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "moduleType", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0", propOrder = {
+    "connector",
+    "ejb",
+    "java",
+    "web",
+    "altDd",
+    "any"
+})
+public class ModuleType {
+
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String connector;
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String ejb;
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String java;
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String web;
+    @XmlElement(name = "alt-dd")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String altDd;
+    @XmlAnyElement(lax = true)
+    protected Object any;
+
+    /**
+     * Gets the value of the connector property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConnector() {
+        return connector;
+    }
+
+    /**
+     * Sets the value of the connector property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConnector(String value) {
+        this.connector = value;
+    }
+
+    /**
+     * Gets the value of the ejb property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEjb() {
+        return ejb;
+    }
+
+    /**
+     * Sets the value of the ejb property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEjb(String value) {
+        this.ejb = value;
+    }
+
+    /**
+     * Gets the value of the java property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getJava() {
+        return java;
+    }
+
+    /**
+     * Sets the value of the java property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setJava(String value) {
+        this.java = value;
+    }
+
+    /**
+     * Gets the value of the web property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getWeb() {
+        return web;
+    }
+
+    /**
+     * Sets the value of the web property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setWeb(String value) {
+        this.web = value;
+    }
+
+    /**
+     * Gets the value of the altDd property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAltDd() {
+        return altDd;
+    }
+
+    /**
+     * Sets the value of the altDd property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAltDd(String value) {
+        this.altDd = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Element }
+     *     {@link Object }
+     *     
+     */
+    public Object getAny() {
+        return any;
+    }
+
+    /**
+     * Sets the value of the any property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Element }
+     *     {@link Object }
+     *     
+     */
+    public void setAny(Object value) {
+        this.any = value;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ModuleType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ModuleType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ModuleType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ObjectFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ObjectFactory.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ObjectFactory.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ObjectFactory.java Sat May  7 03:47:48 2011
@@ -0,0 +1,265 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+import org.apache.geronimo.deployment.service.plan.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.model.naming.AbstractNamingEntryType;
+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.MessageDestinationType;
+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;
+import org.apache.geronimo.security.deployment.model.security.SecurityRefType;
+import org.apache.geronimo.security.deployment.model.security.SecurityType;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the org.apache.geronimo.openejb.deployment.model 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 _GeronimoEjbJarTypeServiceRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "service-ref");
+    private final static QName _GeronimoEjbJarTypeResourceRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "resource-ref");
+    private final static QName _GeronimoEjbJarTypeEjbLocalRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "ejb-local-ref");
+    private final static QName _GeronimoEjbJarTypeEjbRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "ejb-ref");
+    private final static QName _GeronimoEjbJarTypeResourceEnvRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "resource-env-ref");
+    private final static QName _GeronimoEjbJarTypeEnvEntry_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "env-entry");
+    private final static QName _Application_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/application-2.0", "application");
+    private final static QName _MessageDestination_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "message-destination");
+    private final static QName _Clustering_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/application-2.0", "clustering");
+    private final static QName _Security_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "security");
+    private final static QName _AbstractNamingEntry_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "abstract-naming-entry");
+    private final static QName _Environment_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "environment");
+    private final static QName _EjbJar_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0", "ejb-jar");
+    private final static QName _SecurityRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "security-ref");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.openejb.deployment.model
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link GeronimoEjbJarType }
+     * 
+     */
+    public GeronimoEjbJarType createGeronimoEjbJarType() {
+        return new GeronimoEjbJarType();
+    }
+
+    /**
+     * Create an instance of {@link TssLinkType }
+     * 
+     */
+    public TssLinkType createTssLinkType() {
+        return new TssLinkType();
+    }
+
+    /**
+     * Create an instance of {@link ModuleType }
+     * 
+     */
+    public ModuleType createModuleType() {
+        return new ModuleType();
+    }
+
+    /**
+     * Create an instance of {@link ApplicationType }
+     * 
+     */
+    public ApplicationType createApplicationType() {
+        return new ApplicationType();
+    }
+
+    /**
+     * Create an instance of {@link ExtModuleType }
+     * 
+     */
+    public ExtModuleType createExtModuleType() {
+        return new ExtModuleType();
+    }
+
+    /**
+     * Create an instance of {@link EmptyType }
+     * 
+     */
+    public EmptyType createEmptyType() {
+        return new EmptyType();
+    }
+
+    /**
+     * Create an instance of {@link WebServiceBindingType }
+     * 
+     */
+    public WebServiceBindingType createWebServiceBindingType() {
+        return new WebServiceBindingType();
+    }
+
+    /**
+     * Create an instance of {@link WebServiceSecurityType }
+     * 
+     */
+    public WebServiceSecurityType createWebServiceSecurityType() {
+        return new WebServiceSecurityType();
+    }
+
+    /**
+     * Create an instance of {@link OpenejbJarType }
+     * 
+     */
+    public OpenejbJarType createOpenejbJarType() {
+        return new OpenejbJarType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "service-ref", scope = GeronimoEjbJarType.class)
+    public JAXBElement<ServiceRefType> createGeronimoEjbJarTypeServiceRef(ServiceRefType value) {
+        return new JAXBElement<ServiceRefType>(_GeronimoEjbJarTypeServiceRef_QNAME, ServiceRefType.class, GeronimoEjbJarType.class, 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", scope = GeronimoEjbJarType.class)
+    public JAXBElement<ResourceRefType> createGeronimoEjbJarTypeResourceRef(ResourceRefType value) {
+        return new JAXBElement<ResourceRefType>(_GeronimoEjbJarTypeResourceRef_QNAME, ResourceRefType.class, GeronimoEjbJarType.class, 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", scope = GeronimoEjbJarType.class)
+    public JAXBElement<EjbLocalRefType> createGeronimoEjbJarTypeEjbLocalRef(EjbLocalRefType value) {
+        return new JAXBElement<EjbLocalRefType>(_GeronimoEjbJarTypeEjbLocalRef_QNAME, EjbLocalRefType.class, GeronimoEjbJarType.class, 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", scope = GeronimoEjbJarType.class)
+    public JAXBElement<EjbRefType> createGeronimoEjbJarTypeEjbRef(EjbRefType value) {
+        return new JAXBElement<EjbRefType>(_GeronimoEjbJarTypeEjbRef_QNAME, EjbRefType.class, GeronimoEjbJarType.class, 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", scope = GeronimoEjbJarType.class)
+    public JAXBElement<ResourceEnvRefType> createGeronimoEjbJarTypeResourceEnvRef(ResourceEnvRefType value) {
+        return new JAXBElement<ResourceEnvRefType>(_GeronimoEjbJarTypeResourceEnvRef_QNAME, ResourceEnvRefType.class, GeronimoEjbJarType.class, 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", scope = GeronimoEjbJarType.class)
+    public JAXBElement<EnvEntryType> createGeronimoEjbJarTypeEnvEntry(EnvEntryType value) {
+        return new JAXBElement<EnvEntryType>(_GeronimoEjbJarTypeEnvEntry_QNAME, EnvEntryType.class, GeronimoEjbJarType.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ApplicationType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0", name = "application")
+    public JAXBElement<ApplicationType> createApplication(ApplicationType value) {
+        return new JAXBElement<ApplicationType>(_Application_QNAME, ApplicationType.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 AbstractClusteringType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0", name = "clustering")
+    public JAXBElement<AbstractClusteringType> createClustering(AbstractClusteringType value) {
+        return new JAXBElement<AbstractClusteringType>(_Clustering_QNAME, AbstractClusteringType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/security-2.0", name = "security")
+    public JAXBElement<SecurityType> createSecurity(SecurityType value) {
+        return new JAXBElement<SecurityType>(_Security_QNAME, SecurityType.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 EnvironmentType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", name = "environment")
+    public JAXBElement<EnvironmentType> createEnvironment(EnvironmentType value) {
+        return new JAXBElement<EnvironmentType>(_Environment_QNAME, EnvironmentType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GeronimoEjbJarType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0", name = "ejb-jar")
+    public JAXBElement<GeronimoEjbJarType> createEjbJar(GeronimoEjbJarType value) {
+        return new JAXBElement<GeronimoEjbJarType>(_EjbJar_QNAME, GeronimoEjbJarType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/security-2.0", name = "security-ref")
+    public JAXBElement<SecurityRefType> createSecurityRef(SecurityRefType value) {
+        return new JAXBElement<SecurityRefType>(_SecurityRef_QNAME, SecurityRefType.class, null, value);
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/OpenejbJarType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/OpenejbJarType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/OpenejbJarType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/OpenejbJarType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,72 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for openejb-jarType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="openejb-jarType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;any processContents='lax' namespace='##other'/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "openejb-jarType", propOrder = {
+    "any"
+})
+public class OpenejbJarType {
+
+    @XmlAnyElement(lax = true)
+    protected Object any;
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Element }
+     *     {@link Object }
+     *     
+     */
+    public Object getAny() {
+        return any;
+    }
+
+    /**
+     * Sets the value of the any property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Element }
+     *     {@link Object }
+     *     
+     */
+    public void setAny(Object value) {
+        this.any = value;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/OpenejbJarType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/OpenejbJarType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/OpenejbJarType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TransportGuaranteeType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TransportGuaranteeType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TransportGuaranteeType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TransportGuaranteeType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,47 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for transport-guaranteeType.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="transport-guaranteeType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="NONE"/>
+ *     &lt;enumeration value="INTEGRAL"/>
+ *     &lt;enumeration value="CONFIDENTIAL"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "transport-guaranteeType")
+@XmlEnum
+public enum TransportGuaranteeType {
+
+    NONE,
+    INTEGRAL,
+    CONFIDENTIAL;
+
+    public String value() {
+        return name();
+    }
+
+    public static TransportGuaranteeType fromValue(String v) {
+        return valueOf(v);
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TransportGuaranteeType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TransportGuaranteeType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TransportGuaranteeType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TssLinkType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TssLinkType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TssLinkType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TssLinkType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,132 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.model;
+
+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 tss-linkType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="tss-linkType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ejb-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="tss-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="jndi-name" 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 = "tss-linkType", propOrder = {
+    "ejbName",
+    "tssName",
+    "jndiName"
+})
+public class TssLinkType {
+
+    @XmlElement(name = "ejb-name")
+    protected String ejbName;
+    @XmlElement(name = "tss-name")
+    protected String tssName;
+    @XmlElement(name = "jndi-name")
+    protected List<String> jndiName;
+
+    /**
+     * Gets the value of the ejbName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEjbName() {
+        return ejbName;
+    }
+
+    /**
+     * Sets the value of the ejbName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEjbName(String value) {
+        this.ejbName = value;
+    }
+
+    /**
+     * Gets the value of the tssName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTssName() {
+        return tssName;
+    }
+
+    /**
+     * Sets the value of the tssName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTssName(String value) {
+        this.tssName = value;
+    }
+
+    /**
+     * Gets the value of the jndiName 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 jndiName property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getJndiName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getJndiName() {
+        if (jndiName == null) {
+            jndiName = new ArrayList<String>();
+        }
+        return this.jndiName;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TssLinkType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TssLinkType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/TssLinkType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message