geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1075183 [3/3] - in /geronimo/sandbox/djencks/txmanager: ./ connector-itests/ geronimo-connector-builder-1_6/ geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ geronimo-connector-builder-1_6/src/main/jav...
Date Sun, 27 Feb 2011 23:56:23 GMT
Added: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/JaxbUtil.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/JaxbUtil.java?rev=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/JaxbUtil.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/JaxbUtil.java Sun Feb 27 23:56:21 2011
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.connector.deployment.plan;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.ValidationEvent;
+import javax.xml.bind.ValidationEventHandler;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.sax.SAXSource;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class JaxbUtil {
+
+    public static final XMLInputFactory XMLINPUT_FACTORY = XMLInputFactory.newInstance();
+    private static final JAXBContext FEATURES_CONTEXT;
+    static {
+        try {
+            FEATURES_CONTEXT = JAXBContext.newInstance(ConnectorType.class);
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static ConnectorType unmarshal(InputStream in, boolean validate) throws XMLStreamException, JAXBException {
+        XMLStreamReader xmlStream = XMLINPUT_FACTORY.createXMLStreamReader(in);
+        Unmarshaller unmarshaller = FEATURES_CONTEXT.createUnmarshaller();
+        JAXBElement<ConnectorType> element = unmarshaller.unmarshal(xmlStream, ConnectorType.class);
+        ConnectorType connectorType = element.getValue();
+        return connectorType;
+
+    }
+
+    public static <T> void marshal(Class<T> type, Object object, OutputStream out) throws JAXBException {
+        JAXBContext ctx2 = JAXBContext.newInstance(type);
+        Marshaller marshaller = ctx2.createMarshaller();
+
+        marshaller.setProperty("jaxb.formatted.output", true);
+
+        marshaller.marshal(object, out);
+    }
+
+
+    /**
+     * Read in a T from the input stream.
+     *
+     * @param type     Class of object to be read in
+     * @param in       input stream to read
+     * @param validate whether to validate the input.
+     * @param <T>      class of object to be returned
+     * @return a T read from the input stream
+     * @throws ParserConfigurationException is the SAX parser can not be configured
+     * @throws SAXException                 if there is an xml problem
+     * @throws JAXBException                if the xml cannot be marshalled into a T.
+     */
+    public static <T> T unmarshal(Class<T> type, InputStream in, boolean validate) throws ParserConfigurationException, SAXException, JAXBException {
+        InputSource inputSource = new InputSource(in);
+
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        factory.setValidating(validate);
+        SAXParser parser = factory.newSAXParser();
+
+        JAXBContext ctx = JAXBContext.newInstance(type);
+        Unmarshaller unmarshaller = ctx.createUnmarshaller();
+        unmarshaller.setEventHandler(new ValidationEventHandler() {
+            public boolean handleEvent(ValidationEvent validationEvent) {
+                System.out.println(validationEvent);
+                return false;
+            }
+        });
+
+        XMLFilter xmlFilter = new NoSourceFilter(parser.getXMLReader());
+        xmlFilter.setContentHandler(unmarshaller.getUnmarshallerHandler());
+
+        SAXSource source = new SAXSource(xmlFilter, inputSource);
+
+        return type.cast(unmarshaller.unmarshal(source));
+    }
+
+    public static class NoSourceFilter extends XMLFilterImpl {
+        private static final InputSource EMPTY_INPUT_SOURCE = new InputSource(new ByteArrayInputStream(new byte[0]));
+
+        public NoSourceFilter(XMLReader xmlReader) {
+            super(xmlReader);
+        }
+
+        @Override
+        public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+            return EMPTY_INPUT_SOURCE;
+        }
+
+        @Override
+        public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
+            super.startElement("http://karaf.apache.org/xmlns/features/v1.0.0", localName, qname, atts);
+        }
+
+        @Override
+        public void endElement(String uri, String localName, String qName) throws SAXException {
+            super.endElement("http://karaf.apache.org/xmlns/features/v1.0.0", localName, qName);
+        }
+    }
+
+
+}

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ObjectFactory.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ObjectFactory.java Sun Feb 27 23:56:21 2011
@@ -0,0 +1,172 @@
+//
+// 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 
+//
+
+
+package org.apache.geronimo.connector.deployment.plan;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the org.apache.geronimo.connector.deployment.plan package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _Connector_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/connector-1.2", "connector");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.connector.deployment.plan
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ConnectionmanagerType }
+     * 
+     */
+    public ConnectionmanagerType createConnectionmanagerType() {
+        return new ConnectionmanagerType();
+    }
+
+    /**
+     * Create an instance of {@link EmptyType }
+     * 
+     */
+    public EmptyType createEmptyType() {
+        return new EmptyType();
+    }
+
+    /**
+     * Create an instance of {@link XatransactionType }
+     * 
+     */
+    public XatransactionType createXatransactionType() {
+        return new XatransactionType();
+    }
+
+    /**
+     * Create an instance of {@link OutboundResourceadapterType }
+     * 
+     */
+    public OutboundResourceadapterType createOutboundResourceadapterType() {
+        return new OutboundResourceadapterType();
+    }
+
+    /**
+     * Create an instance of {@link ResourceadapterInstanceType }
+     * 
+     */
+    public ResourceadapterInstanceType createResourceadapterInstanceType() {
+        return new ResourceadapterInstanceType();
+    }
+
+    /**
+     * Create an instance of {@link SinglepoolType }
+     * 
+     */
+    public SinglepoolType createSinglepoolType() {
+        return new SinglepoolType();
+    }
+
+    /**
+     * Create an instance of {@link ConnectiondefinitionInstanceType }
+     * 
+     */
+    public ConnectiondefinitionInstanceType createConnectiondefinitionInstanceType() {
+        return new ConnectiondefinitionInstanceType();
+    }
+
+    /**
+     * Create an instance of {@link AdminobjectInstanceType }
+     * 
+     */
+    public AdminobjectInstanceType createAdminobjectInstanceType() {
+        return new AdminobjectInstanceType();
+    }
+
+    /**
+     * Create an instance of {@link ConnectorType }
+     * 
+     */
+    public ConnectorType createConnectorType() {
+        return new ConnectorType();
+    }
+
+    /**
+     * Create an instance of {@link ConfigPropertySettingType }
+     * 
+     */
+    public ConfigPropertySettingType createConfigPropertySettingType() {
+        return new ConfigPropertySettingType();
+    }
+
+    /**
+     * Create an instance of {@link PartitionedpoolType }
+     * 
+     */
+    public PartitionedpoolType createPartitionedpoolType() {
+        return new PartitionedpoolType();
+    }
+
+    /**
+     * Create an instance of {@link DescriptionType }
+     * 
+     */
+    public DescriptionType createDescriptionType() {
+        return new DescriptionType();
+    }
+
+    /**
+     * Create an instance of {@link AdminobjectType }
+     * 
+     */
+    public AdminobjectType createAdminobjectType() {
+        return new AdminobjectType();
+    }
+
+    /**
+     * Create an instance of {@link ResourceadapterType }
+     * 
+     */
+    public ResourceadapterType createResourceadapterType() {
+        return new ResourceadapterType();
+    }
+
+    /**
+     * Create an instance of {@link ConnectionDefinitionType }
+     * 
+     */
+    public ConnectionDefinitionType createConnectionDefinitionType() {
+        return new ConnectionDefinitionType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ConnectorType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2", name = "connector")
+    public JAXBElement<ConnectorType> createConnector(ConnectorType value) {
+        return new JAXBElement<ConnectorType>(_Connector_QNAME, ConnectorType.class, null, value);
+    }
+
+}

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

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

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

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/OutboundResourceadapterType.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/OutboundResourceadapterType.java Sun Feb 27 23:56:21 2011
@@ -0,0 +1,92 @@
+//
+// 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 
+//
+
+
+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;
+
+
+/**
+ * 
+ *                 The outbound-resourceadapterType specifies information about an
+ *                 outbound resource adapter. The information includes fully
+ *                 qualified names of classes/interfaces required as part of the
+ *                 connector architecture specified contracts for connection
+ *                 management, level of transaction support provided, one or more
+ *                 authentication mechanisms supported and additional required
+ *                 security permissions.
+ * 
+ *                 If there is no authentication-mechanism specified as part of
+ *                 resource adapter element then the resource adapter does not
+ *                 support any standard security authentication mechanisms as part
+ *                 of security contract. The application server ignores the
+ *                 security part of the system contracts in this case.
+ *             
+ * 
+ * <p>Java class for outbound-resourceadapterType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="outbound-resourceadapterType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="connection-definition" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}connection-definitionType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "outbound-resourceadapterType", propOrder = {
+    "connectionDefinition"
+})
+public class OutboundResourceadapterType {
+
+    @XmlElement(name = "connection-definition", required = true)
+    protected List<ConnectionDefinitionType> connectionDefinition;
+
+    /**
+     * Gets the value of the connectionDefinition 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 connectionDefinition property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getConnectionDefinition().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ConnectionDefinitionType }
+     * 
+     * 
+     */
+    public List<ConnectionDefinitionType> getConnectionDefinition() {
+        if (connectionDefinition == null) {
+            connectionDefinition = new ArrayList<ConnectionDefinitionType>();
+        }
+        return this.connectionDefinition;
+    }
+
+}

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

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

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

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/PartitionedpoolType.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/PartitionedpoolType.java Sun Feb 27 23:56:21 2011
@@ -0,0 +1,99 @@
+//
+// 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 
+//
+
+
+package org.apache.geronimo.connector.deployment.plan;
+
+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 partitionedpoolType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="partitionedpoolType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}singlepoolType">
+ *       &lt;sequence>
+ *         &lt;element name="partition-by-subject" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}emptyType" minOccurs="0"/>
+ *         &lt;element name="partition-by-connectionrequestinfo" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}emptyType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "partitionedpoolType", propOrder = {
+    "partitionBySubject",
+    "partitionByConnectionrequestinfo"
+})
+public class PartitionedpoolType
+    extends SinglepoolType
+{
+
+    @XmlElement(name = "partition-by-subject")
+    protected EmptyType partitionBySubject;
+    @XmlElement(name = "partition-by-connectionrequestinfo")
+    protected EmptyType partitionByConnectionrequestinfo;
+
+    /**
+     * Gets the value of the partitionBySubject property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EmptyType }
+     *     
+     */
+    public EmptyType getPartitionBySubject() {
+        return partitionBySubject;
+    }
+
+    /**
+     * Sets the value of the partitionBySubject property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EmptyType }
+     *     
+     */
+    public void setPartitionBySubject(EmptyType value) {
+        this.partitionBySubject = value;
+    }
+
+    /**
+     * Gets the value of the partitionByConnectionrequestinfo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EmptyType }
+     *     
+     */
+    public EmptyType getPartitionByConnectionrequestinfo() {
+        return partitionByConnectionrequestinfo;
+    }
+
+    /**
+     * Sets the value of the partitionByConnectionrequestinfo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EmptyType }
+     *     
+     */
+    public void setPartitionByConnectionrequestinfo(EmptyType value) {
+        this.partitionByConnectionrequestinfo = value;
+    }
+
+}

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

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

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

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterInstanceType.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterInstanceType.java Sun Feb 27 23:56:21 2011
@@ -0,0 +1,140 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.02.25 at 01:20:32 AM 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;
+
+
+/**
+ * 
+ *                 The resourceadapter instance info is put in a separate optional
+ *                 element to provide easier more consistent support for 1.0
+ *                 adapters. The resourceadapter instance provide resource adapter
+ *                 instance specific information like configuration properties and
+ *                 workmanager implementation.
+ *             
+ * 
+ * <p>Java class for resourceadapter-instanceType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="resourceadapter-instanceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="resourceadapter-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="config-property-setting" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}config-property-settingType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="workmanager" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "resourceadapter-instanceType", propOrder = {
+    "resourceadapterName",
+    "configPropertySetting",
+    "workmanager"
+})
+public class ResourceadapterInstanceType {
+
+    @XmlElement(name = "resourceadapter-name", required = true)
+    protected String resourceadapterName;
+    @XmlElement(name = "config-property-setting")
+    protected List<ConfigPropertySettingType> configPropertySetting;
+    @XmlElement(required = true)
+    protected String workmanager;
+
+    /**
+     * Gets the value of the resourceadapterName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getResourceadapterName() {
+        return resourceadapterName;
+    }
+
+    /**
+     * Sets the value of the resourceadapterName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setResourceadapterName(String value) {
+        this.resourceadapterName = value;
+    }
+
+    /**
+     * Gets the value of the configPropertySetting 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 configPropertySetting property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getConfigPropertySetting().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ConfigPropertySettingType }
+     * 
+     * 
+     */
+    public List<ConfigPropertySettingType> getConfigPropertySetting() {
+        if (configPropertySetting == null) {
+            configPropertySetting = new ArrayList<ConfigPropertySettingType>();
+        }
+        return this.configPropertySetting;
+    }
+
+    /**
+     * Gets the value of the workmanager property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getWorkmanager() {
+        return workmanager;
+    }
+
+    /**
+     * Sets the value of the workmanager property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setWorkmanager(String value) {
+        this.workmanager = value;
+    }
+
+}

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

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

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

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterType.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ResourceadapterType.java Sun Feb 27 23:56:21 2011
@@ -0,0 +1,131 @@
+//
+// 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 
+//
+
+
+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 resourceadapterType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="resourceadapterType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="resourceadapter-instance" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}resourceadapter-instanceType" minOccurs="0"/>
+ *         &lt;element name="outbound-resourceadapter" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}outbound-resourceadapterType" minOccurs="0"/>
+ *         &lt;element name="adminobject" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}adminobjectType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "resourceadapterType", propOrder = {
+    "resourceadapterInstance",
+    "outboundResourceadapter",
+    "adminobject"
+})
+public class ResourceadapterType {
+
+    @XmlElement(name = "resourceadapter-instance")
+    protected ResourceadapterInstanceType resourceadapterInstance;
+    @XmlElement(name = "outbound-resourceadapter")
+    protected OutboundResourceadapterType outboundResourceadapter;
+    protected List<AdminobjectType> adminobject;
+
+    /**
+     * Gets the value of the resourceadapterInstance property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ResourceadapterInstanceType }
+     *     
+     */
+    public ResourceadapterInstanceType getResourceadapterInstance() {
+        return resourceadapterInstance;
+    }
+
+    /**
+     * Sets the value of the resourceadapterInstance property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ResourceadapterInstanceType }
+     *     
+     */
+    public void setResourceadapterInstance(ResourceadapterInstanceType value) {
+        this.resourceadapterInstance = value;
+    }
+
+    /**
+     * Gets the value of the outboundResourceadapter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OutboundResourceadapterType }
+     *     
+     */
+    public OutboundResourceadapterType getOutboundResourceadapter() {
+        return outboundResourceadapter;
+    }
+
+    /**
+     * Sets the value of the outboundResourceadapter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OutboundResourceadapterType }
+     *     
+     */
+    public void setOutboundResourceadapter(OutboundResourceadapterType value) {
+        this.outboundResourceadapter = value;
+    }
+
+    /**
+     * Gets the value of the adminobject 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 adminobject property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAdminobject().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AdminobjectType }
+     * 
+     * 
+     */
+    public List<AdminobjectType> getAdminobject() {
+        if (adminobject == null) {
+            adminobject = new ArrayList<AdminobjectType>();
+        }
+        return this.adminobject;
+    }
+
+}

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

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

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

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/SinglepoolType.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/SinglepoolType.java Sun Feb 27 23:56:21 2011
@@ -0,0 +1,243 @@
+//
+// 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 
+//
+
+
+package org.apache.geronimo.connector.deployment.plan;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for singlepoolType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="singlepoolType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="max-size" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         &lt;element name="min-size" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         &lt;element name="blocking-timeout-milliseconds" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         &lt;element name="idle-timeout-minutes" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         &lt;choice>
+ *           &lt;element name="match-one" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}emptyType"/>
+ *           &lt;element name="match-all" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}emptyType"/>
+ *           &lt;element name="select-one-assume-match" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}emptyType"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "singlepoolType", propOrder = {
+    "maxSize",
+    "minSize",
+    "blockingTimeoutMilliseconds",
+    "idleTimeoutMinutes",
+    "matchOne",
+    "matchAll",
+    "selectOneAssumeMatch"
+})
+@XmlSeeAlso({
+    PartitionedpoolType.class
+})
+public class SinglepoolType {
+
+    @XmlElement(name = "max-size")
+    protected Integer maxSize;
+    @XmlElement(name = "min-size")
+    protected Integer minSize;
+    @XmlElement(name = "blocking-timeout-milliseconds")
+    protected Integer blockingTimeoutMilliseconds;
+    @XmlElement(name = "idle-timeout-minutes")
+    protected Integer idleTimeoutMinutes;
+    @XmlElement(name = "match-one")
+    protected EmptyType matchOne;
+    @XmlElement(name = "match-all")
+    protected EmptyType matchAll;
+    @XmlElement(name = "select-one-assume-match")
+    protected EmptyType selectOneAssumeMatch;
+
+    /**
+     * Gets the value of the maxSize property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public Integer getMaxSize() {
+        return maxSize;
+    }
+
+    /**
+     * Sets the value of the maxSize property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setMaxSize(Integer value) {
+        this.maxSize = value;
+    }
+
+    /**
+     * Gets the value of the minSize property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public Integer getMinSize() {
+        return minSize;
+    }
+
+    /**
+     * Sets the value of the minSize property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setMinSize(Integer value) {
+        this.minSize = value;
+    }
+
+    /**
+     * Gets the value of the blockingTimeoutMilliseconds property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public Integer getBlockingTimeoutMilliseconds() {
+        return blockingTimeoutMilliseconds;
+    }
+
+    /**
+     * Sets the value of the blockingTimeoutMilliseconds property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setBlockingTimeoutMilliseconds(Integer value) {
+        this.blockingTimeoutMilliseconds = value;
+    }
+
+    /**
+     * Gets the value of the idleTimeoutMinutes property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public Integer getIdleTimeoutMinutes() {
+        return idleTimeoutMinutes;
+    }
+
+    /**
+     * Sets the value of the idleTimeoutMinutes property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setIdleTimeoutMinutes(Integer value) {
+        this.idleTimeoutMinutes = value;
+    }
+
+    /**
+     * Gets the value of the matchOne property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EmptyType }
+     *     
+     */
+    public EmptyType getMatchOne() {
+        return matchOne;
+    }
+
+    /**
+     * Sets the value of the matchOne property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EmptyType }
+     *     
+     */
+    public void setMatchOne(EmptyType value) {
+        this.matchOne = value;
+    }
+
+    /**
+     * Gets the value of the matchAll property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EmptyType }
+     *     
+     */
+    public EmptyType getMatchAll() {
+        return matchAll;
+    }
+
+    /**
+     * Sets the value of the matchAll property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EmptyType }
+     *     
+     */
+    public void setMatchAll(EmptyType value) {
+        this.matchAll = value;
+    }
+
+    /**
+     * Gets the value of the selectOneAssumeMatch property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EmptyType }
+     *     
+     */
+    public EmptyType getSelectOneAssumeMatch() {
+        return selectOneAssumeMatch;
+    }
+
+    /**
+     * Sets the value of the selectOneAssumeMatch property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EmptyType }
+     *     
+     */
+    public void setSelectOneAssumeMatch(EmptyType value) {
+        this.selectOneAssumeMatch = value;
+    }
+
+}

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

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

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

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/XatransactionType.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/XatransactionType.java Sun Feb 27 23:56:21 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.02.25 at 01:20:32 AM PST 
+//
+
+
+package org.apache.geronimo.connector.deployment.plan;
+
+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 xatransactionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="xatransactionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="transaction-caching" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}emptyType" minOccurs="0"/>
+ *         &lt;element name="thread-caching" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}emptyType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "xatransactionType", propOrder = {
+    "transactionCaching",
+    "threadCaching"
+})
+public class XatransactionType {
+
+    @XmlElement(name = "transaction-caching")
+    protected EmptyType transactionCaching;
+    @XmlElement(name = "thread-caching")
+    protected EmptyType threadCaching;
+
+    /**
+     * Gets the value of the transactionCaching property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EmptyType }
+     *     
+     */
+    public EmptyType getTransactionCaching() {
+        return transactionCaching;
+    }
+
+    /**
+     * Sets the value of the transactionCaching property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EmptyType }
+     *     
+     */
+    public void setTransactionCaching(EmptyType value) {
+        this.transactionCaching = value;
+    }
+
+    /**
+     * Gets the value of the threadCaching property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EmptyType }
+     *     
+     */
+    public EmptyType getThreadCaching() {
+        return threadCaching;
+    }
+
+    /**
+     * Sets the value of the threadCaching property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EmptyType }
+     *     
+     */
+    public void setThreadCaching(EmptyType value) {
+        this.threadCaching = value;
+    }
+
+}

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

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

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

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/package-info.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/package-info.java Sun Feb 27 23:56:21 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.02.25 at 01:20:32 AM PST 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.geronimo.connector.deployment.plan;

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

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

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

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=1075183&r1=1075182&r2=1075183&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 Sun Feb 27 23:56:21 2011
@@ -18,8 +18,6 @@
 
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-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">
@@ -41,27 +39,27 @@
             http://geronimo.apache.org/xml/ns/j2ee/connector-1.2
         </xs:documentation>
     </xs:annotation>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2"
-        schemaLocation="geronimo-naming-1.2.xsd">
-        <xs:annotation>
-            <xs:documentation>
-                Import partial schema containing common naming elements, the
-                imported plan declares elements like ejb-ref, ejb-local-ref,
-                service-ref,resource-ref, and resource-env-ref 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://geronimo.apache.org/xml/ns/naming-1.2"-->
+        <!--schemaLocation="geronimo-naming-1.2.xsd">-->
+        <!--<xs:annotation>-->
+            <!--<xs:documentation>-->
+                <!--Import partial schema containing common naming elements, the-->
+                <!--imported plan declares elements like ejb-ref, ejb-local-ref,-->
+                <!--service-ref,resource-ref, and resource-env-ref 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" />
 
@@ -567,14 +565,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">
@@ -600,14 +598,14 @@
                 </xs:annotation>
             </xs:element>
 
-            <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
-                <xs:annotation>
-                    <xs:documentation>
-                        Reference to service element defined in imported
-                        "geronimo-module-1.2.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 in imported-->
+                        <!--"geronimo-module-1.2.xsd".-->
+                    <!--</xs:documentation>-->
+                <!--</xs:annotation>-->
+            <!--</xs:element>-->
         </xs:sequence>
 
     </xs:complexType>
@@ -737,7 +735,8 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:element ref="naming:workmanager">
+            <xs:element name="workmanager"
+                    type="xs:string">
                 <xs:annotation>
                     <xs:documentation>
                         Reference to workmanager element defined in imported

Added: 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=1075183&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java Sun Feb 27 23:56:21 2011
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.connector.deployment;
+
+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;
+import org.apache.geronimo.connector.model.ResourceAdapterInfo;
+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;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+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.*;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+@RunWith(JUnit4TestRunner.class)
+public class InfoBuilderTest {
+
+    @Inject
+    private BundleContext bundleContext;
+
+    @org.ops4j.pax.exam.junit.Configuration
+    public static Option[] configuration() {
+        Option[] options = options(
+//                debugClassLoading(),
+                mavenBundle("org.osgi", "org.osgi.compendium"),
+                // Log
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+                // Felix Config Admin
+//                mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
+
+//                mavenBundle("org.apache.felix", "org.apache.felix.scr"),
+                // Felix mvn url handler
+                mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+//                mavenBundle("org.ops4j.pax.swissbox", "pax-swissbox-tinybundles"),
+
+
+                // this is how you set the default log level when using pax logging (logProfile)
+                systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+                // Bundles
+                mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
+                mavenBundle("org.apache.geronimo.components", "geronimo-connector"),
+                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.components", "geronimo-mock-ra"),
+                mavenBundle("org.apache.geronimo.framework", "geronimo-common"),
+                mavenBundle("org.apache.openejb", "openejb-jee"),
+
+
+                //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
+//                new Customizer() {
+//                    @Override
+//                    public InputStream customizeTestProbe(InputStream testProbe) throws Exception {
+//                        return modifyBundle(testProbe)
+//                                .build();
+////                                .add(ConnectorExtender.PLAN_LOCATION, new Hide().raInputStream()).build();
+//                    }
+//                },
+                equinox().version("3.5.0")
+        );
+//        options = updateOptions(options);
+        return options;
+    }
+
+    public static MavenArtifactProvisionOption mavenBundle(String groupId, String artifactId) {
+        return CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId).versionAsInProject();
+    }
+
+    @Test
+    public void testInfoBuilder() throws Exception {
+        Bundle bundle = bundleContext.getBundle();
+        long id = bundle.getBundleId();
+        for (long l = 0; l <= id; l++) {
+
+            Bundle b = bundleContext.getBundle(l);
+            System.out.println("Bundle: " + b);
+            System.out.println("state: " + b.getState());
+            System.out.println("location: " + b.getLocation());
+            try {
+                b.start();
+            } catch (BundleException e) {
+                System.out.println(e.getMessage());
+            }
+        }
+
+        URL ra = bundle.getResource("connector_1_6/ra.xml");
+        URL plan = bundle.getResource("connector_1_6/geronimo-ra.xml");
+
+        InputStream raIn = ra.openStream();
+        Connector connector;
+        try {
+            connector = (Connector) JaxbJavaee.unmarshalJavaee(Connector.class, raIn);
+        } finally {
+            raIn.close();
+        }
+
+        InputStream planIn = plan.openStream();
+        ConnectorType connectorType;
+        try {
+            connectorType = JaxbUtil.unmarshal(planIn, false);
+        } finally {
+            planIn.close();
+        }
+
+        InfoBuilder infoBuilder = new InfoBuilder();
+        ResourceAdapterModuleInfo info = infoBuilder.configureConnector(connector, connectorType, bundle);
+        assertEquals(1, info.resourceAdapterInfos.size());
+        ResourceAdapterInfo raInfo = info.resourceAdapterInfos.get(0);
+        assertEquals(MockResourceAdapter.class.getName(), raInfo.resourceAdapterClass);
+        assertEquals("(name=DefaultWorkManager)", raInfo.workManagerTarget);
+        assertEquals("NewStringValue", raInfo.configProperties.get("RAStringProperty"));
+        assertEquals(3, raInfo.managedConnectionFactoryInfos.size());
+        ManagedConnectionFactoryInfo mcfInfo = raInfo.managedConnectionFactoryInfos.get(0);
+        assertEquals(MockManagedConnectionFactory.class.getName(), mcfInfo.managedConnectionFactoryClass);
+        assertEquals("newvalue2", mcfInfo.configProperties.get("OutboundStringProperty3"));
+        assertEquals(ManagedConnectionFactoryInfo.PoolCardinality.partitionedBySubject, mcfInfo.poolCardinality);
+        assertEquals(10, mcfInfo.maxPoolSize);
+        assertEquals(ManagedConnectionFactoryInfo.MatchingPolicy.selectOne, mcfInfo.matchingPolicy);
+        assertEquals(ManagedConnectionFactoryInfo.TransactionSupport.xaTxCached, mcfInfo.transactionSupport);
+        assertEquals(2, info.adminObjectInfos.size());
+//        throw new Exception("show log");
+    }
+}

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml?rev=1075183&r1=1075182&r2=1075183&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml Sun Feb 27 23:56:21 2011
@@ -31,9 +31,7 @@
         <resourceadapter-instance>
             <resourceadapter-name>testRA</resourceadapter-name>
             <config-property-setting name="RAStringProperty">NewStringValue</config-property-setting>
-            <workmanager>
-                <gbean-link>DefaultWorkManager</gbean-link>
-            </workmanager>
+            <workmanager>(name=DefaultWorkManager)</workmanager>
         </resourceadapter-instance>
         <outbound-resourceadapter>
             <connection-definition>
@@ -109,39 +107,4 @@
         </adminobject-instance>
     </adminobject>
 
-    <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
-    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.wrapper.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
-        <reference name="TransactionManager">
-            <name>TransactionManager</name>
-        </reference>
-    </gbean>
-
-    <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
-        <attribute name="keepAliveTime">5000</attribute>
-        <attribute name="minPoolSize">100</attribute>
-        <attribute name="maxPoolSize">300</attribute>
-        <attribute name="poolName">DefaultThreadPool</attribute>
-    </gbean>
-
-    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.wrapper.work.GeronimoWorkManagerGBean">
-        <reference name="SyncPool">
-            <name>DefaultThreadPool</name>
-        </reference>
-        <reference name="StartPool">
-            <name>DefaultThreadPool</name>
-        </reference>
-        <reference name="ScheduledPool">
-            <name>DefaultThreadPool</name>
-        </reference>
-        <reference name="WorkContextHandler">
-        </reference>
-    </gbean>
-
-    <gbean name="TransactionContextHandler" class="org.apache.geronimo.connector.wrapper.work.TransactionContextHandlerGBean">
-        <reference name="XAWork">
-            <name>TransactionManager</name>
-        </reference>
-    </gbean>
-
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.wrapper.manager.GeronimoTransactionManagerGBean"/>
 </connector>

Copied: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/script/copy-main.xml (from r1074356, geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/script/test-setup.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/script/copy-main.xml?p2=geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/script/copy-main.xml&p1=geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/script/test-setup.xml&r1=1074356&r2=1075183&rev=1075183&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/script/test-setup.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/script/copy-main.xml Sun Feb 27 23:56:21 2011
@@ -18,113 +18,12 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project name="test-setup" default="default" basedir=".">
+<project name="copy-main" default="default" basedir=".">
 
     <target name="default">
-        <!-- Build test-rar-10 -->
-        <mkdir dir="${basedir}/target/test-rar-10/META-INF"/>
-        <copy todir="${basedir}/target/test-rar-10/META-INF">
-            <fileset dir="${basedir}/src/test/resources/connector_1_0"/>
+        <copy todir="${basedir}/target/test-classes">
+            <fileset dir="${basedir}/target/classes"/>
         </copy>
-        <jar destfile="${basedir}/target/test-rar-10.rar" basedir="${basedir}/target/test-rar-10"/>
-
-        <!-- Build test-rar-16 -->
-        <mkdir dir="${basedir}/target/test-rar-16/META-INF"/>
-        <copy todir="${basedir}/target/test-rar-16/META-INF">
-            <fileset dir="${basedir}/src/test/resources/connector_1_6"/>
-        </copy>
-        <jar destfile="${basedir}/target/test-rar-16.rar" basedir="${basedir}/target/test-rar-16"/>
-
-        <!-- Build test-rar-15 -->
-        <mkdir dir="${basedir}/target/test-rar-15/META-INF"/>
-        <copy todir="${basedir}/target/test-rar-15/META-INF">
-            <fileset dir="${basedir}/src/test/resources/connector_1_5"/>
-        </copy>
-        <jar destfile="${basedir}/target/test-rar-15.rar" basedir="${basedir}/target/test-rar-15"/>
-
-        <mkdir dir="${basedir}/target/test-rar-15-notx/META-INF"/>
-        <copy todir="${basedir}/target/test-rar-15-notx/META-INF">
-            <fileset dir="${basedir}/src/test/resources/connector_1_5_notx"/>
-        </copy>
-
-        <jar destfile="${basedir}/target/test-rar-15-notx.rar"
-            basedir="${basedir}/target/test-rar-15-notx"/>
-
-        <mkdir dir="${basedir}/target/test-rar-15-localtx/META-INF"/>
-
-        <copy todir="${basedir}/target/test-rar-15-localtx/META-INF">
-            <fileset dir="${basedir}/src/test/resources/connector_1_5_localtx"/>
-        </copy>
-
-        <jar destfile="${basedir}/target/test-rar-15-localtx.rar"
-            basedir="${basedir}/target/test-rar-15-localtx"/>
-
-        <!-- Build test-ear -->
-        <jar destfile="${basedir}/target/test-ear.ear">
-            <fileset dir="${basedir}/target">
-                <include name="test-rar-10.rar"/>
-                <include name="test-rar-15.rar"/>
-            </fileset>
-            <zipfileset dir="${basedir}/src/test/resources/ear" prefix="META-INF"/>
-        </jar>
-        
-        <!--do it again without geronimo dds-->
-        <!-- Build test-rar-10 -->
-        <mkdir dir="${basedir}/target/test-rar-10-noger/META-INF"/>
-        <copy todir="${basedir}/target/test-rar-10-noger/META-INF">
-            <fileset dir="${basedir}/src/test/resources/connector_1_0">
-                <exclude name="geronimo-ra.xml"/>
-            </fileset>
-        </copy>
-        <jar destfile="${basedir}/target/test-rar-10-noger.rar" basedir="${basedir}/target/test-rar-10"/>
-
-        <!-- Build test-rar-15 -->
-        <mkdir dir="${basedir}/target/test-rar-15-noger/META-INF"/>
-        <copy todir="${basedir}/target/test-rar-15-noger/META-INF">
-            <fileset dir="${basedir}/src/test/resources/connector_1_5">
-                <exclude name="geronimo-ra.xml"/>
-            </fileset>
-        </copy>
-        <jar destfile="${basedir}/target/test-rar-15-noger.rar" basedir="${basedir}/target/test-rar-15"/>
-
-        <!-- Build test-ear -->
-        <jar destfile="${basedir}/target/test-ear-noger.ear">
-            <fileset dir="${basedir}/target">
-                <include name="test-rar-10-noger.rar"/>
-                <include name="test-rar-15-noger.rar"/>
-            </fileset>
-            <zipfileset dir="${basedir}/src/test/resources/ear" prefix="META-INF">
-                <exclude name="geronimo-application.xml"/>
-            </zipfileset>
-        </jar>
-
-        <!-- Build test-cf-validation -->
-        <mkdir dir="${basedir}/target/test-cf-validation/META-INF"/>
-        <copy todir="${basedir}/target/test-cf-validation/META-INF">
-            <fileset dir="${basedir}/src/test/resources/connection-factory-validation"/>
-        </copy>
-        <jar destfile="${basedir}/target/test-cf-validation.rar" basedir="${basedir}/target/test-cf-validation"/>
-
-        <!-- Build test-ra-validation -->
-        <mkdir dir="${basedir}/target/test-ra-validation/META-INF"/>
-        <copy todir="${basedir}/target/test-ra-validation/META-INF">
-            <fileset dir="${basedir}/src/test/resources/resource-adaptor-validation"/>
-        </copy>
-        <jar destfile="${basedir}/target/test-ra-validation.rar" basedir="${basedir}/target/test-ra-validation"/>
-
-        <!-- Build test-ao-validation -->
-        <mkdir dir="${basedir}/target/test-ao-validation/META-INF"/>
-        <copy todir="${basedir}/target/test-ao-validation/META-INF">
-            <fileset dir="${basedir}/src/test/resources/admin-object-validation"/>
-        </copy>
-        <jar destfile="${basedir}/target/test-ao-validation.rar" basedir="${basedir}/target/test-ao-validation"/>
-
-        <!-- Build test-asb-validation.  Validation using bean validation -->
-        <mkdir dir="${basedir}/target/test-asb-validation/META-INF"/>
-        <copy todir="${basedir}/target/test-asb-validation/META-INF">
-            <fileset dir="${basedir}/src/test/resources/activation-spec-bean-validation"/>
-        </copy>
-        <jar destfile="${basedir}/target/test-asb-validation.rar" basedir="${basedir}/target/test-asb-validation"/>
     </target>
     
 </project>

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/model/ManagedConnectionFactoryInfo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/model/ManagedConnectionFactoryInfo.java?rev=1075183&r1=1075182&r2=1075183&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/model/ManagedConnectionFactoryInfo.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/model/ManagedConnectionFactoryInfo.java Sun Feb 27 23:56:21 2011
@@ -64,4 +64,9 @@ public class ManagedConnectionFactoryInf
     public PoolCardinality poolCardinality;
     public TransactionSupport transactionSupport;
 
+    //external reference filters
+    public String transactionManagerTarget;
+    public String connectionTrackerTarget;
+    public String subjectSourceTarget;
+
 }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/model/ResourceAdapterInfo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/model/ResourceAdapterInfo.java?rev=1075183&r1=1075182&r2=1075183&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/model/ResourceAdapterInfo.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/model/ResourceAdapterInfo.java Sun Feb 27 23:56:21 2011
@@ -37,4 +37,8 @@ public class ResourceAdapterInfo impleme
     public final Map<String, Object> configProperties = new HashMap<String, Object>();
     public final List<ManagedConnectionFactoryInfo> managedConnectionFactoryInfos = new ArrayList<ManagedConnectionFactoryInfo>();
     public final List<AdminObjectInfo> adminObjectInfos = new ArrayList<AdminObjectInfo>();
+
+    //external reference filters
+    public String transactionManagerTarget;
+    public String workManagerTarget;
 }

Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1075183&r1=1075182&r2=1075183&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Sun Feb 27 23:56:21 2011
@@ -174,7 +174,7 @@
             <dependency>
                 <groupId>org.ops4j.pax.swissbox</groupId>
                 <artifactId>pax-swissbox-tinybundles</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.1</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.url</groupId>
@@ -265,6 +265,7 @@
     <modules>
         <module>geronimo-transaction</module>
         <module>geronimo-connector</module>
+        <module>geronimo-connector-builder-1_6</module>
         <module>org.apache.geronimo.transaction</module>
         <module>org.apache.geronimo.transaction.kar</module>
         <module>connector-itests</module>



Mime
View raw message