You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/02/20 19:10:30 UTC

cvs commit: incubator-geronimo/modules/connector/src/test-data/connector_1_5 ra.xml

djencks     2004/02/20 10:10:30

  Modified:    modules/connector/src/java/org/apache/geronimo/connector/deployment
                        RARConfigurer.java
               modules/connector/src/test/org/apache/geronimo/connector/deployment
                        Connector_1_0Test.java Connector_1_5Test.java
               modules/connector/src/test-data/connector_1_0 ra.xml
               modules/connector/src/test-data/connector_1_5 ra.xml
  Added:       modules/connector/src/test/org/apache/geronimo/connector/deployment
                        MockRARDeployable.java
  Log:
  test the dconfigbeans for 1.0 connectors a bit
  
  Revision  Changes    Path
  1.3       +5 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
  
  Index: RARConfigurer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RARConfigurer.java	20 Feb 2004 08:14:12 -0000	1.2
  +++ RARConfigurer.java	20 Feb 2004 18:10:29 -0000	1.3
  @@ -74,11 +74,12 @@
   
       public DeploymentConfiguration createConfiguration(DeployableObject deployable) {
           if (ModuleType.RAR.equals(deployable.getType())) {
  -            if (deployable.getDDBeanRoot().getDDBeanRootVersion().equals("1.0")) {
  -                return new RARConfiguration(deployable, new ResourceAdapter_1_0DConfigRoot(deployable.getDDBeanRoot()));
  -            }
               if (deployable.getDDBeanRoot().getDDBeanRootVersion().equals("1.5")) {
                   return new RARConfiguration(deployable, new ResourceAdapterDConfigRoot(deployable.getDDBeanRoot()));
  +            }
  +            String[] specVersion = deployable.getDDBeanRoot().getText("connector/spec-version");
  +            if (specVersion.length > 0 && "1.0".equals(specVersion[0])) {
  +                return new RARConfiguration(deployable, new ResourceAdapter_1_0DConfigRoot(deployable.getDDBeanRoot()));
               }
               throw new IllegalArgumentException("Unknown resource adapter version: " + deployable.getDDBeanRoot().getDDBeanRootVersion());
           } else {
  
  
  
  1.4       +73 -1     incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/Connector_1_0Test.java
  
  Index: Connector_1_0Test.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/Connector_1_0Test.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Connector_1_0Test.java	8 Feb 2004 20:21:57 -0000	1.3
  +++ Connector_1_0Test.java	20 Feb 2004 18:10:29 -0000	1.4
  @@ -71,13 +71,32 @@
   import java.io.ByteArrayInputStream;
   
   import javax.management.ObjectName;
  +import javax.enterprise.deploy.model.DDBeanRoot;
  +import javax.enterprise.deploy.model.DDBean;
  +import javax.enterprise.deploy.spi.DeploymentConfiguration;
  +import javax.enterprise.deploy.spi.DConfigBeanRoot;
   
   import junit.framework.TestCase;
   import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
  +import org.apache.geronimo.xbeans.geronimo.GerResourceadapterType;
  +import org.apache.geronimo.xbeans.geronimo.GerResourceadapterInstanceType;
  +import org.apache.geronimo.xbeans.geronimo.GerConfigPropertySettingType;
  +import org.apache.geronimo.xbeans.geronimo.GerAdminobjectType;
  +import org.apache.geronimo.xbeans.geronimo.GerAdminobjectInstanceType;
  +import org.apache.geronimo.xbeans.geronimo.GerConnectionDefinitionType;
  +import org.apache.geronimo.xbeans.geronimo.GerConnectiondefinitionInstanceType;
  +import org.apache.geronimo.xbeans.geronimo.GerConnectionmanagerType;
   import org.apache.geronimo.xbeans.j2ee.connector_1_0.ConnectorDocument;
   import org.apache.geronimo.deployment.DeploymentModule;
   import org.apache.geronimo.deployment.ConfigurationCallback;
   import org.apache.geronimo.gbean.jmx.GBeanMBean;
  +import org.apache.geronimo.connector.deployment.dconfigbean.ResourceAdapterDConfigBean;
  +import org.apache.geronimo.connector.deployment.dconfigbean.ConfigPropertySettingDConfigBean;
  +import org.apache.geronimo.connector.deployment.dconfigbean.AdminObjectDConfigBean;
  +import org.apache.geronimo.connector.deployment.dconfigbean.AdminObjectInstance;
  +import org.apache.geronimo.connector.deployment.dconfigbean.ConfigPropertySettings;
  +import org.apache.geronimo.connector.deployment.dconfigbean.ConnectionDefinitionDConfigBean;
  +import org.apache.geronimo.connector.deployment.dconfigbean.ConnectionDefinitionInstance;
   import org.apache.xmlbeans.XmlOptions;
   
   /**
  @@ -110,6 +129,59 @@
           if (!connectorDocument.validate(xmlOptions)) {
               fail(errors.toString());
           }
  +
  +    }
  +
  +    public void testDConfigBeans() throws Exception {
  +        MockRARDeployable deployable = new MockRARDeployable(j2eeDD);
  +        DDBeanRoot ddroot = deployable.getDDBeanRoot();
  +        DeploymentConfiguration rarConfiguration = new RARConfigurer().createConfiguration(deployable);
  +        DConfigBeanRoot root = rarConfiguration.getDConfigBeanRoot(ddroot);
  +        assertNotNull(root);
  +
  +        //outbound
  +        DDBean[] connectionDefinitiondds = ddroot.getChildBean(root.getXpaths()[0]);
  +        assertEquals(1, connectionDefinitiondds.length);
  +        ConnectionDefinitionDConfigBean connectionDefinitionDConfigBean = (ConnectionDefinitionDConfigBean)root.getDConfigBean(connectionDefinitiondds[0]);
  +        assertNotNull(connectionDefinitionDConfigBean);
  +        ConnectionDefinitionInstance connectionDefinitionInstance1 = new ConnectionDefinitionInstance();
  +        connectionDefinitionDConfigBean.setConnectionDefinitionInstance(new ConnectionDefinitionInstance[] {connectionDefinitionInstance1});
  +        DDBean[] connectionDefinitionConfigPropDDs = connectionDefinitiondds[0].getChildBean("config-property");
  +        assertEquals(4, connectionDefinitionConfigPropDDs.length);
  +        ConfigPropertySettings connectionDefinitionSetting1 = connectionDefinitionInstance1.getConfigProperty()[0];
  +        connectionDefinitionSetting1.setConfigPropertyValue("TestCDValue1");
  +        //connection manager properties
  +        connectionDefinitionInstance1.setBlockingTimeout(3000);
  +
  +        //check the results
  +        ByteArrayOutputStream baos = new ByteArrayOutputStream();
  +        rarConfiguration.save(baos);
  +        baos.flush();
  +        byte[] bytes = baos.toByteArray();
  +        baos.close();
  +        InputStream is = new ByteArrayInputStream(bytes);
  +        GerConnectorDocument gcDoc = GerConnectorDocument.Factory.parse(is);
  +        GerResourceadapterType ra = gcDoc.getConnector().getResourceadapter();
  +
  +        //connection definition
  +        GerConnectionDefinitionType connectionDefinitionType = ra.getOutboundResourceadapter().getConnectionDefinitionArray(0);
  +        GerConnectiondefinitionInstanceType connectiondefinitionInstanceType = connectionDefinitionType.getConnectiondefinitionInstanceArray(0);
  +        assertEquals("TestCDValue1", connectiondefinitionInstanceType.getConfigPropertySettingArray(0).getStringValue());
  +        //connection manager
  +        GerConnectionmanagerType connectionmanagerType = connectiondefinitionInstanceType.getConnectionmanager();
  +        assertEquals(3000, connectionmanagerType.getBlockingTimeout().intValue());
  +
  +        //and read back into dconfigbeans
  +        rarConfiguration.restore(new ByteArrayInputStream(bytes));
  +
  +        //outbound
  +        connectionDefinitionDConfigBean = (ConnectionDefinitionDConfigBean)root.getDConfigBean(connectionDefinitiondds[0]);
  +        assertNotNull(connectionDefinitionDConfigBean);
  +        ConnectionDefinitionInstance[] connectionDefinitionInstances = connectionDefinitionDConfigBean.getConnectionDefinitionInstance();
  +        connectionDefinitionSetting1 = connectionDefinitionInstances[0].getConfigProperty()[0];
  +        assertEquals("TestCDValue1", connectionDefinitionSetting1.getConfigPropertyValue());
  +        //connection manager
  +        assertEquals(3000, connectionDefinitionInstances[0].getBlockingTimeout());
   
       }
   
  
  
  
  1.11      +3 -55     incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/Connector_1_5Test.java
  
  Index: Connector_1_5Test.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/Connector_1_5Test.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Connector_1_5Test.java	20 Feb 2004 08:14:12 -0000	1.10
  +++ Connector_1_5Test.java	20 Feb 2004 18:10:29 -0000	1.11
  @@ -59,13 +59,11 @@
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
   import java.io.File;
  -import java.io.FileNotFoundException;
   import java.io.IOException;
   import java.io.InputStream;
   import java.net.URI;
   import java.net.URL;
   import java.util.ArrayList;
  -import java.util.Enumeration;
   import java.util.HashMap;
   import java.util.List;
   import java.util.Map;
  @@ -74,9 +72,6 @@
   
   import javax.enterprise.deploy.model.DDBean;
   import javax.enterprise.deploy.model.DDBeanRoot;
  -import javax.enterprise.deploy.model.DeployableObject;
  -import javax.enterprise.deploy.model.exceptions.DDBeanCreateException;
  -import javax.enterprise.deploy.shared.ModuleType;
   import javax.enterprise.deploy.spi.DConfigBeanRoot;
   import javax.enterprise.deploy.spi.DeploymentConfiguration;
   import javax.management.ObjectName;
  @@ -91,7 +86,6 @@
   import org.apache.geronimo.connector.deployment.dconfigbean.ResourceAdapterDConfigBean;
   import org.apache.geronimo.deployment.ConfigurationCallback;
   import org.apache.geronimo.deployment.DeploymentModule;
  -import org.apache.geronimo.deployment.tools.DDBeanRootImpl;
   import org.apache.geronimo.gbean.jmx.GBeanMBean;
   import org.apache.geronimo.xbeans.geronimo.GerAdminobjectInstanceType;
   import org.apache.geronimo.xbeans.geronimo.GerAdminobjectType;
  @@ -100,8 +94,8 @@
   import org.apache.geronimo.xbeans.geronimo.GerConnectiondefinitionInstanceType;
   import org.apache.geronimo.xbeans.geronimo.GerConnectionmanagerType;
   import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
  -import org.apache.geronimo.xbeans.geronimo.GerResourceadapterType;
   import org.apache.geronimo.xbeans.geronimo.GerResourceadapterInstanceType;
  +import org.apache.geronimo.xbeans.geronimo.GerResourceadapterType;
   import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
   import org.apache.xmlbeans.XmlOptions;
   
  @@ -138,14 +132,13 @@
       }
   
       public void testDConfigBeans() throws Exception {
  -        RARDeployable deployable = new RARDeployable(j2eeDD);
  +        MockRARDeployable deployable = new MockRARDeployable(j2eeDD);
           DDBeanRoot ddroot = deployable.getDDBeanRoot();
           DeploymentConfiguration rarConfiguration = new RARConfigurer().createConfiguration(deployable);
           DConfigBeanRoot root = rarConfiguration.getDConfigBeanRoot(ddroot);
           assertNotNull(root);
   
           //resource adapter
  -        String path = root.getXpaths()[0];
           DDBean resourceAdapterdd = ddroot.getChildBean(root.getXpaths()[0])[0];
           ResourceAdapterDConfigBean resourceAdapterDConfigBean = (ResourceAdapterDConfigBean) root.getDConfigBean(resourceAdapterdd);
           assertNotNull(resourceAdapterDConfigBean);
  @@ -300,49 +293,4 @@
           gbeans.put(name, gbean);
       }
   
  -    private class RARDeployable implements DeployableObject {
  -
  -        private DDBeanRoot root;
  -
  -        public RARDeployable(URL dd) throws DDBeanCreateException {
  -            root =  new DDBeanRootImpl(this, dd);
  -        }
  -
  -        public ModuleType getType() {
  -            return ModuleType.RAR;
  -        }
  -
  -        public DDBeanRoot getDDBeanRoot() {
  -            return root;
  -        }
  -
  -        public DDBean[] getChildBean(String xpath) {
  -            return root.getChildBean(xpath);
  -        }
  -
  -        public String[] getText(String xpath) {
  -            return root.getText(xpath);
  -        }
  -
  -        public Class getClassFromScope(String className) {
  -            return null;
  -        }
  -
  -        public String getModuleDTDVersion() {
  -            return null;
  -        }
  -
  -        public DDBeanRoot getDDBeanRoot(String filename) throws FileNotFoundException, DDBeanCreateException {
  -            return null;
  -        }
  -
  -        public Enumeration entries() {
  -            return null;
  -        }
  -
  -        public InputStream getEntry(String name) {
  -            return null;
  -        }
  -
  -    }
   }
  
  
  
  1.1                  incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/MockRARDeployable.java
  
  Index: MockRARDeployable.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *    "Apache Geronimo" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    "Apache Geronimo", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * ====================================================================
   */
  
  package org.apache.geronimo.connector.deployment;
  
  import java.net.URL;
  import java.io.FileNotFoundException;
  import java.io.InputStream;
  import java.util.Enumeration;
  
  import javax.enterprise.deploy.model.DeployableObject;
  import javax.enterprise.deploy.model.DDBeanRoot;
  import javax.enterprise.deploy.model.DDBean;
  import javax.enterprise.deploy.model.exceptions.DDBeanCreateException;
  import javax.enterprise.deploy.shared.ModuleType;
  
  import org.apache.geronimo.deployment.tools.DDBeanRootImpl;
  
  /**
   *
   *
   * @version $Revision: 1.1 $ $Date: 2004/02/20 18:10:29 $
   *
   * */
  public class MockRARDeployable implements DeployableObject {
  
          private DDBeanRoot root;
  
          public MockRARDeployable(URL dd) throws DDBeanCreateException {
              root =  new DDBeanRootImpl(this, dd);
          }
  
          public ModuleType getType() {
              return ModuleType.RAR;
          }
  
          public DDBeanRoot getDDBeanRoot() {
              return root;
          }
  
          public DDBean[] getChildBean(String xpath) {
              return root.getChildBean(xpath);
          }
  
          public String[] getText(String xpath) {
              return root.getText(xpath);
          }
  
          public Class getClassFromScope(String className) {
              return null;
          }
  
          public String getModuleDTDVersion() {
              return null;
          }
  
          public DDBeanRoot getDDBeanRoot(String filename) throws FileNotFoundException, DDBeanCreateException {
              return null;
          }
  
          public Enumeration entries() {
              return null;
          }
  
          public InputStream getEntry(String name) {
              return null;
          }
  }
  
  
  
  1.3       +14 -0     incubator-geronimo/modules/connector/src/test-data/connector_1_0/ra.xml
  
  Index: ra.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_0/ra.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ra.xml	20 Feb 2004 08:14:12 -0000	1.2
  +++ ra.xml	20 Feb 2004 18:10:29 -0000	1.3
  @@ -20,6 +20,20 @@
           <config-property>
               <config-property-name>OutboundStringProperty1</config-property-name>
               <config-property-type>java.lang.String</config-property-type>
  +            <config-property-value>originalvalue1</config-property-value>
  +        </config-property>
  +        <config-property>
  +            <config-property-name>OutboundStringProperty2</config-property-name>
  +            <config-property-type>java.lang.String</config-property-type>
  +            <config-property-value>originalvalue2</config-property-value>
  +        </config-property>
  +        <config-property>
  +            <config-property-name>OutboundStringProperty3</config-property-name>
  +            <config-property-type>java.lang.String</config-property-type>
  +        </config-property>
  +        <config-property>
  +            <config-property-name>OutboundStringProperty4</config-property-name>
  +            <config-property-type>java.lang.String</config-property-type>
           </config-property>
   
           <authentication-mechanism>
  
  
  
  1.2       +89 -89    incubator-geronimo/modules/connector/src/test-data/connector_1_5/ra.xml
  
  Index: ra.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/ra.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ra.xml	2 Feb 2004 22:10:35 -0000	1.1
  +++ ra.xml	20 Feb 2004 18:10:30 -0000	1.2
  @@ -1,95 +1,95 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <connector xmlns="http://java.sun.com/xml/ns/j2ee"
  -  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  -  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
  -     http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
  -  version="1.5">
  -
  -  <description>test ra.xml for jca 1.5</description>
  -  <display-name>test 1.5 adapter spec</display-name>
  -
  -  <vendor-name>apache-geronimo</vendor-name>
  -  <eis-type>test</eis-type>
  -  <resourceadapter-version>0.0</resourceadapter-version>
  -  <resourceadapter>
  -    <resourceadapter-class>org.apache.geronimo.connector.mock.MockResourceAdapter</resourceadapter-class>
  -    <config-property>
  -      <config-property-name>RAStringProperty</config-property-name>
  -      <config-property-type>java.lang.String</config-property-type>
  -      <config-property-value>StringValue</config-property-value>
  -    </config-property>
  -    <outbound-resourceadapter>
  -      <connection-definition>
  -        <managedconnectionfactory-class>org.apache.geronimo.connector.mock.MockManagedConnectionFactory</managedconnectionfactory-class>
  +    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
  +       http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
  +    version="1.5">
  +
  +    <description>test ra.xml for jca 1.5</description>
  +    <display-name>test 1.5 adapter spec</display-name>
  +
  +    <vendor-name>apache-geronimo</vendor-name>
  +    <eis-type>test</eis-type>
  +    <resourceadapter-version>0.0</resourceadapter-version>
  +    <resourceadapter>
  +        <resourceadapter-class>org.apache.geronimo.connector.mock.MockResourceAdapter</resourceadapter-class>
           <config-property>
  -          <config-property-name>OutboundStringProperty1</config-property-name>
  -          <config-property-type>java.lang.String</config-property-type>
  -          <config-property-value>originalvalue1</config-property-value>
  -        </config-property>
  -          <config-property>
  -            <config-property-name>OutboundStringProperty2</config-property-name>
  -            <config-property-type>java.lang.String</config-property-type>
  -            <config-property-value>originalvalue2</config-property-value>
  -          </config-property>
  -          <config-property>
  -            <config-property-name>OutboundStringProperty3</config-property-name>
  -            <config-property-type>java.lang.String</config-property-type>
  -          </config-property>
  -          <config-property>
  -            <config-property-name>OutboundStringProperty4</config-property-name>
  +            <config-property-name>RAStringProperty</config-property-name>
               <config-property-type>java.lang.String</config-property-type>
  -          </config-property>
  -
  -        <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
  -        <connectionfactory-impl-class>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-impl-class>
  -        <connection-interface>javax.resource.cci.Connection</connection-interface>
  -        <connection-impl-class>org.apache.geronimo.connector.mock.MockConnection</connection-impl-class>
  -
  -      </connection-definition>
  -      <connection-definition>
  -        <managedconnectionfactory-class>org.apache.geronimo.connector.mock.MockManagedConnectionFactory</managedconnectionfactory-class>
  -        <config-property>
  -          <config-property-name>OutboundStringProperty</config-property-name>
  -          <config-property-type>java.lang.String</config-property-type>
  +            <config-property-value>StringValue</config-property-value>
           </config-property>
  -        <connectionfactory-interface>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-interface>
  -        <connectionfactory-impl-class>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-impl-class>
  -        <connection-interface>javax.resource.cci.Connection</connection-interface>
  -        <connection-impl-class>org.apache.geronimo.connector.mock.MockConnection</connection-impl-class>
  -
  -      </connection-definition>
  -      <transaction-support>LocalTransaction</transaction-support>
  -      <authentication-mechanism>
  -        <description>description</description>
  -        <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
  -        <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
  -      </authentication-mechanism>
  -      <reauthentication-support>false</reauthentication-support>
  -    </outbound-resourceadapter>
  -    <inbound-resourceadapter>
  -      <!--0 or one-->
  -      <messageadapter>
  -        <!--one or more-->
  -        <messagelistener>
  -          <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
  -          <activationspec>
  -            <activationspec-class>org.apache.geronimo.connector.mock.MockActivationSpec</activationspec-class>
  -            <required-config-property>
  -               <config-property-name>RequiredProperty</config-property-name>
  -            </required-config-property>
  -          </activationspec>
  -        </messagelistener>
  -      </messageadapter>
  -
  -    </inbound-resourceadapter>
  -    <adminobject>
  -      <adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
  -      <adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
  -      <config-property>
  -        <config-property-name>Tweedle</config-property-name>
  -        <config-property-type>java.lang.String</config-property-type>
  -        <config-property-value>Tweedle-value</config-property-value>
  -      </config-property>
  -    </adminobject>
  -  </resourceadapter>
  +        <outbound-resourceadapter>
  +            <connection-definition>
  +                <managedconnectionfactory-class>org.apache.geronimo.connector.mock.MockManagedConnectionFactory</managedconnectionfactory-class>
  +                <config-property>
  +                    <config-property-name>OutboundStringProperty1</config-property-name>
  +                    <config-property-type>java.lang.String</config-property-type>
  +                    <config-property-value>originalvalue1</config-property-value>
  +                </config-property>
  +                <config-property>
  +                    <config-property-name>OutboundStringProperty2</config-property-name>
  +                    <config-property-type>java.lang.String</config-property-type>
  +                    <config-property-value>originalvalue2</config-property-value>
  +                </config-property>
  +                <config-property>
  +                    <config-property-name>OutboundStringProperty3</config-property-name>
  +                    <config-property-type>java.lang.String</config-property-type>
  +                </config-property>
  +                <config-property>
  +                    <config-property-name>OutboundStringProperty4</config-property-name>
  +                    <config-property-type>java.lang.String</config-property-type>
  +                </config-property>
  +
  +                <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
  +                <connectionfactory-impl-class>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-impl-class>
  +                <connection-interface>javax.resource.cci.Connection</connection-interface>
  +                <connection-impl-class>org.apache.geronimo.connector.mock.MockConnection</connection-impl-class>
  +
  +            </connection-definition>
  +            <connection-definition>
  +                <managedconnectionfactory-class>org.apache.geronimo.connector.mock.MockManagedConnectionFactory</managedconnectionfactory-class>
  +                <config-property>
  +                    <config-property-name>OutboundStringProperty</config-property-name>
  +                    <config-property-type>java.lang.String</config-property-type>
  +                </config-property>
  +                <connectionfactory-interface>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-interface>
  +                <connectionfactory-impl-class>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-impl-class>
  +                <connection-interface>javax.resource.cci.Connection</connection-interface>
  +                <connection-impl-class>org.apache.geronimo.connector.mock.MockConnection</connection-impl-class>
  +
  +            </connection-definition>
  +            <transaction-support>LocalTransaction</transaction-support>
  +            <authentication-mechanism>
  +                <description>description</description>
  +                <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
  +                <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
  +            </authentication-mechanism>
  +            <reauthentication-support>false</reauthentication-support>
  +        </outbound-resourceadapter>
  +        <inbound-resourceadapter>
  +            <!--0 or one-->
  +            <messageadapter>
  +                <!--one or more-->
  +                <messagelistener>
  +                    <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
  +                    <activationspec>
  +                        <activationspec-class>org.apache.geronimo.connector.mock.MockActivationSpec</activationspec-class>
  +                        <required-config-property>
  +                            <config-property-name>RequiredProperty</config-property-name>
  +                        </required-config-property>
  +                    </activationspec>
  +                </messagelistener>
  +            </messageadapter>
  +
  +        </inbound-resourceadapter>
  +        <adminobject>
  +            <adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
  +            <adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
  +            <config-property>
  +                <config-property-name>Tweedle</config-property-name>
  +                <config-property-type>java.lang.String</config-property-type>
  +                <config-property-value>Tweedle-value</config-property-value>
  +            </config-property>
  +        </adminobject>
  +    </resourceadapter>
   </connector>