[jboss-cvs] JBossAS SVN: r110830 - in projects/jboss-jca/trunk: doc/userguide/en-US and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 3 15:58:23 EST 2011
Author: jesper.pedersen
Date: 2011-03-03 15:58:22 -0500 (Thu, 03 Mar 2011)
New Revision: 110830
Added:
projects/jboss-jca/trunk/doc/userguide/en-US/modules/datasources.xml
Modified:
projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-400-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-jcc-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/jdatastore-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/jsql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/msaccess-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/progress-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/sapdb-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/solid-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-xa-ds.xml
projects/jboss-jca/trunk/doc/userguide/en-US/modules/deployment.xml
projects/jboss-jca/trunk/doc/userguide/en-US/userguide.xml
Log:
Clean up datasource examples
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-400-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-400-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-400-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,17 +1,17 @@
<?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">
- <datasource jndi-name="DB2-400" pool-name="DB2-400">
- <connection-url>jdbc:as400://[systemname]/[schema];extended dynamic=true;package=jbpkg;package cache=true;package library=jboss;errors=full</connection-url>
- <driver-class>com.ibm.as400.access.AS400JDBCDriver</driver-class>
- <pool>
- <min-pool-size>0</min-pool-size>
- </pool>
- <security>
- <user-name>[username]</user-name>
- <password>[password]</password>
-
-</security>
-
- </datasource>
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
+ <datasource jndi-name="DB2-400" pool-name="DB2-400">
+ <connection-url>jdbc:as400://[systemname]/[schema];extended dynamic=true;package=jbpkg;package cache=true;package library=jboss;errors=full</connection-url>
+ <driver-class>com.ibm.as400.access.AS400JDBCDriver</driver-class>
+ <pool>
+ <min-pool-size>0</min-pool-size>
+ </pool>
+ <security>
+ <user-name>[username]</user-name>
+ <password>[password]</password>
+ </security>
+ </datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,43 +1,38 @@
<?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">
- <datasource jndi-name="DB2DS" pool-name="DB2DS">
- <connection-url>jdbc:db2:yourdatabase</connection-url>
- <driver-class>COM.ibm.db2.jdbc.app.DB2Driver</driver-class>
- <pool>
- <min-pool-size>0</min-pool-size>
- <max-pool-size>50</max-pool-size>
- </pool>
- <security>
- <user-name>x</user-name>
- <password>y</password>
-
-</security>
-
- <!-- DB2 Universal Driver Note connection URL is in form of
- jdbc:db2://host:port:dbname
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
+ <datasource jndi-name="DB2DS" pool-name="DB2DS">
+ <!--
+ DB2 Universal Driver Note connection URL is in form of
+ jdbc:db2://host:port:dbname
+
+ Default port for Type 4 driver is 50000
- Default port for Type 4 driver is 50000
+ Note, host and port must be specified if using Type 4 driver. And be forewarned, no native
+ XA support is provided with Type 4; you must set a DB property calling for Type 2 to get XA
- Note, host and port must be specified if using Type 4 driver. And be forewarned, no native
- XA support is provided with Type 4; you must set a DB property calling for Type 2 to get XA
+ <driver-class>com.ibm.db2.jcc.DB2Driver</driver-class>
+ <connection-url>jdbc:db2://[hostname]:[port]/databasename"</connection-url>
- <driver-class>com.ibm.db2.jcc.DB2Driver</driver-class>
- <connection-url>jdbc:db2://[hostname]:[port]/databasename"</connection-url>
-
- Please see http://www-128.ibm.com/developerworks/db2/library/techarticle/dm-0512kokkat/
- or the DB2 JDBC application developers manual.
- -->
- <!-- New org.jboss.jca.adapters.jdbc.vendor.DB2ExceptionSorter
- <validation>
- <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.DB2ExceptionSorter</exception-sorter-class-name>
- <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- </validation>
- -->
-
- <!-- sql to call when connection is created
- <new-connection-sql>some arbitrary sql</new-connection-sql>
- -->
-
- </datasource>
+ Please see http://www-128.ibm.com/developerworks/db2/library/techarticle/dm-0512kokkat/
+ or the DB2 JDBC application developers manual.
+ -->
+ <connection-url>jdbc:db2:yourdatabase</connection-url>
+ <driver-class>COM.ibm.db2.jdbc.app.DB2Driver</driver-class>
+ <pool>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>50</max-pool-size>
+ </pool>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
+ <validation>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.db2.DB2ValidConnectionChecker"></valid-connection-checker>
+ <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.db2.DB2StaleConnectionChecker"></stale-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.db2.DB2ExceptionSorter"></exception-sorter>
+ </validation>
+ </datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-jcc-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-jcc-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-jcc-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,23 +1,23 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
- <xa-datasource jndi-name="DB2XADS" pool-name="DB2XADS">
- <xa-datasource-property name="DatabaseName">your_database_name</xa-datasource-property>
- <xa-datasource-property name="User">your_user</xa-datasource-property>
- <xa-datasource-property name="Password">your_password</xa-datasource-property>
+ <xa-datasource jndi-name="DB2XADS" pool-name="DB2XADS">
+ <xa-datasource-property name="DatabaseName">your_database_name</xa-datasource-property>
+ <xa-datasource-property name="User">your_user</xa-datasource-property>
+ <xa-datasource-property name="Password">your_password</xa-datasource-property>
- <!-- If driverType 4 is used, the following tags are needed -->
- <xa-datasource-property name="ServerName">your_server_name</xa-datasource-property>
- <xa-datasource-property name="DriverType">4</xa-datasource-property>
- <!-- Note, as opposed to the Type2 driver, DB2 Type 4 requires the PortNumber. By default this is 50000-->
- <xa-datasource-property name="PortNumber">your_port_number</xa-datasource-property>
- <xa-datasource-class>com.ibm.db2.jcc.DB2XADataSource</xa-datasource-class>
- <!-- Must be set if using multiple DB2 XA resources in same transaction -->
- <xa-pool>
- <is-same-rm-override>false</is-same-rm-override>
- <interleaving/>
- </xa-pool>
- </xa-datasource>
+ <!-- If driverType 4 is used, the following tags are needed -->
+ <xa-datasource-property name="ServerName">your_server_name</xa-datasource-property>
+ <xa-datasource-property name="DriverType">4</xa-datasource-property>
+ <!-- Note, as opposed to the Type2 driver, DB2 Type 4 requires the PortNumber. By default this is 50000-->
+ <xa-datasource-property name="PortNumber">your_port_number</xa-datasource-property>
+ <xa-datasource-class>com.ibm.db2.jcc.DB2XADataSource</xa-datasource-class>
+ <!-- Must be set if using multiple DB2 XA resources in same transaction -->
+ <xa-pool>
+ <is-same-rm-override>false</is-same-rm-override>
+ <interleaving/>
+ </xa-pool>
+ </xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,17 +1,21 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org//ironjacamar/schema/datasources_1_0.xsd">
- <xa-datasource jndi-name="DB2XADS" pool-name="DB2XADS">
- <xa-datasource-property name="DatabaseName">yout_database_name</xa-datasource-property>
- <xa-datasource-property name="User">your_user</xa-datasource-property>
- <xa-datasource-property name="Password">your_password</xa-datasource-property>
- <xa-datasource-class>COM.ibm.db2.jdbc.DB2XADataSource</xa-datasource-class>
- <xa-pool>
- <!-- uncomment to enable interleaving <interleaving/> -->
- <is-same-rm-override>false</is-same-rm-override>
- <!-- <interleaving/> -->
- </xa-pool>
- </xa-datasource>
+ <xa-datasource jndi-name="DB2XADS" pool-name="DB2XADS">
+ <xa-datasource-property name="DatabaseName">yout_database_name</xa-datasource-property>
+ <xa-datasource-property name="User">your_user</xa-datasource-property>
+ <xa-datasource-property name="Password">your_password</xa-datasource-property>
+ <xa-datasource-class>COM.ibm.db2.jdbc.DB2XADataSource</xa-datasource-class>
+ <xa-pool>
+ <is-same-rm-override>false</is-same-rm-override>
+ <!-- Uncomment to enable interleaving <interleaving/> -->
+ </xa-pool>
+ <validation>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.db2.DB2ValidConnectionChecker"></valid-connection-checker>
+ <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.db2.DB2StaleConnectionChecker"></stale-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.db2.DB2ExceptionSorter"></exception-sorter>
+ </validation>
+ </xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,36 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- The Derby embedded database JCA connection factory config -->
<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: derby-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="DerbyDS" pool-name="DerbyDS">
- <!-- for in-process persistent db, saved when jboss stops. The org.jboss.jdbc.DerbyDatabase mbean is necessary for properly
- db shutdown -->
- <connection-url>jdbc:derby:${jboss.server.data.dir}${/}derby${/}localDB;create=true</connection-url>
- <!-- The driver class -->
+ <connection-url>jdbc:derby:${ironjacamar.home}${/}data${/}derby${/}localDB;create=true</connection-url>
<driver-class>org.apache.derby.jdbc.EmbeddedDriver</driver-class>
<pool>
- <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
<min-pool-size>5</min-pool-size>
- <!-- The maximum connections in a pool/sub-pool -->
<max-pool-size>20</max-pool-size>
</pool>
<security>
- <!-- The login and password -->
<user-name>sa</user-name>
<password></password>
-
-</security>
+ </security>
<time-out>
- <!-- The time before an unused connection is destroyed -->
<idle-timeout-minutes>5</idle-timeout-minutes>
</time-out>
- <!-- Whether to check all statements are closed when the connection is returned to the pool, this is a debugging feature
- that should be turned off in production -->
<statement>
<track-statements>true</track-statements>
- <!-- This mbean can be used when using in process persistent derby -->
</statement>
</datasource>
-</datasources>
\ No newline at end of file
+
+</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,18 +1,19 @@
<?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="XADerbyDS" pool-name="XADerbyDS">
- <!-- path to the database. (${jboss.server.data.dir}${/}derby${/}default didn't work on win) -->
- <xa-datasource-property name="DatabaseName">derby/default</xa-datasource-property>
- <xa-datasource-property name="User">sa</xa-datasource-property>
- <xa-datasource-property name="Password"></xa-datasource-property>
- <xa-datasource-property name="CreateDatabase">create</xa-datasource-property>
- <xa-datasource-class>org.apache.derby.jdbc.EmbeddedXADataSource</xa-datasource-class>
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
+ <xa-datasource jndi-name="XADerbyDS" pool-name="XADerbyDS">
+ <xa-datasource-property name="DatabaseName">derby/default</xa-datasource-property>
+ <xa-datasource-property name="User">sa</xa-datasource-property>
+ <xa-datasource-property name="Password"></xa-datasource-property>
+ <xa-datasource-property name="CreateDatabase">create</xa-datasource-property>
+ <xa-datasource-class>org.apache.derby.jdbc.EmbeddedXADataSource</xa-datasource-class>
- <xa-pool>
- <!-- uncomment to enable interleaving <interleaving/> -->
- <is-same-rm-override>false</is-same-rm-override>
- </xa-pool>
- </xa-datasource>
+ <xa-pool>
+ <is-same-rm-override>false</is-same-rm-override>
+ <!-- Uncomment to enable interleaving <interleaving/> -->
+ </xa-pool>
+ </xa-datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,15 +1,15 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="java:/H2DS" pool-name="H2DS">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
<driver-class>org.h2.Driver</driver-class>
<security>
<user-name>sa</user-name>
<password>sa</password>
-
-</security>
+ </security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,17 +1,17 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<xa-datasource jndi-name="java:/H2XADS" pool-name="H2XADS">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:h2:mem:test</xa-datasource-property>
<security>
- <!-- Have to defined as a primary property - otherwise it won't work -->
+ <!-- Have to defined as a primary property - otherwise it won't work -->
<user-name>sa</user-name>
<!-- Have to defined as a primary property - otherwise it won't work -->
<password>sa</password>
-
-</security>
+ </security>
</xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,51 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- The Hypersonic embedded database JCA connection factory config -->
<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: hsqldb-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
+
<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="DefaultDS" pool-name="DefaultDS">
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
- <!-- The driver class -->
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
+ <datasource jndi-name="HSQLDB" pool-name="HSQLDB">
+ <connection-url>jdbc:hsqldb:${ironjacamar.home}${/}data${/}hsqldb${/}localDB</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<pool>
- <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
<min-pool-size>5</min-pool-size>
- <!-- The maximum connections in a pool/sub-pool -->
<max-pool-size>20</max-pool-size>
- <!-- The login and password -->
</pool>
<security>
<user-name>sa</user-name>
<password></password>
-
-</security>
- <!-- For server mode db, allowing other processes to use hsqldb over tcp. This requires the org.jboss.jdbc.HypersonicDatabase
- mbean. <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1701</connection-url> -->
- <!-- For totally in-memory db, not saved when jboss stops. The org.jboss.jdbc.HypersonicDatabase mbean is required for
- proper db shutdown <connection-url>jdbc:hsqldb:.</connection-url> -->
- <!-- For in-process persistent db, saved when jboss stops. The org.jboss.jdbc.HypersonicDatabase mbean is required for
- proper db shutdown -->
+ </security>
<time-out>
- <!-- The time before an unused connection is destroyed -->
- <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
- <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
+ <!--
+ TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem
+ with not reaping threads on closed connections
+ -->
<idle-timeout-minutes>0</idle-timeout-minutes>
</time-out>
<statement>
- <!-- Whether to check all statements are closed when the connection is returned to the pool, this is a debugging feature
- that should be turned off in production -->
<track-statements>true</track-statements>
- <!-- HSQL DB benefits from prepared statement caching -->
<prepared-statement-cache-size>32</prepared-statement-cache-size>
</statement>
- <validation>
- <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
- <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.vendor.DummyValidConnectionChecker"></valid-connection-checker>
- <!-- this will be run before a managed connection is removed from the pool for use by a client -->
- <check-valid-connection-sql>select * from something</check-valid-connection-sql>
- <!--example of how to specify class that determines if exception means connection should be destroyed -->
- <exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.DummyExceptionSorter"></exception-sorter>
- </validation>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,21 +1,19 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="InformixDS" pool-name="InformixDS">
<connection-url>jdbc:informix-sqli://myhost.mydomain.com:1557/mydb:INFORMIXSERVER=myserver</connection-url>
<driver-class>com.informix.jdbc.IfxDriver</driver-class>
- <!-- sql to call when connection is created -->
<new-connection-sql>some arbitrary sql</new-connection-sql>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
+ </security>
<validation>
- <!-- sql to call on an existing pooled connection when it is obtained from pool -->
- <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- <exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.InformixExceptionSorter"></exception-sorter>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.informix.InformixExceptionSorter"></exception-sorter>
</validation>
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,7 +1,8 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<xa-datasource jndi-name="InformixXADS" pool-name="InformixXADS">
<xa-datasource-property name="IfxWAITTIME">10</xa-datasource-property>
<xa-datasource-property name="Description">Something Descriptive</xa-datasource-property>
@@ -10,12 +11,8 @@
<xa-datasource-property name="DatabaseName">mydb</xa-datasource-property>
<xa-datasource-property name="ServerName">myserver</xa-datasource-property>
<xa-datasource-class>com.informix.jdbcx.IfxXADataSource</xa-datasource-class>
- <!-- sql to call when connection is created -->
- <new-connection-sql>some arbitrary sql</new-connection-sql>
<validation>
- <!-- sql to call on an existing pooled connection when it is obtained from pool -->
- <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- <exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.InformixExceptionSorter"></exception-sorter>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.informix.InformixExceptionSorter"></exception-sorter>
</validation>
</xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/jdatastore-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/jdatastore-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/jdatastore-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- ====)================================================================ -->
-<!-- Copy these jar's from your JBuilder6/lib to your jboss's lib -->
-<!-- dx.jar,jdsserver.jar,jds.jar -->
-<!-- Originally from Brent Thompson www.protegra.com/javagroup.html -->
-<!-- ==================================================================== -->
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="JDataStoreDS" pool-name="JDataStoreDS">
- <connection-url>jdbc:borland:dslocal:/home/brent/JBuilder6/samples/JDataStore/datastores/employee.jds</connection-url>
+ <connection-url>jdbc:borland:dslocal:/home/brent/JBuilder6/samples/JDataStore/datastores/employee.jds</connection-url>
<driver-class>com.borland.datastore.jdbc.DataStoreDriver</driver-class>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
+ </security>
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/jsql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/jsql-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/jsql-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,21 +1,15 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="JSQLDS" pool-name="JSQLDS">
<connection-url>jdbc:JSQLConnect://localhost:1433/databaseName=testdb</connection-url>
<driver-class>com.jnetdirect.jsql.JSQLDriver</driver-class>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
- <!-- sql to call on an existing pooled connection when it is obtained from pool
- <validation>
- <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- </validation> -->
- <!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
+ </security>
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,9 +1,8 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="MimerDS" pool-name="MimerDS">
<connection-url>jdbc:mimer:multi1</connection-url>
<driver-class>com.mimer.jdbc.Driver</driver-class>
@@ -14,11 +13,11 @@
<security>
<user-name>changeme</user-name>
<password>changeme</password>
-
-</security>
+ </security>
<time-out>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
</time-out>
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,6 +1,7 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<xa-datasource jndi-name="XAMimerDS" pool-name="XAMimerDS">
<xa-datasource-property name="DatabaseName">multi1</xa-datasource-property>
<xa-datasource-property name="ServerName">localhost</xa-datasource-property>
@@ -13,11 +14,11 @@
<security>
<user-name>changeme</user-name>
<password>changeme</password>
-
-</security>
+ </security>
<time-out>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
</time-out>
</xa-datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/msaccess-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/msaccess-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/msaccess-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,17 +1,15 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="MSAccessDS" pool-name="MSAccessDS">
- <!-- format of URL is "jdbc:odbc:DSNNAME" -->
<connection-url>jdbc:odbc:INsightDSN</connection-url>
<driver-class>sun.jdbc.odbc.JdbcOdbcDriver</driver-class>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
+ </security>
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,21 +1,18 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamard/schema/atasources_1_0.xsd">
+
<datasource jndi-name="MSSQLDS" pool-name="MSSQLDS">
<connection-url>jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=MyDatabase</connection-url>
<driver-class>com.microsoft.sqlserver.jdbc.SQLServerDriver</driver-class>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
- <!-- sql to call on an existing pooled connection when it is obtained from pool
- <validation>
- <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- </validation> -->
- <!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
+ </security>
+ <validation>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mssql.MSSQLValidConnectionChecker"></valid-connection-checker>
+ </validation>
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,6 +1,8 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<xa-datasource jndi-name="MSSQLXADS" pool-name="MSSQLXADS">
<xa-datasource-property name="ServerName">myserver</xa-datasource-property>
<xa-datasource-property name="DatabaseName">mydatabase</xa-datasource-property>
@@ -9,8 +11,12 @@
<xa-datasource-property name="Password">mypassword</xa-datasource-property>
<xa-datasource-class>com.microsoft.sqlserver.jdbc.SQLServerXADataSource</xa-datasource-class>
<xa-pool>
- <!-- uncomment to enable interleaving <interleaving/> -->
<is-same-rm-override>false</is-same-rm-override>
+ <!-- Uncomment to enable interleaving <interleaving/> -->
</xa-pool>
+ <validation>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mssql.MSSQLValidConnectionChecker"></valid-connection-checker>
+ </validation>
</xa-datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -2,23 +2,19 @@
<!-- 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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="MySqlDS" pool-name="MySqlDS">
<connection-url>jdbc:mysql://mysql-hostname:3306/jbossdb</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
+ </security>
<validation>
- <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
- <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.vendor.DummyValidConnectionChecker"></valid-connection-checker>
- <!-- this will be run before a managed connection is removed from the pool for use by a client -->
- <check-valid-connection-sql>select * from something</check-valid-connection-sql>
- <!--example of how to specify class that determines if exception means connection should be destroyed -->
- <exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.MySQLExceptionSorter"></exception-sorter>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"></valid-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"></exception-sorter>
</validation>
- <!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,7 +1,8 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<xa-datasource jndi-name="MysqlXADS" pool-name="MysqlXADS">
<xa-datasource-property name="ServerName">server_name</xa-datasource-property>
<xa-datasource-property name="DatabaseName">database_name</xa-datasource-property>
@@ -9,10 +10,9 @@
<xa-datasource-property name="Password">password</xa-datasource-property>
<xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
<validation>
- <!-- should only be used on drivers after 3.22.1 with "ping" support <valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.vendor.MySQLValidConnectionChecker</valid-connection-checker-class-name> -->
- <!-- sql to call on an existing pooled connection when it is obtained from pool - MySQLValidConnectionChecker is preferred
- for newer drivers <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql> -->
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"></valid-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"></exception-sorter>
</validation>
- <!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</xa-datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,28 +1,26 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
<datasource jndi-name="OracleDS" pool-name="OracleDS">
+ <!--
+ Here are a couple of the possible OCI configurations. For more information,
+ see http://otn.oracle.com/docs/products/oracle9i/doc_library/release2/java.920/a96654/toc.htm
+ <connection-url>jdbc:oracle:oci:@youroracle-tns-name</connection-url> or
+ <connection-url>jdbc:oracle:oci:@(description=(address=(host=youroraclehost)(protocol=tcp)(port=1521))(connect_data=(SERVICE_NAME=yourservicename)))</connection-url>
+ Clearly, its better to have TNS set up properly.
+ -->
<connection-url>jdbc:oracle:thin:@youroraclehost:1521:yoursid</connection-url>
- <!-- Here are a couple of the possible OCI configurations. For more information, see http://otn.oracle.com/docs/products/oracle9i/doc_library/release2/java.920/a96654/toc.htm
- <connection-url>jdbc:oracle:oci:@youroracle-tns-name</connection-url> or <connection-url>jdbc:oracle:oci:@(description=(address=(host=youroraclehost)(protocol=tcp)(port=1521))(connect_data=(SERVICE_NAME=yourservicename)))</connection-url>
- Clearly, its better to have TNS set up properly. -->
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
+ </security>
<validation>
- <!--valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name -->
- <!-- sql to call on an existing pooled connection when it is obtained from pool - the OracleValidConnectionChecker
- is prefered <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql> -->
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.OracleExceptionSorter"></exception-sorter>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"></valid-connection-checker>
+ <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker"></stale-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"></exception-sorter>
</validation>
- <!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,26 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
-<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
-<!-- ===================================================================== -->
+<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction.xml -->
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<xa-datasource jndi-name="XAOracleDS" pool-name="XAOracleDS">
<xa-datasource-property name="URL">jdbc:oracle:oci8:@tc</xa-datasource-property>
<xa-datasource-property name="User">scott</xa-datasource-property>
<xa-datasource-property name="Password">tiger</xa-datasource-property>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<xa-pool>
- <!-- uncomment to enable interleaving <interleaving/> -->
<is-same-rm-override>false</is-same-rm-override>
+ <!-- Uncomment to enable interleaving <interleaving/> -->
<no-tx-separate-pools />
</xa-pool>
<validation>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name -->
- <!-- sql to call on an existing pooled connection when it is obtained from pool - the OracleValidConnectionChecker
- is prefered <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql> -->
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.OracleExceptionSorter"></exception-sorter>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"></valid-connection-checker>
+ <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker"></stale-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"></exception-sorter>
</validation>
</xa-datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,14 +1,15 @@
<?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="DefaultDS" pool-name="DefaultDS">
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
+ <datasource jndi-name="PointBase" pool-name="PointBase">
<connection-url>jdbc:pointbase:server://@pointbase.server@:@pointbase.port/pointbase.dbName@,new</connection-url>
<driver-class>com.pointbase.jdbc.jdbcUniversalDriver</driver-class>
- <!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
<security>
<user-name>@pointbase.user@</user-name>
<password>@pointbase.passwd@</password>
-
-</security>
+ </security>
</datasource>
-</datasources>
\ No newline at end of file
+
+</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,5 +1,7 @@
<?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">
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<xa-datasource jndi-name="PointbaseXA" pool-name="PointbaseXA">
<xa-datasource-property name="ServerName">@pointbase.server@</xa-datasource-property>
<xa-datasource-property name="DatabaseName">9092</xa-datasource-property>
@@ -7,7 +9,7 @@
<security>
<user-name>@pointbase.user@</user-name>
<password>@pointbase.passwd@</password>
-
-</security>
+ </security>
</xa-datasource>
-</datasources>
\ No newline at end of file
+
+</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,15 +1,19 @@
<?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">
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/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>
+ </security>
+ <validation>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"></valid-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"></exception-sorter>
+ </validation>
</datasource>
-</datasources>
\ No newline at end of file
+
+</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,7 +1,8 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/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>
@@ -9,5 +10,10 @@
<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>
+ <validation>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"></valid-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"></exception-sorter>
+ </validation>
</xa-datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/progress-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/progress-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/progress-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,15 +1,15 @@
<?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">
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="ProgressDS" pool-name="ProgressDS">
<connection-url>jdbc:JdbcProgress:T:dbserver:3305:liveappl</connection-url>
<driver-class>com.progress.sql.jdbc.JdbcProgressDriver</driver-class>
<security>
<user-name>user</user-name>
<password>password</password>
-
-</security>
+ </security>
</datasource>
-</datasources>
\ No newline at end of file
+
+</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/sapdb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/sapdb-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/sapdb-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,15 +1,15 @@
<?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">
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="SapdbDS" pool-name="SapdbDS">
<connection-url>jdbc:sapdb://127.0.0.1/DB_NAME</connection-url>
<driver-class>com.sap.dbtech.jdbc.DriverSapDB</driver-class>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
+ </security>
</datasource>
-</datasources>
\ No newline at end of file
+
+</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/solid-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/solid-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/solid-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,12 +1,12 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="SolidDS" pool-name="SolidDS">
<!--NOTE: Solid wants the username/password in the URL, it will ignore the specific arguments. -->
<connection-url>jdbc:solid://yourdbhost:1964/yourdbusername/yourdbpassword</connection-url>
<driver-class>solid.jdbc.SolidDriver</driver-class>
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,19 +1,19 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<datasource jndi-name="jdbc/SybaseDB" pool-name="jdbc/SybaseDB">
<connection-url>jdbc:sybase:Tds:host.at.some.domain:5000/db_name?JCONNECT_VERSION=6</connection-url>
<driver-class>com.sybase.jdbc2.jdbc.SybDataSource</driver-class>
<security>
<user-name>x</user-name>
<password>y</password>
-
-</security>
+ </security>
<validation>
- <exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.SybaseExceptionSorter"></exception-sorter>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.sybase.SybaseValidConnectionChecker"></valid-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.sybase.SybaseExceptionSorter"></exception-sorter>
</validation>
</datasource>
+
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-xa-ds.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-xa-ds.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -1,6 +1,7 @@
<?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">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+
<xa-datasource jndi-name="SybaseXADS" pool-name="SybaseXADS">
<xa-datasource-property name="NetworkProtocol">Tds</xa-datasource-property>
<xa-datasource-property name="ServerName">myserver</xa-datasource-property>
@@ -12,14 +13,14 @@
<xa-pool>
<min-pool-size>1</min-pool-size>
<max-pool-size>20</max-pool-size>
- <!-- uncomment to enable interleaving <interleaving/> -->
+ <!-- Uncomment to enable interleaving <interleaving/> -->
</xa-pool>
<time-out>
<idle-timeout-minutes>15</idle-timeout-minutes>
</time-out>
<validation>
- <check-valid-connection-sql>select 1 from mytable</check-valid-connection-sql>
- <exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.SybaseExceptionSorter"></exception-sorter>
+ <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.sybase.SybaseValidConnectionChecker"></valid-connection-checker>
+ <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.sybase.SybaseExceptionSorter"></exception-sorter>
</validation>
</xa-datasource>
</datasources>
Added: projects/jboss-jca/trunk/doc/userguide/en-US/modules/datasources.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/datasources.xml (rev 0)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/datasources.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<appendix id="ex_datasources">
+ <title>Datasources</title>
+
+ <para></para>
+
+ <section id="ex_datasources_postgresql">
+ <title>PosgreSQL</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/postgres-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_postgresql_xa">
+ <title>PosgreSQL XA</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/postgres-xa-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_mysql">
+ <title>MySQL</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/mysql-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_mysql_xa">
+ <title>MySQL XA</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/mysql-xa-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_h2">
+ <title>H2</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/h2-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_h2_xa">
+ <title>H2 XA</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/h2-xa-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_derby">
+ <title>Derby</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/derby-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_derby_xa">
+ <title>Derby XA</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/derby-xa-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_oracle">
+ <title>Oracle</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/oracle-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_oracle_xa">
+ <title>Oracle XA</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/oracle-xa-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_mssql">
+ <title>Microsoft SQLServer</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/mssql-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_mssql_xa">
+ <title>Microsoft SQLServer XA</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/mssql-xa-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_db2">
+ <title>IBM DB2</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/db2-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+ <section id="ex_datasources_db2_xa">
+ <title>IBM DB2 XA</title>
+ <programlisting language="xml">
+ <xi:include parse="text"
+ href="../../../common/src/test/resources/ds/example/db2-xa-ds.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+
+</appendix>
Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/deployment.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/deployment.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/deployment.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -742,7 +742,7 @@
</entry>
</row>
<row>
- <entry><code>time-out</code></entry>
+ <entry><code>timeout</code></entry>
<entry>
Specifies the time out settings
</entry>
@@ -841,7 +841,7 @@
</entry>
</row>
<row>
- <entry><code>time-out</code></entry>
+ <entry><code>timeout</code></entry>
<entry>
Specifies the time out settings
</entry>
Modified: projects/jboss-jca/trunk/doc/userguide/en-US/userguide.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/userguide.xml 2011-03-03 19:14:42 UTC (rev 110829)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/userguide.xml 2011-03-03 20:58:22 UTC (rev 110830)
@@ -16,6 +16,7 @@
<!ENTITY troubleshooting SYSTEM "modules/troubleshooting.xml">
<!ENTITY schemas SYSTEM "modules/schemas.xml">
<!ENTITY sample SYSTEM "modules/sample.xml">
+ <!ENTITY datasources SYSTEM "modules/datasources.xml">
]>
<book lang="en">
<bookinfo>
@@ -63,4 +64,6 @@
&sample;
+ &datasources;
+
</book>
More information about the jboss-cvs-commits
mailing list