geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r1021460 - in /geronimo/server/trunk/plugins/connector-1_6: geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ geronimo-connecto...
Date Mon, 11 Oct 2010 18:52:24 GMT
Author: rickmcguire
Date: Mon Oct 11 18:52:24 2010
New Revision: 1021460

URL: http://svn.apache.org/viewvc?rev=1021460&view=rev
Log:
GERONIMO-5230 Add Bean Validation Support to the connector 1.6 implementation. 

Some unit tests for the builder support. 


Added:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/geronimo-ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/geronimo-ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/geronimo-ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/geronimo-ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/ra.xml   (with props)
Modified:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockActivationSpec.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java?rev=1021460&r1=1021459&r2=1021460&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java Mon Oct 11 18:52:24 2010
@@ -22,6 +22,7 @@ import org.apache.geronimo.connector.Act
 import org.apache.geronimo.connector.ResourceAdapterWrapper;
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.DynamicGBeanDelegate;
+import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=1021460&r1=1021459&r2=1021460&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Mon Oct 11 18:52:24 2010
@@ -31,6 +31,7 @@ import java.util.jar.JarFile;
 
 import javax.naming.Reference;
 import javax.sql.DataSource;
+
 import org.apache.geronimo.bval.ValidatorFactoryGBean;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
@@ -60,6 +61,7 @@ import org.apache.geronimo.kernel.config
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.KernelConfigurationManager;
+import org.apache.geronimo.kernel.config.LifecycleException;
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.mock.MockConfigStore;
 import org.apache.geronimo.kernel.mock.MockRepository;
@@ -187,6 +189,68 @@ public class ConnectorModuleBuilderTest 
         executeTestBuildModule(action, false);
     }
 
+    public void testConnectionFactoryValidation() throws Exception {
+        InstallAction action = new InstallAction() {
+            public File getRARFile() {
+                return new File(BASEDIR, "target/test-cf-validation");
+            }
+        };
+        try {
+            executeTestBuildModule(action, true);
+            fail("ConstraintViolation not thrown");
+        } catch (org.apache.geronimo.kernel.config.LifecycleException e) {
+            // we'll get a deployment failure.  The root reason will be a ValidationException, 
+            // but for now, that's difficult to root out and locate. 
+        }
+    }
+
+    public void testResourceAdaptorValidation() throws Exception {
+        InstallAction action = new InstallAction() {
+            public File getRARFile() {
+                return new File(BASEDIR, "target/test-ra-validation");
+            }
+        };
+        try {
+            executeTestBuildModule(action, true);
+            fail("ConstraintViolation not thrown");
+        } catch (org.apache.geronimo.kernel.config.LifecycleException e) {
+            // we'll get a deployment failure.  The root reason will be a ValidationException, 
+            // but for now, that's difficult to root out and locate. 
+        }
+    }
+
+    public void testAdminObjectValidation() throws Exception {
+        InstallAction action = new InstallAction() {
+            public File getRARFile() {
+                return new File(BASEDIR, "target/test-ao-validation");
+            }
+        };
+        try {
+            executeTestBuildModule(action, true);
+            fail("ConstraintViolation not thrown");
+        } catch (org.apache.geronimo.kernel.config.LifecycleException e) {
+            // we'll get a deployment failure.  The root reason will be a ValidationException, 
+            // but for now, that's difficult to root out and locate. 
+        }
+    }
+
+/* TODO:  figure out what the lifecycle is here so this can be processed     
+    public void testActivationSpecBeanValidation() throws Exception {
+        InstallAction action = new InstallAction() {
+            public File getRARFile() {
+                return new File(BASEDIR, "target/test-asb-validation");
+            }
+        };
+        try {
+            executeTestBuildModule(action, true);
+            fail("ConstraintViolation not thrown");
+        } catch (org.apache.geronimo.kernel.config.LifecycleException e) {
+            // we'll get a deployment failure.  The root reason will be a ValidationException, 
+            // but for now, that's difficult to root out and locate. 
+        }
+    }
+ */ 
+
     public void testBuildUnpackedAltSpecDDModule() throws Exception {
         InstallAction action = new InstallAction() {
             public File getVendorDD() {
@@ -433,7 +497,7 @@ public class ConnectorModuleBuilderTest 
                 assertNotNull(activationSpecInfo);
                 GBeanInfo activationSpecGBeanInfo = activationSpecInfo.getGBeanInfo();
                 List attributes1 = activationSpecGBeanInfo.getPersistentAttributes();
-                assertEquals(2, attributes1.size());
+                assertEquals(3, attributes1.size());
 
                 Map adminObjectInfoMap = (Map) kernel.getAttribute(moduleAbstractName, "adminObjectInfoMap");
                 assertEquals(1, adminObjectInfoMap.size());

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockActivationSpec.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockActivationSpec.java?rev=1021460&r1=1021459&r2=1021460&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockActivationSpec.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockActivationSpec.java Mon Oct 11 18:52:24 2010
@@ -22,6 +22,8 @@ import javax.resource.spi.InvalidPropert
 import javax.resource.spi.ResourceAdapter;
 import javax.resource.ResourceException;
 
+import javax.validation.constraints.Pattern;
+
 /**
  *
  *
@@ -29,7 +31,21 @@ import javax.resource.ResourceException;
  *
  * */
 public class MockActivationSpec implements ActivationSpec {
+    private String asStringProperty;
+
+    @Pattern(regexp="[\\w]+" )
+    public String getASStringProperty() {
+        return asStringProperty;
+    }
+
+    public void setASStringProperty(String asStringProperty) {
+        this.asStringProperty = asStringProperty;
+    }
+    
     public void validate() throws InvalidPropertyException {
+        if ("FAIL".equals(asStringProperty)) {
+            throw new InvalidPropertyException("FAIL"); 
+        }
     }
 
     public ResourceAdapter getResourceAdapter() {

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java?rev=1021460&r1=1021459&r2=1021460&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java Mon Oct 11 18:52:24 2010
@@ -17,6 +17,8 @@
 
 package org.apache.geronimo.connector.mock;
 
+import javax.validation.constraints.Pattern;
+
 /**
  *
  *
@@ -27,6 +29,9 @@ public class MockAdminObjectImpl impleme
 
     private String tweedle;
 
+    // add a simple validation pattern to these fields to allow validation tests.  This 
+    // pattern will allow any word characters as a value, but not the null string. 
+    @Pattern(regexp="[\\w-]+" )
     public String getTweedle() {
         return tweedle;
     }

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java?rev=1021460&r1=1021459&r2=1021460&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java Mon Oct 11 18:52:24 2010
@@ -30,6 +30,7 @@ import javax.resource.spi.ManagedConnect
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.resource.spi.ResourceAdapter;
 import javax.security.auth.Subject;
+import javax.validation.constraints.Pattern;
 
 /**
  *
@@ -78,9 +79,15 @@ public class MockManagedConnectionFactor
         this.outboundStringProperty4 = outboundStringProperty4;
     }
 
+    // add a simple validation pattern to these fields to allow validation tests.  This 
+    // pattern will allow any word characters as a value, but not the null string. 
+    @Pattern(regexp="[\\w]+" )
     private String outboundStringProperty1;
+    @Pattern(regexp="[\\w]+" )
     private String outboundStringProperty2;
+    @Pattern(regexp="[\\w]+" )
     private String outboundStringProperty3;
+    @Pattern(regexp="[\\w]+" )
     private String outboundStringProperty4;
 
     public void setResourceAdapter(ResourceAdapter resourceAdapter) throws ResourceException {

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java?rev=1021460&r1=1021459&r2=1021460&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java Mon Oct 11 18:52:24 2010
@@ -24,6 +24,7 @@ import javax.resource.spi.ResourceAdapte
 import javax.resource.spi.ResourceAdapterInternalException;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
 import javax.transaction.xa.XAResource;
+import javax.validation.constraints.Pattern;
 
 /**
  *
@@ -58,6 +59,7 @@ public class MockResourceAdapter impleme
         return new XAResource[0];
     }
 
+    @Pattern(regexp="[\\w]+" )
     public String getRAStringProperty() {
         return raStringProperty;
     }

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/geronimo-ra.xml?rev=1021460&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/geronimo-ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/geronimo-ra.xml Mon Oct 11 18:52:24 2010
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>geronimo</groupId>
+            <artifactId>test-ear</artifactId>
+            <version>1.0</version>
+            <type>car</type>
+        </moduleId>
+    </environment>
+
+    <resourceadapter>
+        <resourceadapter-instance>
+            <resourceadapter-name>testRA</resourceadapter-name>
+            <config-property-setting name="RAStringProperty">NewStringValue</config-property-setting>
+            <workmanager>
+                <gbean-link>DefaultWorkManager</gbean-link>
+            </workmanager>
+        </resourceadapter-instance>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>FirstTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty1">newvalue1</config-property-setting>
+                    <config-property-setting name="OutboundStringProperty3">newvalue2</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>SecondTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty4">newvalue3</config-property-setting>
+                    <config-property-setting name="OutboundStringProperty1">newvalue4</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+            <connection-definition>
+                <connectionfactory-interface>
+                    org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>ThirdTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty1">StringValue3</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+    <adminobject>
+        <adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
+        <adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>tweedledee</message-destination-name>
+            <config-property-setting name="Tweedle">Dee-value</config-property-setting>
+        </adminobject-instance>
+        <adminobject-instance>
+            <message-destination-name>tweedledum</message-destination-name>
+            <config-property-setting name="Tweedle">Dum-value</config-property-setting>
+        </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>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/ra.xml?rev=1021460&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/ra.xml Mon Oct 11 18:52:24 2010
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+       http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
+    version="1.6">
+
+    <description>test ra.xml for jca 1.6</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>
+                <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>OutboundStringProperty1</config-property-name>
+                    <config-property-type>java.lang.String</config-property-type>
+                </config-property>
+                <connectionfactory-interface>org.apache.geronimo.connector.mock.ConnectionFactoryExtension</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>XATransaction</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>
+                        <config-property>
+                            <config-property-name>asStringProperty</config-property-name>
+                            <config-property-type>java.lang.String</config-property-type>
+                            <config-property-value>*newValue</config-property-value>
+                        </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>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/ra.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/activation-spec-bean-validation/ra.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/geronimo-ra.xml?rev=1021460&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/geronimo-ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/geronimo-ra.xml Mon Oct 11 18:52:24 2010
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>geronimo</groupId>
+            <artifactId>test-ear</artifactId>
+            <version>1.0</version>
+            <type>car</type>
+        </moduleId>
+    </environment>
+
+    <resourceadapter>
+        <resourceadapter-instance>
+            <resourceadapter-name>testRA</resourceadapter-name>
+            <config-property-setting name="RAStringProperty">NewStringValue</config-property-setting>
+            <workmanager>
+                <gbean-link>DefaultWorkManager</gbean-link>
+            </workmanager>
+        </resourceadapter-instance>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>FirstTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty1">newvalue1</config-property-setting>
+                    <config-property-setting name="OutboundStringProperty3">newvalue2</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>SecondTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty4">newvalue3</config-property-setting>
+                    <config-property-setting name="OutboundStringProperty1">newvalue4</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+            <connection-definition>
+                <connectionfactory-interface>
+                    org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>ThirdTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty1">StringValue3</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+    <adminobject>
+        <adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
+        <adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>tweedledee</message-destination-name>
+            <config-property-setting name="Tweedle">Dee*value</config-property-setting>
+        </adminobject-instance>
+        <adminobject-instance>
+            <message-destination-name>tweedledum</message-destination-name>
+            <config-property-setting name="Tweedle">Dum-value</config-property-setting>
+        </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>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/ra.xml?rev=1021460&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/ra.xml Mon Oct 11 18:52:24 2010
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+       http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
+    version="1.6">
+
+    <description>test ra.xml for jca 1.6</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>
+                <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>OutboundStringProperty1</config-property-name>
+                    <config-property-type>java.lang.String</config-property-type>
+                </config-property>
+                <connectionfactory-interface>org.apache.geronimo.connector.mock.ConnectionFactoryExtension</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>XATransaction</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>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/ra.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/admin-object-validation/ra.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/geronimo-ra.xml?rev=1021460&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/geronimo-ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/geronimo-ra.xml Mon Oct 11 18:52:24 2010
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>geronimo</groupId>
+            <artifactId>test-ear</artifactId>
+            <version>1.0</version>
+            <type>car</type>
+        </moduleId>
+    </environment>
+
+    <resourceadapter>
+        <resourceadapter-instance>
+            <resourceadapter-name>testRA</resourceadapter-name>
+            <config-property-setting name="RAStringProperty">NewStringValue</config-property-setting>
+            <workmanager>
+                <gbean-link>DefaultWorkManager</gbean-link>
+            </workmanager>
+        </resourceadapter-instance>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>FirstTestOutboundConnectionFactory</name>
+                    <!-- the * in the value will cause a validation failure --> 
+                    <config-property-setting name="OutboundStringProperty1">*newvalue1</config-property-setting>
+                    <config-property-setting name="OutboundStringProperty3">newvalue2</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+    <adminobject>
+        <adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
+        <adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>tweedledee</message-destination-name>
+            <config-property-setting name="Tweedle">Dee-value</config-property-setting>
+        </adminobject-instance>
+        <adminobject-instance>
+            <message-destination-name>tweedledum</message-destination-name>
+            <config-property-setting name="Tweedle">Dum-value</config-property-setting>
+        </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>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/ra.xml?rev=1021460&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/ra.xml Mon Oct 11 18:52:24 2010
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+       http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
+    version="1.6">
+
+    <description>test ra.xml for jca 1.6</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>
+                <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>OutboundStringProperty1</config-property-name>
+                    <config-property-type>java.lang.String</config-property-type>
+                </config-property>
+                <connectionfactory-interface>org.apache.geronimo.connector.mock.ConnectionFactoryExtension</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>XATransaction</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>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/ra.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connection-factory-validation/ra.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/geronimo-ra.xml?rev=1021460&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/geronimo-ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/geronimo-ra.xml Mon Oct 11 18:52:24 2010
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>geronimo</groupId>
+            <artifactId>test-ear</artifactId>
+            <version>1.0</version>
+            <type>car</type>
+        </moduleId>
+    </environment>
+
+    <resourceadapter>
+        <resourceadapter-instance>
+            <resourceadapter-name>testRA</resourceadapter-name>
+            <config-property-setting name="RAStringProperty">*NewStringValue</config-property-setting>
+            <workmanager>
+                <gbean-link>DefaultWorkManager</gbean-link>
+            </workmanager>
+        </resourceadapter-instance>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>FirstTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty1">newvalue1</config-property-setting>
+                    <config-property-setting name="OutboundStringProperty3">newvalue2</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>SecondTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty4">newvalue3</config-property-setting>
+                    <config-property-setting name="OutboundStringProperty1">newvalue4</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+            <connection-definition>
+                <connectionfactory-interface>
+                    org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>ThirdTestOutboundConnectionFactory</name>
+                    <config-property-setting name="OutboundStringProperty1">StringValue3</config-property-setting>
+                    <connectionmanager>
+                        <container-managed-security/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <partitioned-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                            <partition-by-subject/>
+                        </partitioned-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+    <adminobject>
+        <adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
+        <adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>tweedledee</message-destination-name>
+            <config-property-setting name="Tweedle">Dee-value</config-property-setting>
+        </adminobject-instance>
+        <adminobject-instance>
+            <message-destination-name>tweedledum</message-destination-name>
+            <config-property-setting name="Tweedle">Dum-value</config-property-setting>
+        </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>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/geronimo-ra.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/ra.xml?rev=1021460&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/ra.xml Mon Oct 11 18:52:24 2010
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+       http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
+    version="1.6">
+
+    <description>test ra.xml for jca 1.6</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>
+                <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>OutboundStringProperty1</config-property-name>
+                    <config-property-type>java.lang.String</config-property-type>
+                </config-property>
+                <connectionfactory-interface>org.apache.geronimo.connector.mock.ConnectionFactoryExtension</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>XATransaction</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>

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/ra.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/resource-adaptor-validation/ra.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml?rev=1021460&r1=1021459&r2=1021460&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml Mon Oct 11 18:52:24 2010
@@ -97,6 +97,34 @@
                 <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>



Mime
View raw message