geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1076881 [3/3] - in /geronimo/sandbox/djencks/txmanager: ./ connector-itests/ connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ connector-itests/src/test/resources/ connector-itests/src/test/resources/deployert...
Date Thu, 03 Mar 2011 23:29:23 GMT
Added: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EnvironmentType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EnvironmentType.java?rev=1076881&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EnvironmentType.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EnvironmentType.java Thu Mar  3 23:29:22 2011
@@ -0,0 +1,263 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
+//
+
+
+package org.apache.geronimo.connector.deployment.plan;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for environmentType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="environmentType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="moduleId" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}artifactType" minOccurs="0"/>
+ *         &lt;element name="bundle-activator" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="bundle-classPath" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="import-package" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="export-package" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="require-bundle" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="dynamic-import-package" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "environmentType", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", propOrder = {
+    "moduleId",
+    "bundleActivator",
+    "bundleClassPath",
+    "importPackage",
+    "exportPackage",
+    "requireBundle",
+    "dynamicImportPackage"
+})
+public class EnvironmentType {
+
+    protected ArtifactType moduleId;
+    @XmlElement(name = "bundle-activator")
+    protected String bundleActivator;
+    @XmlElement(name = "bundle-classPath")
+    protected List<String> bundleClassPath;
+    @XmlElement(name = "import-package")
+    protected List<String> importPackage;
+    @XmlElement(name = "export-package")
+    protected List<String> exportPackage;
+    @XmlElement(name = "require-bundle")
+    protected List<String> requireBundle;
+    @XmlElement(name = "dynamic-import-package")
+    protected List<String> dynamicImportPackage;
+
+    /**
+     * Gets the value of the moduleId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ArtifactType }
+     *     
+     */
+    public ArtifactType getModuleId() {
+        return moduleId;
+    }
+
+    /**
+     * Sets the value of the moduleId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ArtifactType }
+     *     
+     */
+    public void setModuleId(ArtifactType value) {
+        this.moduleId = value;
+    }
+
+    /**
+     * Gets the value of the bundleActivator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBundleActivator() {
+        return bundleActivator;
+    }
+
+    /**
+     * Sets the value of the bundleActivator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBundleActivator(String value) {
+        this.bundleActivator = value;
+    }
+
+    /**
+     * Gets the value of the bundleClassPath property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the bundleClassPath property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getBundleClassPath().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getBundleClassPath() {
+        if (bundleClassPath == null) {
+            bundleClassPath = new ArrayList<String>();
+        }
+        return this.bundleClassPath;
+    }
+
+    /**
+     * Gets the value of the importPackage property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the importPackage property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getImportPackage().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getImportPackage() {
+        if (importPackage == null) {
+            importPackage = new ArrayList<String>();
+        }
+        return this.importPackage;
+    }
+
+    /**
+     * Gets the value of the exportPackage property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the exportPackage property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getExportPackage().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getExportPackage() {
+        if (exportPackage == null) {
+            exportPackage = new ArrayList<String>();
+        }
+        return this.exportPackage;
+    }
+
+    /**
+     * Gets the value of the requireBundle property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the requireBundle property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRequireBundle().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getRequireBundle() {
+        if (requireBundle == null) {
+            requireBundle = new ArrayList<String>();
+        }
+        return this.requireBundle;
+    }
+
+    /**
+     * Gets the value of the dynamicImportPackage property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the dynamicImportPackage property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getDynamicImportPackage().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getDynamicImportPackage() {
+        if (dynamicImportPackage == null) {
+            dynamicImportPackage = new ArrayList<String>();
+        }
+        return this.dynamicImportPackage;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EnvironmentType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EnvironmentType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EnvironmentType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ObjectFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ObjectFactory.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ObjectFactory.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ObjectFactory.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // 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.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 
@@ -31,6 +31,9 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
+    private final static QName _ClientEnvironment_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "client-environment");
+    private final static QName _ServerEnvironment_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "server-environment");
+    private final static QName _Environment_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "environment");
     private final static QName _Connector_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/connector-1.2", "connector");
 
     /**
@@ -41,27 +44,27 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ConnectionmanagerType }
+     * Create an instance of {@link EmptyType }
      * 
      */
-    public ConnectionmanagerType createConnectionmanagerType() {
-        return new ConnectionmanagerType();
+    public EmptyType createEmptyType() {
+        return new EmptyType();
     }
 
     /**
-     * Create an instance of {@link EmptyType }
+     * Create an instance of {@link ResourceadapterInstanceType }
      * 
      */
-    public EmptyType createEmptyType() {
-        return new EmptyType();
+    public ResourceadapterInstanceType createResourceadapterInstanceType() {
+        return new ResourceadapterInstanceType();
     }
 
     /**
-     * Create an instance of {@link XatransactionType }
+     * Create an instance of {@link DescriptionType }
      * 
      */
-    public XatransactionType createXatransactionType() {
-        return new XatransactionType();
+    public DescriptionType createDescriptionType() {
+        return new DescriptionType();
     }
 
     /**
@@ -73,35 +76,43 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ResourceadapterInstanceType }
+     * Create an instance of {@link ResourceadapterType }
      * 
      */
-    public ResourceadapterInstanceType createResourceadapterInstanceType() {
-        return new ResourceadapterInstanceType();
+    public ResourceadapterType createResourceadapterType() {
+        return new ResourceadapterType();
     }
 
     /**
-     * Create an instance of {@link SinglepoolType }
+     * Create an instance of {@link ConnectionmanagerType }
      * 
      */
-    public SinglepoolType createSinglepoolType() {
-        return new SinglepoolType();
+    public ConnectionmanagerType createConnectionmanagerType() {
+        return new ConnectionmanagerType();
     }
 
     /**
-     * Create an instance of {@link ConnectiondefinitionInstanceType }
+     * Create an instance of {@link XatransactionType }
      * 
      */
-    public ConnectiondefinitionInstanceType createConnectiondefinitionInstanceType() {
-        return new ConnectiondefinitionInstanceType();
+    public XatransactionType createXatransactionType() {
+        return new XatransactionType();
     }
 
     /**
-     * Create an instance of {@link AdminobjectInstanceType }
+     * Create an instance of {@link ArtifactType }
      * 
      */
-    public AdminobjectInstanceType createAdminobjectInstanceType() {
-        return new AdminobjectInstanceType();
+    public ArtifactType createArtifactType() {
+        return new ArtifactType();
+    }
+
+    /**
+     * Create an instance of {@link ConnectiondefinitionInstanceType }
+     * 
+     */
+    public ConnectiondefinitionInstanceType createConnectiondefinitionInstanceType() {
+        return new ConnectiondefinitionInstanceType();
     }
 
     /**
@@ -129,11 +140,19 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link DescriptionType }
+     * Create an instance of {@link ConnectionDefinitionType }
      * 
      */
-    public DescriptionType createDescriptionType() {
-        return new DescriptionType();
+    public ConnectionDefinitionType createConnectionDefinitionType() {
+        return new ConnectionDefinitionType();
+    }
+
+    /**
+     * Create an instance of {@link EnvironmentType }
+     * 
+     */
+    public EnvironmentType createEnvironmentType() {
+        return new EnvironmentType();
     }
 
     /**
@@ -145,19 +164,46 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ResourceadapterType }
+     * Create an instance of {@link SinglepoolType }
      * 
      */
-    public ResourceadapterType createResourceadapterType() {
-        return new ResourceadapterType();
+    public SinglepoolType createSinglepoolType() {
+        return new SinglepoolType();
     }
 
     /**
-     * Create an instance of {@link ConnectionDefinitionType }
+     * Create an instance of {@link AdminobjectInstanceType }
      * 
      */
-    public ConnectionDefinitionType createConnectionDefinitionType() {
-        return new ConnectionDefinitionType();
+    public AdminobjectInstanceType createAdminobjectInstanceType() {
+        return new AdminobjectInstanceType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", name = "client-environment")
+    public JAXBElement<EnvironmentType> createClientEnvironment(EnvironmentType value) {
+        return new JAXBElement<EnvironmentType>(_ClientEnvironment_QNAME, EnvironmentType.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 = "server-environment")
+    public JAXBElement<EnvironmentType> createServerEnvironment(EnvironmentType value) {
+        return new JAXBElement<EnvironmentType>(_ServerEnvironment_QNAME, EnvironmentType.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);
     }
 
     /**

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/OutboundResourceadapterType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/OutboundResourceadapterType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/OutboundResourceadapterType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/OutboundResourceadapterType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // 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.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/PartitionedpoolType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/PartitionedpoolType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/PartitionedpoolType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/PartitionedpoolType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // 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.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterInstanceType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterInstanceType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterInstanceType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterInstanceType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // 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.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // 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.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/SinglepoolType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/SinglepoolType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/SinglepoolType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/SinglepoolType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // 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.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/XatransactionType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/XatransactionType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/XatransactionType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/XatransactionType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // 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.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/package-info.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/package-info.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/package-info.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // 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.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/xsd/geronimo-connector-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/xsd/geronimo-connector-1.2.xsd?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/xsd/geronimo-connector-1.2.xsd (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/xsd/geronimo-connector-1.2.xsd Thu Mar  3 23:29:22 2011
@@ -18,6 +18,7 @@
 
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
     xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
     attributeFormDefault="unqualified">
@@ -50,16 +51,16 @@
             <!--</xs:documentation>-->
         <!--</xs:annotation>-->
     <!--</xs:import>-->
-    <!--<xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"-->
-        <!--schemaLocation="geronimo-module-1.2.xsd">-->
-        <!--<xs:annotation>-->
-            <!--<xs:documentation>-->
-                <!--Import Geronimo Services deployment plans. The imported plan-->
-                <!--includes complex types like moduleType, environmentType,-->
-                <!--dependenciesType, etc. required by this plan schema.-->
-            <!--</xs:documentation>-->
-        <!--</xs:annotation>-->
-    <!--</xs:import>-->
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"
+        schemaLocation="geronimo-module-1.2.xsd">
+        <xs:annotation>
+            <xs:documentation>
+                Import Geronimo Services deployment plans. The imported plan
+                includes complex types like moduleType, environmentType,
+                dependenciesType, etc. required by this plan schema.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:import>
     <xs:import namespace="http://www.w3.org/XML/1998/namespace"
         schemaLocation="http://www.w3.org/2001/xml.xsd" />
 
@@ -565,14 +566,14 @@
         </xs:annotation>
 
         <xs:sequence>
-            <!--<xs:element ref="sys:environment" minOccurs="0">-->
-                <!--<xs:annotation>-->
-                    <!--<xs:documentation>-->
-                        <!--Reference to environment element defined in imported-->
-                        <!--"geronimo-module-1.2.xsd"-->
-                    <!--</xs:documentation>-->
-                <!--</xs:annotation>-->
-            <!--</xs:element>-->
+            <xs:element ref="sys:environment" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>
+                        Reference to environment element defined in imported
+                        "geronimo-module-1.2.xsd"
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
 
             <xs:element name="resourceadapter" type="ger:resourceadapterType"
                 maxOccurs="unbounded">

Copied: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/xsd/geronimo-module-1.2.xsd (from r1075213, geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/xsd/geronimo-module-1.2.xsd?p2=geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/xsd/geronimo-module-1.2.xsd&p1=geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd&r1=1075213&r2=1076881&rev=1076881&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/xsd/geronimo-module-1.2.xsd Thu Mar  3 23:29:22 2011
@@ -53,39 +53,6 @@
         </xs:documentation>
     </xs:annotation>
 
-    <xs:element name="module" type="sys:moduleType">
-        <xs:annotation>
-            <xs:documentation>
-                The module element is the root element of the deployment plan
-                for the Geronimo Service module. Note that the sub-elements of
-                this element should be as in the given order in a sequence. It
-                includes two basic sections, environment section to provide
-                information like moduleName, dependencies, etc. and gbean
-                section to provide information about individual beans contained
-                in this module.
-            </xs:documentation>
-        </xs:annotation>
-    </xs:element>
-
-    <xs:complexType name="moduleType">
-        <xs:sequence>
-            <xs:element ref="sys:environment">
-                <xs:annotation>
-                    <xs:documentation>
-                        Reference to environment element defined later in this
-                        xsd.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-            <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
-                <xs:annotation>
-                    <xs:documentation>
-                        Reference to service element defined later in this xsd.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-        </xs:sequence>
-    </xs:complexType>
 
     <xs:element name="environment" type="sys:environmentType">
         <xs:annotation>
@@ -151,15 +118,6 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:element name="dependencies" type="sys:dependenciesType"
-                minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>
-                        "dependencies" holds all classloader and dependency
-                        information for the module
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
             <xs:element name="bundle-activator" type="xs:string" minOccurs="0"/>
             <xs:element name="bundle-classPath" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="import-package" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -167,155 +125,6 @@
             <xs:element name="require-bundle" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="dynamic-import-package" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
 
-            <xs:element name="hidden-classes" type="sys:classFilterType"
-                minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>
-                        A list of classes which will never be loaded from parent
-                        ClassLoaders of this module. For example, if Log4J was
-                        listed here, the module would never see Geronimo's copy
-                        of Log4J. If the module provided it's own Log4J JAR it
-                        would use that, otherwise it would not be able to load
-                        Log4J at all.
-
-                        The classes are specified in zero or more child "filter"
-                        elements where each filter element specifies a
-                        fully-qualified class name or prefix. Essentially, any
-                        class that starts with one of the prefixes listed here
-                        will be treated as hidden. For example, if you specify
-                        two filter elements containing "java.util" and
-                        "java.lang" then you would really screw up your
-                        application. :)
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-            <xs:element name="non-overridable-classes"
-                type="sys:classFilterType" minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>
-                        A list of classes which will only be loaded from parent
-                        ClassLoaders of this module (never from the module's own
-                        ClassLoader). For example, this is used to prevent a web
-                        application from redefining "javax.servlet", so those
-                        classes will *always* be loaded from the server instead
-                        of from the web web application's own ClassPath.
-
-                        The classes are specified in zero or more child "filter"
-                        elements where each filter element specifies a
-                        fully-qualified class name or prefix. Essentially, any
-                        class that starts with one of the prefixes listed here
-                        will be treated as hidden. For example, specifying two
-                        filter elements containing "javax.servlet" and
-                        "javax.ejb" would protect some of the core J2EE classes
-                        from being overridden.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-            <xs:element name="private-classes"
-                type="sys:classFilterType" minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>
-                        A list of classes which will only be loaded from the
-                        ClassLoader of this module or from parent ClassLoaders.
-                        
-                        This is used to prevent children configurations to see
-                        specific classes from its parents. The same effect can
-                        be achieved by using hidden-classes. However,
-                        private-classes is the preferred approach to hide 
-                        specific classes from all children configurations. 
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-            <xs:element name="inverse-classloading" type="sys:emptyType"
-                minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>
-                        If the "inverse-classloading" element is specified, the
-                        standard class loading delegation model is to be
-                        reversed for this module.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-            <xs:element name="suppress-default-environment" type="sys:emptyType"
-                minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>
-                        If the "suppress-default-environment" element is
-                        specified then any default environment build by a
-                        builder when deploying the plan will be suppressed.
-
-                        An example of where this is useful is when deploying a
-                        connector on an app client in a separate (standalone)
-                        module (not as part of a client plan).
-
-                        The connector builder defaultEnvironment includes some
-                        server modules that won't work on an app client, so you
-                        need to suppress the default environment and supply a
-                        complete environment including all parents for a
-                        non-app-client module you want to run on an app client
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:element name="dependencies" type="sys:dependenciesType" />
-
-    <xs:complexType name="dependenciesType">
-        <xs:sequence>
-            <xs:element name="dependency" type="sys:dependencyType"
-                minOccurs="0" maxOccurs="unbounded">
-                <xs:annotation>
-                    <xs:documentation>
-                        "dependency" holds an artifact locating an artifact in a
-                        repository. Depending on the type of artifact and value
-                        of the import element, the artifact may be included in
-                        the current classpath, be loaded as a parent, may
-                        require the services in the artifact to be started, or
-                        may not be added to the classpath.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="emptyType" />
-
-    <xs:element name="service" type="sys:abstract-serviceType">
-        <xs:annotation>
-            <xs:documentation>
-                An empty generic element to be extended by gbean and other
-                module types.
-            </xs:documentation>
-        </xs:annotation>
-    </xs:element>
-
-    <xs:complexType name="abstract-serviceType" abstract="true">
-        <xs:sequence></xs:sequence>
-    </xs:complexType>
-
-    <xs:element name="gbean" type="sys:gbeanType"
-        substitutionGroup="sys:service">
-        <xs:annotation>
-            <xs:documentation>
-                Adds a new custom component to the server. The component will be
-                deployed when this application module is deployed, but it is not
-                in any way protected, so once it is up and running, other
-                modules can refer to it normally.
-            </xs:documentation>
-        </xs:annotation>
-    </xs:element>
-
-    <xs:complexType name="classFilterType">
-        <xs:sequence>
-            <xs:element name="filter" type="xs:string" minOccurs="0"
-                maxOccurs="unbounded">
-                <xs:annotation>
-                    <xs:documentation>
-                        A fully-qualified class name or prefix to be filtered.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
         </xs:sequence>
     </xs:complexType>
 
@@ -400,325 +209,6 @@
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="dependencyType">
-        <xs:complexContent>
-            <xs:extension base="sys:artifactType">
-                <xs:annotation>
-                    <xs:documentation>
-                        DependencyType includes all the elements defined in
-                        artifactType.
-                    </xs:documentation>
-                </xs:annotation>
-                <xs:sequence>
-                    <xs:element name="import" type="sys:importType"
-                        minOccurs="0">
-                        <xs:annotation>
-                            <xs:documentation>
-                                The import element is restrictive element to
-                                defined type of dependency. The default (when
-                                omitted) is to include the specified dependency
-                                in the classloader (as a parent or URL). If
-                                defined as "classes" means that the classes must
-                                be included in the current module's classloader
-                                but the dependency does not need to be started.
-                                Specifying "services" means that the dependency
-                                (a module) must be started before the current
-                                module, but it is not included as a parent
-                                classloader.
-                            </xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                </xs:sequence>
-
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:simpleType name="importType">
-        <xs:annotation>
-            <xs:documentation>
-                <![CDATA[
-            The import element is restrictive.  The default (when omitted) is to include the specified dependency in
-            the classloader (as a parent or URL) and (if the dependency is a module) make sure it is started
-            before starting the current module.  Specifying "classes" means that the classes must be included
-            in the current module's classloader but the dependency does not need to be started. (I'm not sure this
-            is actually possible, but it is what is meant).  Specifying "services" means that the dependency (a module)
-            must be started before the current module, but it is not included as a parent classloader.
-
-            You probably never need to use the import element.
-                ]]>
-            </xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="classes">
-                <xs:annotation>
-                    <xs:documentation>
-                        The value "classes" means that the classes must be
-                        included in the current module's classloader but the
-                        dependency does not need to be started.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="services">
-                <xs:annotation>
-                    <xs:documentation>
-                        The value "services" means that the dependency (a
-                        module) must be started before the current module, but
-                        it is not included as a parent classloader.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:enumeration>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:complexType name="gbeanType">
-        <xs:complexContent>
-            <xs:extension base="sys:abstract-serviceType">
-                <xs:annotation>
-                    <xs:documentation>
-                        gbeanType includes all the elements defined in
-                        abstract-serviceType.
-                    </xs:documentation>
-                </xs:annotation>
-
-                <xs:choice minOccurs="0" maxOccurs="unbounded">
-                    <xs:element name="attribute" type="sys:attributeType">
-                        <xs:annotation>
-                            <xs:documentation>
-                                The attribute provide the name-value pair of
-                                various attributes for this GBean. The value of
-                                the attributes is specified by value of this
-                                element.
-                            </xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                    <xs:element name="xml-attribute"
-                        type="sys:xml-attributeType">
-                        <xs:annotation>
-                            <xs:documentation>
-                                The xml-attribute specifies the value of
-                                particular attribute in XML format, which will
-                                be interpreted by a component running in the
-                                system, which convert it to single value for
-                                this attribute.
-                            </xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                    <xs:element name="reference" type="sys:referenceType">
-                        <xs:annotation>
-                            <xs:documentation>
-                                The "reference" element specifies the value of a
-                                particular reference for this GBean in simplest
-                                form. It holds the reference to the GBean that
-                                matches the single pattern specified here, if no
-                                value is specified it will refer to all the
-                                matching GBeans.
-                            </xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                    <xs:element name="references" type="sys:referencesType">
-                        <xs:annotation>
-                            <xs:documentation>
-                                The "references" element specifies the value of
-                                a particular reference for this GBean matching
-                                multiple pattern elements.
-                            </xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                    <xs:element name="xml-reference"
-                        type="sys:xml-attributeType">
-                        <xs:annotation>
-                            <xs:documentation>
-                                The xml-reference specifies the value of
-                                particular reference in XML format, which will
-                                be interpreted by a component running in the
-                                system, which convert it to single value for
-                                this reference.
-                            </xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                    <xs:element name="dependency" type="sys:patternType">
-                        <xs:annotation>
-                            <xs:documentation>
-                                The element "dependency" is used to resolve
-                                dependencies at GBean level. This is normally
-                                only used if for some reason the GBeans within a
-                                module must be started in a certain order that
-                                is not reflected in the references between them.
-                            </xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                </xs:choice>
-                <xs:attribute name="name" type="xs:string" use="required">
-                    <xs:annotation>
-                        <xs:documentation>
-                            A unique name for this GBean within this module,
-                            this name will be used as a name component in
-                            AbstractName, hence AbstractName will be unique
-                            server wide.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-                <xs:attribute name="class" type="xs:string" use="required">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The fully-qualified name of the class containing the
-                            GBeanInfo for this GBean.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:complexType name="attributeType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="name" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The name for the current attribute. This name should
-                            be same as specified in GBeanInfo for this GBean.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-                <xs:attribute name="type" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The type of the current attribute. Again this should
-                            be same as one provided in GBeanInfo hence optional.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:complexType name="xml-attributeType">
-        <xs:sequence>
-            <xs:any namespace="##any" processContents="lax" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:string">
-            <xs:annotation>
-                <xs:documentation>
-                    The name for the current attribute. This name should be same
-                    as specified in GBeanInfo for this GBean.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:complexType>
-
-    <xs:complexType name="referencesType">
-        <xs:sequence>
-            <xs:element name="pattern" type="sys:patternType" minOccurs="1"
-                maxOccurs="unbounded">
-                <xs:annotation>
-                    <xs:documentation>
-                        The pattern used for matching the referenced GBean.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:string">
-            <xs:annotation>
-                <xs:documentation>
-                    The name for the current reference. This name should be same
-                    as specified in GBeanInfo for this GBean.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:complexType>
-
-    <xs:complexType name="patternType">
-        <xs:annotation>
-            <xs:documentation>
-                This group contains the components of an abstract name
-            </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-            <xs:sequence>
-                <xs:element name="groupId" type="xs:string" minOccurs="0">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The name for group containing module to match. By
-                            default is it considered wild card '*'.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-                <xs:element name="artifactId" type="xs:string" minOccurs="0">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The name for module in a specified group to be
-                            matched.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-                <xs:element name="version" type="xs:string" minOccurs="0">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The version number for the module formatted by dot
-                            separated numbers. If no version is provided it will
-                            be defaulted latest available version matching other
-                            criterions.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-                <xs:element name="module" type="xs:string" minOccurs="0">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The value specified here should match the file name
-                            of the module referenced.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-                <xs:element name="type" type="xs:string" minOccurs="0">
-                    <xs:annotation>
-                        <xs:documentation>
-                            This element defines the type of the module to be
-                            matched. The type could be 'CAR', 'JAR', EAR',
-                            'WAR', etc. If no type is provided it will be
-                            defaulted wild card char '*'.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-                <xs:element name="name" type="xs:string" minOccurs="0">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The name element to identify the referenced GBean by
-                            name.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-            </xs:sequence>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="referenceType">
-        <xs:complexContent>
-            <xs:extension base="sys:patternType">
-                <xs:annotation>
-                    <xs:documentation>
-                        referenceType includes all the elements defined in
-                        patternType.
-                    </xs:documentation>
-                </xs:annotation>
-                <xs:attribute name="name" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>
-                            The name for the current reference. This name should
-                            be same as specified in GBeanInfo for this GBean.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
 
-    <!--<xs:element name="service" type="sys:serviceType"/>-->
-    <!--<xs:complexType name="serviceType">-->
-    <!--<xs:sequence>-->
-    <!--<xs:element name="dependency" type="sys:artifactType" minOccurs="0" maxOccurs="unbounded"/>-->
-    <!--</xs:sequence>-->
-    <!--</xs:complexType>-->
 
 </xs:schema>

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java Thu Mar  3 23:29:22 2011
@@ -23,10 +23,8 @@ package org.apache.geronimo.connector.de
 import java.io.InputStream;
 import java.net.URL;
 
-import javax.persistence.ManyToOne;
 import org.apache.geronimo.connector.deployment.plan.ConnectorType;
 import org.apache.geronimo.connector.deployment.plan.JaxbUtil;
-import org.apache.geronimo.connector.extender.ConnectorExtender;
 import org.apache.geronimo.connector.mock.MockManagedConnectionFactory;
 import org.apache.geronimo.connector.mock.MockResourceAdapter;
 import org.apache.geronimo.connector.model.ManagedConnectionFactoryInfo;
@@ -34,11 +32,9 @@ import org.apache.geronimo.connector.mod
 import org.apache.geronimo.connector.model.ResourceAdapterModuleInfo;
 import org.apache.openejb.jee.Connector;
 import org.apache.openejb.jee.JaxbJavaee;
-import org.apache.openejb.jee.ResourceAdapter;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.CoreOptions;
-import org.ops4j.pax.exam.Customizer;
 import org.ops4j.pax.exam.Inject;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -46,14 +42,11 @@ import org.ops4j.pax.exam.options.MavenA
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
 
-import static org.ops4j.pax.exam.CoreOptions.debugClassLoading;
 import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
-import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.*;
 import static org.junit.Assert.*;
 
 /**
@@ -91,6 +84,11 @@ public class InfoBuilderTest {
                 mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
                 mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.6_spec"),
                 mavenBundle("org.apache.geronimo.specs", "geronimo-validation_1.0_spec"),
+                mavenBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec").startLevel(1),
+                mavenBundle("org.apache.geronimo.specs", "geronimo-jaxb_2.2_spec").startLevel(1),
+                mavenBundle("org.apache.geronimo.specs", "geronimo-stax-api_1.2_spec").startLevel(1),
+                mavenBundle("org.apache.geronimo.bundles", "woodstox").startLevel(1),
+                mavenBundle("org.apache.geronimo.bundles", "jaxb-impl").startLevel(2),
                 mavenBundle("org.apache.geronimo.components", "geronimo-mock-ra"),
                 mavenBundle("org.apache.geronimo.framework", "geronimo-common"),
                 mavenBundle("org.apache.openejb", "openejb-jee"),

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java Thu Mar  3 23:29:22 2011
@@ -52,7 +52,7 @@ public class PlanParsingTest extends Tes
 //    }
 
     public void testLoadGeronimoDeploymentDescriptor15() throws Exception {
-        URL srcXml = classLoader.getResource("connector_1_6/geronimo-ra.xml");
+        URL srcXml = classLoader.getResource("src/test/resources/deployertest/geronimo-ra.xml");
         XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument, CONNECTOR_QNAME, GerConnectorType.type);
@@ -104,15 +104,4 @@ public class PlanParsingTest extends Tes
         }
     }
 
-    public void testRectifyPlan() throws Exception {
-        URL srcXml = classLoader.getResource("data/old-schema-plan.xml");
-        XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
-        GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
-        if (doc == null) {
-            doc = (GerConnectorDocument) plan;
-        }
-        GerConnectorType gerConnector = doc.getConnector();
-        ConnectorPlanRectifier.rectifyPlan(gerConnector);
-        gerConnector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(gerConnector, CONNECTOR_QNAME, GerConnectorType.type);
-    }
 }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/extender/ConnectorExtender.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/extender/ConnectorExtender.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/extender/ConnectorExtender.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/extender/ConnectorExtender.java Thu Mar  3 23:29:22 2011
@@ -44,7 +44,7 @@ import org.osgi.util.tracker.BundleTrack
  * @version $Rev:$ $Date:$
  */
 
-@Component(immediate = true)
+@Component
 public class ConnectorExtender {
 
     public final static String PLAN_LOCATION = "OSGI-INF/connector/plan.ser";
@@ -56,7 +56,7 @@ public class ConnectorExtender {
 
     @Activate
     public void start(BundleContext bundleContext) {
-        bt = new BundleTracker(bundleContext, Bundle.STARTING | Bundle.ACTIVE, new WebBundleTrackerCustomizer());
+        bt = new BundleTracker(bundleContext, Bundle.STARTING | Bundle.ACTIVE, new RarBundleTrackerCustomizer());
         bt.open();
 
     }
@@ -67,7 +67,7 @@ public class ConnectorExtender {
         bt = null;
     }
 
-    private class WebBundleTrackerCustomizer implements BundleTrackerCustomizer {
+    private class RarBundleTrackerCustomizer implements BundleTrackerCustomizer {
 
         public Object addingBundle(Bundle bundle, BundleEvent event) {
             if (bundle.getState() == Bundle.ACTIVE) {

Modified: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml Thu Mar  3 23:29:22 2011
@@ -32,6 +32,58 @@
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-connector</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-connector-builder-1_6</artifactId>
+        </dependency>
+
+        <!-- jaxb goo -->
+        <!-- these are dependencies of connector-builder, why aren't they pulled in? -->
+        <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+             <artifactId>jaxb-impl</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+             <artifactId>woodstox</artifactId>
+         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+         <dependency>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-osgi-registry</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
+            <version>3.8-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-bundleutils</artifactId>
+            <version>3.8-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <version>3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>3.0-SNAPSHOT</version>
+        </dependency>
 
         <!-- we also need to install scr to get this stuff to work. Should be a separate feature -->
 

Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Thu Mar  3 23:29:22 2011
@@ -44,6 +44,8 @@
     <properties>
         <siteId>components/${project.artifactId}</siteId>
         <karafVersion>2.99.99-SNAPSHOT</karafVersion>
+        <jaxbImplVersion>2.2.3_1-SNAPSHOT</jaxbImplVersion>
+        <woodstoxVersion>3.2.9_1</woodstoxVersion>
     </properties>
 
     <dependencyManagement>
@@ -62,6 +64,11 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-connector-builder-1_6</artifactId>
+                <version>3.1.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-mock-ra</artifactId>
                 <version>3.1.1-SNAPSHOT</version>
             </dependency>
@@ -217,6 +224,33 @@
                 <artifactId>org.apache.felix.scr</artifactId>
                 <version>1.6.0</version>
             </dependency>
+
+
+            <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxbImplVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>woodstox</artifactId>
+                <version>${woodstoxVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-activation_1.1_spec</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message