[jboss-cvs] JBossAS SVN: r108203 - in projects/jboss-jca/trunk: common/src/test/resources/ds and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 17 09:27:10 EDT 2010
Author: jesper.pedersen
Date: 2010-09-17 09:27:09 -0400 (Fri, 17 Sep 2010)
New Revision: 108203
Modified:
projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/schemas.xml
Log:
Use org.jboss.jca.adapters namespace
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2010-09-17 13:27:09 UTC (rev 108203)
@@ -377,7 +377,7 @@
a SQLException isValidConnection(Connection e) method to validate is a connection
is valid. An exception means the connection is destroyed. This overrides
the check-valid-connection-sql when present. Ex:
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleValidConnectionChecker</exception-sorter-class-name>
]]>
</xs:documentation>
</xs:annotation>
@@ -443,7 +443,7 @@
a boolean isStaleConnection(SQLException e) method which if it it returns
true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException
which is a subclass of SQLException. Ex:
- <stale-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleStaleConnectionChecker</stale-connection-checker-class-name>
+ <stale-connection-checker-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleStaleConnectionChecker</stale-connection-checker-class-name>
]]>
</xs:documentation>
</xs:annotation>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -27,9 +27,9 @@
Please see http://www-128.ibm.com/developerworks/db2/library/techarticle/dm-0512kokkat/
or the DB2 JDBC application developers manual.
-->
- <!-- New org.jboss.resource.adapter.jdbc.vendor.DB2ExceptionSorter
+ <!-- New org.jboss.jca.adapters.jdbc.vendor.DB2ExceptionSorter
<validation>
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DB2ExceptionSorter</exception-sorter-class-name>
+ <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>
-->
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -40,11 +40,11 @@
</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.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
+ <valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
<!-- 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.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
</validation>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -14,7 +14,7 @@
<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.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
</validation>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -15,7 +15,7 @@
<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.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
</validation>
</xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -12,11 +12,11 @@
</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.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
+ <valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
<!-- 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.resource.adapter.jdbc.vendor.MySQLExceptionSorter</exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.MySQLExceptionSorter</exception-sorter-class-name>
</validation>
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -9,7 +9,7 @@
<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.resource.adapter.jdbc.vendor.MySQLValidConnectionChecker</valid-connection-checker-class-name> -->
+ <!-- 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> -->
</validation>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -16,11 +16,11 @@
</security>
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
<validation>
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name -->
+ <!--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.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
</validation>
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -16,11 +16,11 @@
</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.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name -->
+ <!--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.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
</validation>
</xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -2,10 +2,9 @@
<!-- ===================================================================== -->
<!-- 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/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="jdbc/SybaseDB" pool-name="jdbc/SybaseDB">
- <!-- Sybase jConnect URL for the database. NOTE: The hostname and port are made up values. The optional database name
- is provided, as well as some additinal Driver parameters. -->
<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>
@@ -13,11 +12,7 @@
<password>y</password>
</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.resource.adapter.jdbc.vendor.SybaseExceptionSorter
- </exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
</validation>
- <!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
-</datasources>
\ No newline at end of file
+</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -1,12 +1,6 @@
<?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">
- <!-- TODO: add driver name, version and download url here -->
- <!-- The example posted in the forums uses a security domain. What is the user/password xa-datasource-property? try javap
- com.sybase.jdbc3.jdbc.SybXADataSource For the security domain. Add something like the following to conf/login-config.xml
- <application-policy name = "SybaseXADSRealm"> <login-module code = "org.jboss.resource.security.SecureIdentityLoginModule"
- flag = "required"> <module-option name = "username">myuser</module-option> <module-option name = "password">myhash</module-option>
- <module-option name = "managedConnectionFactoryName">jboss.jca:service=XATxCM,name=SybaseXADS</module-option> </login-module>
- </application-policy> -->
+<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="SybaseXADS" pool-name="SybaseXADS">
<xa-datasource-property name="NetworkProtocol">Tds</xa-datasource-property>
<xa-datasource-property name="ServerName">myserver</xa-datasource-property>
@@ -25,8 +19,7 @@
</time-out>
<validation>
<check-valid-connection-sql>select 1 from mytable</check-valid-connection-sql>
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter
- </exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
</validation>
</xa-datasource>
-</datasources>
\ No newline at end of file
+</datasources>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/schemas.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/schemas.xml 2010-09-17 10:07:00 UTC (rev 108202)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/schemas.xml 2010-09-17 13:27:09 UTC (rev 108203)
@@ -3923,7 +3923,7 @@
a SQLException isValidConnection(Connection e) method to validate is a connection
is valid. An exception means the connection is destroyed. This overrides
the check-valid-connection-sql when present. Ex:
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</exception-sorter-class-name>
+ <exception-sorter-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleValidConnectionChecker</exception-sorter-class-name>
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -3977,7 +3977,7 @@
a boolean isStaleConnection(SQLException e) method which if it it returns
true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException
which is a subclass of SQLException. Ex:
- <stale-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleStaleConnectionChecker</stale-connection-checker-class-name>
+ <stale-connection-checker-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleStaleConnectionChecker</stale-connection-checker-class-name>
</xs:documentation>
</xs:annotation>
</xs:element>
More information about the jboss-cvs-commits
mailing list