[jboss-cvs] JBossAS SVN: r109642 - in projects/jboss-jca/trunk/common/src/test: resources/merger and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 2 01:11:58 EST 2010
Author: maeste
Date: 2010-12-02 01:11:57 -0500 (Thu, 02 Dec 2010)
New Revision: 109642
Added:
projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/
projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/ra-xa.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/ra.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ds/
projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-xa-ds.xml
Modified:
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java
Log:
removing multiple test resources dependency
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java 2010-12-02 04:08:01 UTC (rev 109641)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java 2010-12-02 06:11:57 UTC (rev 109642)
@@ -74,13 +74,13 @@
try
{
//given
- File xmlFile = new File(Thread.currentThread().getContextClassLoader().getResource("adapters/ra.xml")
+ File xmlFile = new File(Thread.currentThread().getContextClassLoader().getResource("merger/adapters/ra.xml")
.toURI());
is = new FileInputStream(xmlFile);
RaParser parser = new RaParser();
Connector connector = parser.parse(is);
is.close();
- xmlFile = new File(Thread.currentThread().getContextClassLoader().getResource("ds/postgres-ds.xml")
+ xmlFile = new File(Thread.currentThread().getContextClassLoader().getResource("merger/ds/postgres-ds.xml")
.toURI());
is = new FileInputStream(xmlFile);
DsParser dsparser = new DsParser();
@@ -177,14 +177,14 @@
try
{
//given
- File xmlFile = new File(Thread.currentThread().getContextClassLoader().getResource("adapters/ra-xa.xml")
- .toURI());
+ File xmlFile = new File(Thread.currentThread().getContextClassLoader()
+ .getResource("merger/adapters/ra-xa.xml").toURI());
is = new FileInputStream(xmlFile);
RaParser parser = new RaParser();
Connector connector = parser.parse(is);
is.close();
- xmlFile = new File(Thread.currentThread().getContextClassLoader().getResource("ds/postgres-xa-ds.xml")
- .toURI());
+ xmlFile = new File(Thread.currentThread().getContextClassLoader()
+ .getResource("merger/ds/postgres-xa-ds.xml").toURI());
is = new FileInputStream(xmlFile);
DsParser dsparser = new DsParser();
//when
@@ -229,11 +229,11 @@
//then merged properties are presents
- assertThat((List<ConfigProperty>) mergedProperties,
+ assertThat(
+ (List<ConfigProperty>) mergedProperties,
hasItem(Merger.ConfigPropertyFactory.createConfigProperty(
Merger.ConfigPropertyFactory.Prototype.XADATASOURCEPROPERTIES,
- "DatabaseName=database_name;User=user;ServerName=server_name;PortNumber=5432;"
- + "Password=password;")));
+ "DatabaseName=database_name;User=user;ServerName=server_name;PortNumber=5432;" + "Password=password;")));
assertThat((List<ConfigProperty>) mergedProperties,
hasItem(Merger.ConfigPropertyFactory.createConfigProperty(
@@ -646,9 +646,8 @@
is(((ResourceAdapter1516) connector.getResourceadapter()).getOutboundResourceadapter()));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getOutboundResourceadapter()
.getConnectionDefinitions().size(), is(1));
- List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged
- .getResourceadapter()).getOutboundResourceadapter().getConnectionDefinitions().get(0)
- .getConfigProperties();
+ List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter())
+ .getOutboundResourceadapter().getConnectionDefinitions().get(0).getConfigProperties();
assertThat(conDefProps.size(), is(5));
assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3, exConf4, exConf5));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getInboundResourceadapter(),
@@ -721,9 +720,8 @@
is(((ResourceAdapter1516) connector.getResourceadapter()).getOutboundResourceadapter()));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getOutboundResourceadapter()
.getConnectionDefinitions().size(), is(1));
- List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged
- .getResourceadapter()).getOutboundResourceadapter().getConnectionDefinitions().get(0)
- .getConfigProperties();
+ List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter())
+ .getOutboundResourceadapter().getConnectionDefinitions().get(0).getConfigProperties();
assertThat(conDefProps.size(), is(5));
assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3, exConf4, exConf5));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getInboundResourceadapter(),
@@ -790,9 +788,8 @@
is(((ResourceAdapter1516) connector.getResourceadapter()).getOutboundResourceadapter()));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getOutboundResourceadapter()
.getConnectionDefinitions().size(), is(1));
- List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged
- .getResourceadapter()).getOutboundResourceadapter().getConnectionDefinitions().get(0)
- .getConfigProperties();
+ List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter())
+ .getOutboundResourceadapter().getConnectionDefinitions().get(0).getConfigProperties();
assertThat(conDefProps.size(), is(3));
assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getInboundResourceadapter(),
@@ -859,9 +856,8 @@
is(((ResourceAdapter1516) connector.getResourceadapter()).getOutboundResourceadapter()));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getOutboundResourceadapter()
.getConnectionDefinitions().size(), is(1));
- List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged
- .getResourceadapter()).getOutboundResourceadapter().getConnectionDefinitions().get(0)
- .getConfigProperties();
+ List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter())
+ .getOutboundResourceadapter().getConnectionDefinitions().get(0).getConfigProperties();
assertThat(conDefProps.size(), is(3));
assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getInboundResourceadapter(),
@@ -915,8 +911,9 @@
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().size(), is(1));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().get(0)
.getConfigProperties().size(), is(1));
- assertThat((List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects()
- .get(0).getConfigProperties(), hasItem(expectedConfigProp));
+ assertThat(
+ (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().get(0)
+ .getConfigProperties(), hasItem(expectedConfigProp));
}
finally
{
@@ -969,8 +966,9 @@
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().size(), is(1));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().get(0)
.getConfigProperties().size(), is(2));
- assertThat((List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects()
- .get(0).getConfigProperties(), hasItems(expectedConfigProp, expectedConfigProp2));
+ assertThat(
+ (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().get(0)
+ .getConfigProperties(), hasItems(expectedConfigProp, expectedConfigProp2));
}
finally
{
@@ -1020,8 +1018,9 @@
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().size(), is(1));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().get(0)
.getConfigProperties().size(), is(1));
- assertThat((List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects()
- .get(0).getConfigProperties(), hasItem(expectedConfigProp));
+ assertThat(
+ (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().get(0)
+ .getConfigProperties(), hasItem(expectedConfigProp));
}
finally
{
@@ -1071,8 +1070,9 @@
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().size(), is(1));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().get(0)
.getConfigProperties().size(), is(1));
- assertThat((List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects()
- .get(0).getConfigProperties(), hasItem(expectedConfigProp));
+ assertThat(
+ (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter()).getAdminObjects().get(0)
+ .getConfigProperties(), hasItem(expectedConfigProp));
}
finally
{
Added: projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/ra-xa.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/ra-xa.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/ra-xa.xml 2010-12-02 06:11:57 UTC (rev 109642)
@@ -0,0 +1,158 @@
+<?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>JBoss Resource Adapter for JDBC 4 XA drivers</description>
+ <display-name>JBoss JDBC XATransaction ResourceAdapter</display-name>
+
+ <vendor-name>Red Hat Middleware LLC</vendor-name>
+ <eis-type>JDBC 4.0 XA Relational Database</eis-type>
+ <resourceadapter-version>7.0</resourceadapter-version>
+
+ <license>
+ <description>
+JBoss, Home of Professional Open Source.
+Copyright 2010, Red Hat Middleware LLC, and individual contributors
+as indicated by the @author tags. See the copyright.txt file in the
+distribution for a full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ </description>
+ <license-required>true</license-required>
+ </license>
+
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>org.jboss.jca.adapters.jdbc.xa.XAManagedConnectionFactory</managedconnectionfactory-class>
+ <config-property>
+ <description>The default user name used to create JDBC connections.</description>
+ <config-property-name>UserName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The default password used to create JDBC connections.</description>
+ <config-property-name>Password</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The properties to set up the XA driver. These properties must be in the form name1=value1;name2=value2;...namen=valuen</description>
+ <config-property-name>XADataSourceProperties</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The jdbc connection url delimeter.</description>
+ <config-property-name>URLDelimiter</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The property that contains the list of URLs.</description>
+ <config-property-name>URLProperty</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The configurable URLSelectorStrategy class name.</description>
+ <config-property-name>UrlSelectorStrategyClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The class name of the JDBC XA driver that handlesthis JDBC URL.</description>
+ <config-property-name>XADataSourceClass</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The transaction isolation for new connections. Not necessary: the driver default will be used if ommitted.</description>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The number of cached prepared statements per connection.</description>
+ <config-property-name>PreparedStatementCacheSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Whether to share prepared statements.</description>
+ <config-property-name>SharePreparedStatements</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ </config-property>
+ <config-property>
+ <description>An SQL statement to be executed when a new connection is created as auxillary setup.</description>
+ <config-property-name>NewConnectionSQL</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>An SQL statement that may be executed when a managed connection is taken out of the pool and is about to be given to a client: the purpose is to verify that the connection still works.</description>
+ <config-property-name>CheckValidConnectionSQL</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.ValidConnectionChecker that can determine for a particular vender db when a connection is valid.</description>
+ <config-property-name>ValidConnectionCheckerClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.ExceptionSorter that can determine for a particular vender db which exceptions are fatal and mean a connection should be discarded.</description>
+ <config-property-name>ExceptionSorterClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.StaleConnectionChecker that can determine for a particular vender db when a connection is stale.</description>
+ <config-property-name>StaleConnectionCheckerClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Whether to track unclosed statements - false/true/nowarn</description>
+ <config-property-name>TrackStatements</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Whether to validate the connection on the ManagedConnectionFactory.matchManagedConnection method</description>
+ <config-property-name>ValidateOnMatch</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Whether to set the query timeout based on the transaction timeout</description>
+ <config-property-name>TransactionQueryTimeout</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ </config-property>
+ <config-property>
+ <description>A configured query timeout</description>
+ <config-property-name>QueryTimeout</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Maximum wait for a lock</description>
+ <config-property-name>UseTryLock</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectionfactory-impl-class>org.jboss.jca.adapters.jdbc.WrapperDataSource</connectionfactory-impl-class>
+ <connection-interface>java.sql.Connection</connection-interface>
+ <connection-impl-class>org.jboss.jca.adapters.jdbc.WrappedConnection</connection-impl-class>
+ </connection-definition>
+ <transaction-support>XATransaction</transaction-support>
+ <authentication-mechanism>
+ <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>
+ </resourceadapter>
+</connector>
Added: projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/ra.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/ra.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/adapters/ra.xml 2010-12-02 06:11:57 UTC (rev 109642)
@@ -0,0 +1,158 @@
+<?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>JBoss LocalTransaction JDBC Wrapper Resource Adapter</description>
+ <display-name>JBoss LocalTransaction JDBC Wrapper</display-name>
+
+ <vendor-name>Red Hat Middleware LLC</vendor-name>
+ <eis-type>JDBC 4.0 Relational Database</eis-type>
+ <resourceadapter-version>7.0</resourceadapter-version>
+
+ <license>
+ <description>
+JBoss, Home of Professional Open Source.
+Copyright 2010, Red Hat Middleware LLC, and individual contributors
+as indicated by the @author tags. See the copyright.txt file in the
+distribution for a full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ </description>
+ <license-required>true</license-required>
+ </license>
+
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>org.jboss.jca.adapters.jdbc.local.LocalManagedConnectionFactory</managedconnectionfactory-class>
+ <config-property>
+ <description>The jdbc driver class.</description>
+ <config-property-name>DriverClass</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The jdbc connection url class.</description>
+ <config-property-name>ConnectionURL</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The jdbc connection url delimeter.</description>
+ <config-property-name>URLDelimiter</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The configurable URLSelectorStrategy class name.</description>
+ <config-property-name>UrlSelectorStrategyClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The default transaction isolation of the connections.</description>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The number of cached prepared statements per connection.</description>
+ <config-property-name>PreparedStatementCacheSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Whether to share prepared statements.</description>
+ <config-property-name>SharePreparedStatements</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The user name to connect to the database.</description>
+ <config-property-name>UserName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The password to connect to the database.</description>
+ <config-property-name>Password</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Connection properties for the database.</description>
+ <config-property-name>ConnectionProperties</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>An SQL statement to be executed when a new connection is created as auxillary setup.</description>
+ <config-property-name>NewConnectionSQL</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>An SQL statement that may be executed when a managed connection is taken out of the pool and is about to be given to a client: the purpose is to verify that the connection still works.</description>
+ <config-property-name>CheckValidConnectionSQL</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.ValidConnectionChecker that can determine for a particular vender db when a connection is valid.</description>
+ <config-property-name>ValidConnectionCheckerClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.ExceptionSorter that can determine for a particular vender db which exceptions are fatal and mean a connection should be discarded.</description>
+ <config-property-name>ExceptionSorterClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.StaleConnectionChecker that can determine for a particular vender db when a connection is stale.</description>
+ <config-property-name>StaleConnectionCheckerClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Whether to track unclosed statements - false/true/nowarn</description>
+ <config-property-name>TrackStatements</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Whether to validate the connection on the ManagedConnectionFactory.matchManagedConnection method</description>
+ <config-property-name>ValidateOnMatch</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Whether to set the query timeout based on the transaction timeout</description>
+ <config-property-name>TransactionQueryTimeout</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ </config-property>
+ <config-property>
+ <description>A configured query timeout</description>
+ <config-property-name>QueryTimeout</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
+ <config-property>
+ <description>Maximum wait for a lock</description>
+ <config-property-name>UseTryLock</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ </config-property>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectionfactory-impl-class>org.jboss.jca.adapters.jdbc.WrapperDataSource</connectionfactory-impl-class>
+ <connection-interface>java.sql.Connection</connection-interface>
+ <connection-impl-class>org.jboss.jca.adapters.jdbc.WrappedConnection</connection-impl-class>
+ </connection-definition>
+ <transaction-support>LocalTransaction</transaction-support>
+ <authentication-mechanism>
+ <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>
+ </resourceadapter>
+</connector>
Added: projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-ds.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-ds.xml 2010-12-02 06:11:57 UTC (rev 109642)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
+<!-- ===================================================================== -->
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
+ <datasource jndi-name="PostgresDS" pool-name="PostgresDS">
+ <connection-url>jdbc:postgresql://[servername]:[port]/[database name]</connection-url>
+ <driver-class>org.postgresql.Driver</driver-class>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
+ </datasource>
+</datasources>
\ No newline at end of file
Added: projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-xa-ds.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-xa-ds.xml 2010-12-02 06:11:57 UTC (rev 109642)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
+ <xa-datasource jndi-name="PostgresDS" pool-name="PostgresDS">
+ <xa-datasource-property name="ServerName">server_name</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">database_name</xa-datasource-property>
+ <xa-datasource-property name="User">user</xa-datasource-property>
+ <xa-datasource-property name="Password">password</xa-datasource-property>
+ <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
+ </xa-datasource>
+</datasources>
More information about the jboss-cvs-commits
mailing list