geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096959 [2/3] - in /geronimo/server/trunk: framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ plugins/j2ee/geronimo-j2ee...
Date Tue, 26 Apr 2011 23:21:15 GMT
Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextRefType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextRefType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextRefType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextRefType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,190 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for persistence-context-refType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="persistence-context-refType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://geronimo.apache.org/xml/ns/naming-1.2}abstract-naming-entryType">
+ *       &lt;sequence>
+ *         &lt;element name="persistence-context-ref-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;choice>
+ *           &lt;element name="persistence-unit-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="pattern" type="{http://geronimo.apache.org/xml/ns/naming-1.2}patternType"/>
+ *         &lt;/choice>
+ *         &lt;element name="persistence-context-type" type="{http://geronimo.apache.org/xml/ns/naming-1.2}persistence-context-typeType" minOccurs="0"/>
+ *         &lt;element name="property" type="{http://geronimo.apache.org/xml/ns/naming-1.2}propertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "persistence-context-refType", propOrder = {
+    "persistenceContextRefName",
+    "persistenceUnitName",
+    "pattern",
+    "persistenceContextType",
+    "property"
+})
+public class PersistenceContextRefType
+    extends AbstractNamingEntryType
+{
+
+    @XmlElement(name = "persistence-context-ref-name", required = true)
+    protected String persistenceContextRefName;
+    @XmlElement(name = "persistence-unit-name")
+    protected String persistenceUnitName;
+    protected PatternType pattern;
+    @XmlElement(name = "persistence-context-type")
+    protected PersistenceContextTypeType persistenceContextType;
+    protected List<PropertyType> property;
+
+    /**
+     * Gets the value of the persistenceContextRefName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPersistenceContextRefName() {
+        return persistenceContextRefName;
+    }
+
+    /**
+     * Sets the value of the persistenceContextRefName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPersistenceContextRefName(String value) {
+        this.persistenceContextRefName = value;
+    }
+
+    /**
+     * Gets the value of the persistenceUnitName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPersistenceUnitName() {
+        return persistenceUnitName;
+    }
+
+    /**
+     * Sets the value of the persistenceUnitName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPersistenceUnitName(String value) {
+        this.persistenceUnitName = value;
+    }
+
+    /**
+     * Gets the value of the pattern property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PatternType }
+     *     
+     */
+    public PatternType getPattern() {
+        return pattern;
+    }
+
+    /**
+     * Sets the value of the pattern property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PatternType }
+     *     
+     */
+    public void setPattern(PatternType value) {
+        this.pattern = value;
+    }
+
+    /**
+     * Gets the value of the persistenceContextType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PersistenceContextTypeType }
+     *     
+     */
+    public PersistenceContextTypeType getPersistenceContextType() {
+        return persistenceContextType;
+    }
+
+    /**
+     * Sets the value of the persistenceContextType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PersistenceContextTypeType }
+     *     
+     */
+    public void setPersistenceContextType(PersistenceContextTypeType value) {
+        this.persistenceContextType = value;
+    }
+
+    /**
+     * Gets the value of the property 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 property property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getProperty().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PropertyType }
+     * 
+     * 
+     */
+    public List<PropertyType> getProperty() {
+        if (property == null) {
+            property = new ArrayList<PropertyType>();
+        }
+        return this.property;
+    }
+
+}

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

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

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

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextTypeType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextTypeType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextTypeType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PersistenceContextTypeType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,58 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for persistence-context-typeType.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="persistence-context-typeType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="Transactional"/>
+ *     &lt;enumeration value="Extended"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "persistence-context-typeType")
+@XmlEnum
+public enum PersistenceContextTypeType {
+
+    @XmlEnumValue("Transactional")
+    TRANSACTIONAL("Transactional"),
+    @XmlEnumValue("Extended")
+    EXTENDED("Extended");
+    private final String value;
+
+    PersistenceContextTypeType(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static PersistenceContextTypeType fromValue(String v) {
+        for (PersistenceContextTypeType c: PersistenceContextTypeType.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PortType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PortType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PortType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/PortType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,238 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for portType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="portType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="port-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;group ref="{http://geronimo.apache.org/xml/ns/naming-1.2}serverGroup" minOccurs="0"/>
+ *         &lt;element name="uri" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="credentials-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="property" type="{http://geronimo.apache.org/xml/ns/naming-1.2}portPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "portType", propOrder = {
+    "portName",
+    "protocol",
+    "host",
+    "port",
+    "uri",
+    "credentialsName",
+    "property"
+})
+public class PortType {
+
+    @XmlElement(name = "port-name", required = true)
+    protected String portName;
+    protected String protocol;
+    protected String host;
+    protected Integer port;
+    @XmlElement(required = true)
+    protected String uri;
+    @XmlElement(name = "credentials-name")
+    protected String credentialsName;
+    protected List<PortPropertyType> property;
+
+    /**
+     * Gets the value of the portName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPortName() {
+        return portName;
+    }
+
+    /**
+     * Sets the value of the portName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPortName(String value) {
+        this.portName = value;
+    }
+
+    /**
+     * Gets the value of the protocol property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * Sets the value of the protocol property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProtocol(String value) {
+        this.protocol = value;
+    }
+
+    /**
+     * Gets the value of the host property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHost() {
+        return host;
+    }
+
+    /**
+     * Sets the value of the host property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHost(String value) {
+        this.host = value;
+    }
+
+    /**
+     * Gets the value of the port property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public Integer getPort() {
+        return port;
+    }
+
+    /**
+     * Sets the value of the port property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setPort(Integer value) {
+        this.port = value;
+    }
+
+    /**
+     * Gets the value of the uri property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getUri() {
+        return uri;
+    }
+
+    /**
+     * Sets the value of the uri property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUri(String value) {
+        this.uri = value;
+    }
+
+    /**
+     * Gets the value of the credentialsName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCredentialsName() {
+        return credentialsName;
+    }
+
+    /**
+     * Sets the value of the credentialsName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCredentialsName(String value) {
+        this.credentialsName = value;
+    }
+
+    /**
+     * Gets the value of the property 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 property property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getProperty().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PortPropertyType }
+     * 
+     * 
+     */
+    public List<PortPropertyType> getProperty() {
+        if (property == null) {
+            property = new ArrayList<PortPropertyType>();
+        }
+        return this.property;
+    }
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceCompletionType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceCompletionType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceCompletionType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceCompletionType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,104 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for service-completionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="service-completionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="service-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="port-completion" type="{http://geronimo.apache.org/xml/ns/naming-1.2}port-completionType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "service-completionType", propOrder = {
+    "serviceName",
+    "portCompletion"
+})
+public class ServiceCompletionType {
+
+    @XmlElement(name = "service-name", required = true)
+    protected String serviceName;
+    @XmlElement(name = "port-completion", required = true)
+    protected List<PortCompletionType> portCompletion;
+
+    /**
+     * Gets the value of the serviceName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    /**
+     * Sets the value of the serviceName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setServiceName(String value) {
+        this.serviceName = value;
+    }
+
+    /**
+     * Gets the value of the portCompletion 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 portCompletion property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPortCompletion().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PortCompletionType }
+     * 
+     * 
+     */
+    public List<PortCompletionType> getPortCompletion() {
+        if (portCompletion == null) {
+            portCompletion = new ArrayList<PortCompletionType>();
+        }
+        return this.portCompletion;
+    }
+
+}

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

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

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

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceRefType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceRefType.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceRefType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/ServiceRefType.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,163 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+
+package org.apache.geronimo.j2ee.deployment.model.naming;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for service-refType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="service-refType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="service-ref-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;choice>
+ *           &lt;element name="wsdl-file" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *           &lt;element name="service-completion" type="{http://geronimo.apache.org/xml/ns/naming-1.2}service-completionType"/>
+ *           &lt;element name="port" type="{http://geronimo.apache.org/xml/ns/naming-1.2}portType" maxOccurs="unbounded"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "service-refType", propOrder = {
+    "serviceRefName",
+    "wsdlFile",
+    "serviceCompletion",
+    "port"
+})
+public class ServiceRefType {
+
+    @XmlElement(name = "service-ref-name", required = true)
+    protected String serviceRefName;
+    @XmlElement(name = "wsdl-file")
+    @XmlSchemaType(name = "anyURI")
+    protected String wsdlFile;
+    @XmlElement(name = "service-completion")
+    protected ServiceCompletionType serviceCompletion;
+    protected List<PortType> port;
+
+    /**
+     * Gets the value of the serviceRefName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getServiceRefName() {
+        return serviceRefName;
+    }
+
+    /**
+     * Sets the value of the serviceRefName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setServiceRefName(String value) {
+        this.serviceRefName = value;
+    }
+
+    /**
+     * Gets the value of the wsdlFile property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getWsdlFile() {
+        return wsdlFile;
+    }
+
+    /**
+     * Sets the value of the wsdlFile property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setWsdlFile(String value) {
+        this.wsdlFile = value;
+    }
+
+    /**
+     * Gets the value of the serviceCompletion property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceCompletionType }
+     *     
+     */
+    public ServiceCompletionType getServiceCompletion() {
+        return serviceCompletion;
+    }
+
+    /**
+     * Sets the value of the serviceCompletion property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceCompletionType }
+     *     
+     */
+    public void setServiceCompletion(ServiceCompletionType value) {
+        this.serviceCompletion = value;
+    }
+
+    /**
+     * Gets the value of the port 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 port property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPort().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PortType }
+     * 
+     * 
+     */
+    public List<PortType> getPort() {
+        if (port == null) {
+            port = new ArrayList<PortType>();
+        }
+        return this.port;
+    }
+
+}

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

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

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

Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/package-info.java?rev=1096959&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/package-info.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/model/naming/package-info.java Tue Apr 26 23:21:13 2011
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.25 at 01:15:28 PM PDT 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.geronimo.j2ee.deployment.model.naming;

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

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

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

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java Tue Apr 26 23:21:13 2011
@@ -18,6 +18,9 @@ package org.apache.geronimo.j2ee.deploym
 
 import java.util.jar.JarFile;
 
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import org.apache.geronimo.j2ee.deployment.model.app.ApplicationType;
 import org.apache.geronimo.kernel.util.JarUtils;
 import org.apache.geronimo.kernel.repository.Artifact;
 
@@ -48,4 +51,5 @@ public class EARConfigBuilder5Test
 
         super.tearDown();
     }
+
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionTest.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionTest.java Tue Apr 26 23:21:13 2011
@@ -21,18 +21,20 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.JAXBContext;
 import javax.xml.namespace.QName;
 
 import junit.framework.TestCase;
 
 import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.j2ee.deployment.model.app.ApplicationType;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.openejb.jee.JndiConsumer;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
 
 public class NamingBuilderCollectionTest extends TestCase {
-    
+
     public void testNamingBuilderSorting() throws Exception {
                 
         List<NamingBuilder> callList = new ArrayList<NamingBuilder>();        

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml Tue Apr 26 23:21:13 2011
@@ -74,10 +74,25 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-            </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.naming</packageName>-->
+                    <!--<extension>true</extension>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+            <!--<plugin>-->
+                <!--<groupId>org.codehaus.mojo</groupId>-->
+                <!--<artifactId>xmlbeans-maven-plugin</artifactId>-->
+            <!--</plugin>-->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Tue Apr 26 23:21:13 2011
@@ -18,28 +18,23 @@
 package org.apache.geronimo.naming.deployment;
 
 import java.beans.Introspector;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.namespace.QName;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.annotation.Holder;
 import org.apache.geronimo.j2ee.annotation.Injection;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.NamingBuilder;
+import org.apache.geronimo.j2ee.deployment.model.naming.PatternType;
 import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.j2ee.jndi.JndiScope;
 import org.apache.geronimo.kernel.config.Configuration;
@@ -48,16 +43,8 @@ import org.apache.geronimo.kernel.reposi
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.ImportType;
 import org.apache.geronimo.schema.NamespaceElementConverter;
-import org.apache.geronimo.xbeans.geronimo.naming.GerAbstractNamingEntryDocument;
-import org.apache.geronimo.xbeans.geronimo.naming.GerAbstractNamingEntryType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.openejb.jee.InjectionTarget;
 import org.apache.openejb.jee.JndiConsumer;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,12 +55,12 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractNamingBuilder implements NamingBuilder {
     private final Logger log = LoggerFactory.getLogger(AbstractNamingBuilder.class);
 
-    protected static final QName BASE_NAMING_QNAME = GerAbstractNamingEntryType.type.getDocumentElementName();
+//    protected static final QName BASE_NAMING_QNAME = GerAbstractNamingEntryType.type.getDocumentElementName();
     protected static final String J2EE_NAMESPACE = "http://java.sun.com/xml/ns/j2ee";
     protected static final String JEE_NAMESPACE = "http://java.sun.com/xml/ns/javaee";
     protected static final NamespaceElementConverter J2EE_CONVERTER = new NamespaceElementConverter(J2EE_NAMESPACE);
     protected static final NamespaceElementConverter JEE_CONVERTER = new NamespaceElementConverter(JEE_NAMESPACE);
-    protected static final NamespaceElementConverter NAMING_CONVERTER = new NamespaceElementConverter(GerAbstractNamingEntryDocument.type.getDocumentElementName().getNamespaceURI());
+//    protected static final NamespaceElementConverter NAMING_CONVERTER = new NamespaceElementConverter(GerAbstractNamingEntryDocument.type.getDocumentElementName().getNamespaceURI());
 
     private final Environment defaultEnvironment;
 
@@ -89,7 +76,7 @@ public abstract class AbstractNamingBuil
         return this.defaultEnvironment;
     }
 
-    public void buildEnvironment(JndiConsumer specDD, XmlObject plan, Environment environment) throws DeploymentException {
+    public void buildEnvironment(JndiConsumer specDD, JndiPlan plan, Environment environment) throws DeploymentException {
         // TODO Currently this method is called before the xml is metadata complete, so will not contain all refs
         // Just always call mergeEnvironment until this is fixed
         //
@@ -98,27 +85,27 @@ public abstract class AbstractNamingBuil
         // }
     }
 
-    protected boolean willMergeEnvironment(JndiConsumer specDD, XmlObject plan) throws DeploymentException {
-        return false;
-    }
-
-    protected boolean matchesDefaultEnvironment(Environment environment) {
-        for (Iterator iterator = defaultEnvironment.getDependencies().iterator(); iterator.hasNext();) {
-            Dependency defaultDependency = (Dependency) iterator.next();
-            boolean matches = false;
-            for (Iterator iterator1 = environment.getDependencies().iterator(); iterator1.hasNext();) {
-                Dependency actualDependency = (Dependency) iterator1.next();
-                if (matches(defaultDependency, actualDependency)) {
-                    matches = true;
-                    break;
-                }
-            }
-            if (!matches) {
-                return false;
-            }
-        }
-        return true;
-    }
+//    protected boolean willMergeEnvironment(JndiConsumer specDD, JndiPlan plan) throws DeploymentException {
+//        return false;
+//    }
+//
+//    protected boolean matchesDefaultEnvironment(Environment environment) {
+//        for (Iterator iterator = defaultEnvironment.getDependencies().iterator(); iterator.hasNext();) {
+//            Dependency defaultDependency = (Dependency) iterator.next();
+//            boolean matches = false;
+//            for (Iterator iterator1 = environment.getDependencies().iterator(); iterator1.hasNext();) {
+//                Dependency actualDependency = (Dependency) iterator1.next();
+//                if (matches(defaultDependency, actualDependency)) {
+//                    matches = true;
+//                    break;
+//                }
+//            }
+//            if (!matches) {
+//                return false;
+//            }
+//        }
+//        return true;
+//    }
 
     private boolean matches(Dependency defaultDependency, Dependency actualDependency) {
         if (defaultDependency.getArtifact().matches(actualDependency.getArtifact())
@@ -129,7 +116,7 @@ public abstract class AbstractNamingBuil
         return false;
     }
 
-    public void initContext(JndiConsumer specDD, XmlObject plan, Module module) throws DeploymentException {
+    public void initContext(JndiConsumer specDD, JndiPlan plan, Module module) throws DeploymentException {
     }
     
     public int getPriority() {
@@ -197,94 +184,94 @@ public abstract class AbstractNamingBuil
         return GBEAN_NAME_KEY.get(sharedContext);
     }
 
-    protected static QNameSet buildQNameSet(String[] eeNamespaces, String localPart) {
-        Set qnames = new HashSet(eeNamespaces.length);
-        for (int i = 0; i < eeNamespaces.length; i++) {
-            String namespace = eeNamespaces[i];
-            qnames.add(new QName(namespace, localPart));
-        }
-        //xmlbeans 2.0 has a bug so forArray doesn't work.  Don't know if it's fixed in later xmlbeans versions
-        //return QNameSet.forArray(qnames);
-        return QNameSet.forSets(null, Collections.EMPTY_SET, Collections.EMPTY_SET, qnames);
-    }
-
-    /**
-     * @param xmlObjects
-     * @param converter
-     * @param type
-     * @return
-     * @throws DeploymentException
-     * @deprecated
-     */
-    protected static XmlObject[] convert(XmlObject[] xmlObjects, NamespaceElementConverter converter, SchemaType type) throws DeploymentException {
-        //bizarre ArrayStoreException if xmlObjects is loaded by the wrong classloader
-        XmlObject[] converted = new XmlObject[xmlObjects.length];
-        for (int i = 0; i < xmlObjects.length; i++) {
-            XmlObject xmlObject = xmlObjects[i].copy();
-            if (xmlObject.schemaType() != type) {
-                converter.convertElement(xmlObject);
-                converted[i] = xmlObject.changeType(type);
-            } else {
-                converted[i] = xmlObject;
-            }
-            try {
-                XmlBeansUtil.validateDD(converted[i]);
-            } catch (XmlException e) {
-                throw new DeploymentException("Could not validate xmlObject of type " + type, e);
-            }
-        }
-        return converted;
-
-    }
-
-    protected static <T extends XmlObject> List<T> convert(XmlObject[] xmlObjects, NamespaceElementConverter converter, Class<T> c, SchemaType type) throws DeploymentException {
-        //there's probably a better way to say T extends XmlObject and get the type from that
-        List<T> result = new ArrayList<T>(xmlObjects.length);
-        for (XmlObject xmlObject : xmlObjects) {
-            xmlObject = convert(xmlObject, converter, type);
-            result.add((T) xmlObject);
-        }
-        return result;
-    }
-
-    protected static XmlObject convert(XmlObject xmlObject, NamespaceElementConverter converter, SchemaType type) throws DeploymentException {
-        Map ns = new HashMap();
-        XmlCursor cursor = xmlObject.newCursor();
-        try {
-            cursor.getAllNamespaces(ns);
-        } finally {
-            cursor.dispose();
-        }
-        xmlObject = xmlObject.copy();
-        cursor = xmlObject.newCursor();
-        cursor.toNextToken();
-        try {
-            for (Object o : ns.entrySet()) {
-                Map.Entry entry = (Map.Entry) o;
-                cursor.insertNamespace((String) entry.getKey(), (String) entry.getValue());
-            }
-        } finally {
-            cursor.dispose();
-        }
-
-        if (xmlObject.schemaType() != type) {
-            converter.convertElement(xmlObject);
-            xmlObject = xmlObject.changeType(type);
-        }
-        try {
-            XmlBeansUtil.validateDD(xmlObject);
-        } catch (XmlException e) {
-            throw new DeploymentException("Could not validate xmlObject of type " + type, e);
-        }
-        return xmlObject;
-    }
-
-    protected static String getStringValue(String s) {
-        return s == null ? null : s.trim();
-    }
+//    protected static QNameSet buildQNameSet(String[] eeNamespaces, String localPart) {
+//        Set qnames = new HashSet(eeNamespaces.length);
+//        for (int i = 0; i < eeNamespaces.length; i++) {
+//            String namespace = eeNamespaces[i];
+//            qnames.add(new QName(namespace, localPart));
+//        }
+//        //xmlbeans 2.0 has a bug so forArray doesn't work.  Don't know if it's fixed in later xmlbeans versions
+//        //return QNameSet.forArray(qnames);
+//        return QNameSet.forSets(null, Collections.EMPTY_SET, Collections.EMPTY_SET, qnames);
+//    }
+
+//    /**
+//     * @param xmlObjects
+//     * @param converter
+//     * @param type
+//     * @return
+//     * @throws DeploymentException
+//     * @deprecated
+//     */
+//    protected static XmlObject[] convert(XmlObject[] xmlObjects, NamespaceElementConverter converter, SchemaType type) throws DeploymentException {
+//        //bizarre ArrayStoreException if xmlObjects is loaded by the wrong classloader
+//        XmlObject[] converted = new XmlObject[xmlObjects.length];
+//        for (int i = 0; i < xmlObjects.length; i++) {
+//            XmlObject xmlObject = xmlObjects[i].copy();
+//            if (xmlObject.schemaType() != type) {
+//                converter.convertElement(xmlObject);
+//                converted[i] = xmlObject.changeType(type);
+//            } else {
+//                converted[i] = xmlObject;
+//            }
+//            try {
+//                XmlBeansUtil.validateDD(converted[i]);
+//            } catch (XmlException e) {
+//                throw new DeploymentException("Could not validate xmlObject of type " + type, e);
+//            }
+//        }
+//        return converted;
+//
+//    }
+
+//    protected static <T extends XmlObject> List<T> convert(XmlObject[] xmlObjects, NamespaceElementConverter converter, Class<T> c, SchemaType type) throws DeploymentException {
+//        //there's probably a better way to say T extends XmlObject and get the type from that
+//        List<T> result = new ArrayList<T>(xmlObjects.length);
+//        for (XmlObject xmlObject : xmlObjects) {
+//            xmlObject = convert(xmlObject, converter, type);
+//            result.add((T) xmlObject);
+//        }
+//        return result;
+//    }
+//
+//    protected static XmlObject convert(XmlObject xmlObject, NamespaceElementConverter converter, SchemaType type) throws DeploymentException {
+//        Map ns = new HashMap();
+//        XmlCursor cursor = xmlObject.newCursor();
+//        try {
+//            cursor.getAllNamespaces(ns);
+//        } finally {
+//            cursor.dispose();
+//        }
+//        xmlObject = xmlObject.copy();
+//        cursor = xmlObject.newCursor();
+//        cursor.toNextToken();
+//        try {
+//            for (Object o : ns.entrySet()) {
+//                Map.Entry entry = (Map.Entry) o;
+//                cursor.insertNamespace((String) entry.getKey(), (String) entry.getValue());
+//            }
+//        } finally {
+//            cursor.dispose();
+//        }
+//
+//        if (xmlObject.schemaType() != type) {
+//            converter.convertElement(xmlObject);
+//            xmlObject = xmlObject.changeType(type);
+//        }
+//        try {
+//            XmlBeansUtil.validateDD(xmlObject);
+//        } catch (XmlException e) {
+//            throw new DeploymentException("Could not validate xmlObject of type " + type, e);
+//        }
+//        return xmlObject;
+//    }
+//
+//    protected static String getStringValue(String s) {
+//        return s == null ? null : s.trim();
+//    }
     
 
-    public static AbstractNameQuery buildAbstractNameQuery(GerPatternType pattern, String type, String moduleType, Set interfaceTypes) {
+    public static AbstractNameQuery buildAbstractNameQuery(PatternType pattern, String type, String moduleType, Set interfaceTypes) {
         return ENCConfigBuilder.buildAbstractNameQueryFromPattern(pattern, null, type, moduleType, interfaceTypes);
     }
 
@@ -341,9 +328,9 @@ public abstract class AbstractNamingBuil
     }
 
 
-    public QName getBaseQName() {
-        return BASE_NAMING_QNAME;
-    }
+//    public QName getBaseQName() {
+//        return BASE_NAMING_QNAME;
+//    }
 
     protected String inferAndCheckType(Module module, Bundle bundle, List<InjectionTarget> injectionTargets, String name, String typeName) throws DeploymentException {
         Class<?> type = null;
@@ -355,10 +342,10 @@ public abstract class AbstractNamingBuil
             }
         }
         for (InjectionTarget injectionTarget : injectionTargets) {
-            String className = getStringValue(injectionTarget.getInjectionTargetClass());
+            String className = injectionTarget.getInjectionTargetClass();
             try {
                 Class<?> clazz = bundle.loadClass(className);
-                String fieldName = getStringValue(injectionTarget.getInjectionTargetName());
+                String fieldName = injectionTarget.getInjectionTargetName();
                 Class<?> fieldType = getField(clazz, fieldName);
                 fieldType = deprimitivize(fieldType);
                 if (type == null) {



Mime
View raw message