[jboss-cvs] JBossAS SVN: r107888 - in projects/jboss-jca/trunk/common/src: main/java/org/jboss/jca/common/metadata/ds and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Aug 30 09:25:21 EDT 2010


Author: jesper.pedersen
Date: 2010-08-30 09:25:21 -0400 (Mon, 30 Aug 2010)
New Revision: 107888

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
   projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
   projects/jboss-jca/trunk/common/src/test/resources/ds/derby-xa-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/jdatastore-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/msaccess-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-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/pointbase-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-xa-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-xa-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/progress-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/sapdb-ds.xml
   projects/jboss-jca/trunk/common/src/test/resources/ds/solid-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
Log:
Remove track-connection-by-tx for datasources

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java	2010-08-30 13:25:21 UTC (rev 107888)
@@ -137,13 +137,6 @@
    public boolean isNoTxSeparatePool();
 
    /**
-    * Get the trackConnectionByTx.
-    *
-    * @return the trackConnectionByTx.
-    */
-   public boolean isTrackConnectionByTx();
-
-   /**
    *
    * A Tag.
    *
@@ -243,13 +236,8 @@
       /**
        * no-tx-separate-pools tag
        */
-      NO_TX_SEPARATE_POOLS("no-tx-separate-pools"),
+      NO_TX_SEPARATE_POOLS("no-tx-separate-pools");
 
-      /**
-       * track-connection-by-tx tag
-       */
-      TRACK_CONNECTION_BY_TX("track-connection-by-tx");
-
       private final String name;
 
       /**

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2010-08-30 13:25:21 UTC (rev 107888)
@@ -184,7 +184,6 @@
       boolean padXid = false;
       boolean noTxSeparatePool = false;
       boolean wrapXaDataSource = false;
-      boolean trackConnectionByTx = false;
 
       //attributes reading
 
@@ -232,8 +231,7 @@
                         xaDataSourceProperty, xaDataSourceClass, transactionIsolation, isSameRmOverrideValue,
                         interleaving, recoverySettings, timeOutSettings, securitySettings, statementSettings,
                         validationSettings, urlDelimiter, urlSelectorStrategyClassName, newConnectionSql,
-                        useJavaContext, poolName, enabled, jndiName, padXid, wrapXaDataSource, noTxSeparatePool,
-                        trackConnectionByTx);
+                        useJavaContext, poolName, enabled, jndiName, padXid, wrapXaDataSource, noTxSeparatePool);
                }
                else
                {
@@ -331,10 +329,6 @@
                      wrapXaDataSource = elementAsBoolean(reader);
                      break;
                   }
-                  case TRACK_CONNECTION_BY_TX : {
-                     trackConnectionByTx = elementAsBoolean(reader);
-                     break;
-                  }
                   default :
                      throw new ParserException("Unexpected element:" + reader.getLocalName());
                }

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java	2010-08-30 13:25:21 UTC (rev 107888)
@@ -67,8 +67,6 @@
 
    private final boolean noTxSeparatePool;
 
-   private final boolean trackConnectionByTx;
-
    /**
     * Create a new XADataSourceImpl.
     *
@@ -97,7 +95,6 @@
     * @param padXid padXid
     * @param wrapXaDataSource wrapXaDataSource
     * @param noTxSeparatePool noTxSeparatePool
-    * @param trackConnectionByTx trackConnectionByTx
     */
    public XADataSourceImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill, String userName, String password,
          Map<String, String> xaDataSourceProperty, String xaDataSourceClass,
@@ -105,8 +102,7 @@
          Recovery recovery, TimeOut timeOut, Security security,
          Statement statement, Validation validation, String urlDelimiter,
          String urlSelectorStrategyClassName, String newConnectionSql, boolean useJavaContext, String poolName,
-         boolean enabled, String jndiName, boolean padXid, boolean wrapXaDataSource, boolean noTxSeparatePool,
-         boolean trackConnectionByTx)
+         boolean enabled, String jndiName, boolean padXid, boolean wrapXaDataSource, boolean noTxSeparatePool)
    {
       super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOut, security,
             statement, validation, urlDelimiter, urlSelectorStrategyClassName, useJavaContext,
@@ -130,7 +126,6 @@
       this.padXid = padXid;
       this.wrapXaDataSource = wrapXaDataSource;
       this.noTxSeparatePool = noTxSeparatePool;
-      this.trackConnectionByTx = trackConnectionByTx;
    }
 
    /**
@@ -257,7 +252,6 @@
       result = prime * result + (padXid ? 1231 : 1237);
       result = prime * result + ((password == null) ? 0 : password.hashCode());
       result = prime * result + ((recovery == null) ? 0 : recovery.hashCode());
-      result = prime * result + (trackConnectionByTx ? 1231 : 1237);
       result = prime * result + ((userName == null) ? 0 : userName.hashCode());
       result = prime * result + (wrapXaDataSource ? 1231 : 1237);
       result = prime * result + ((xaDataSourceClass == null) ? 0 : xaDataSourceClass.hashCode());
@@ -304,8 +298,6 @@
       }
       else if (!recovery.equals(other.recovery))
          return false;
-      if (trackConnectionByTx != other.trackConnectionByTx)
-         return false;
       if (userName == null)
       {
          if (other.userName != null)
@@ -339,8 +331,7 @@
             + xaDataSourceProperty + ", xaDataSourceClass=" + xaDataSourceClass + ", isSameRmOverride="
             + isSameRmOverride + ", interleaving=" + interleaving + ", recovery=" + recovery
             + ", newConnectionSql=" + newConnectionSql + ", padXid=" + padXid + ", wrapXaDataSource="
-            + wrapXaDataSource + ", noTxSeparatePool=" + noTxSeparatePool + ", trackConnectionByTx="
-            + trackConnectionByTx + "]";
+            + wrapXaDataSource + ", noTxSeparatePool=" + noTxSeparatePool + "]";
    }
 
    /**
@@ -386,15 +377,4 @@
    {
       return noTxSeparatePool;
    }
-
-   /**
-    * Get the trackConnectionByTx.
-    *
-    * @return the trackConnectionByTx.
-    */
-   @Override
-   public final boolean isTrackConnectionByTx()
-   {
-      return trackConnectionByTx;
-   }
 }

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-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd	2010-08-30 13:25:21 UTC (rev 107888)
@@ -357,7 +357,6 @@
       <xs:element name="pad-xid" type="xs:boolean" default="false" minOccurs="0" />
       <xs:element name="wrap-xa-resource" type="xs:boolean" default="false" minOccurs="0" />
       <xs:element name="no-tx-separate-pools" type="boolean-presenceType" minOccurs="0" />
-      <xs:element name="track-connection-by-tx" type="xs:boolean" minOccurs="0"></xs:element>
     </xs:sequence>
     <xs:attributeGroup ref="common-datasourceAttributes" />
   </xs:complexType>
@@ -704,4 +703,4 @@
       </xs:element>
     </xs:sequence>
   </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/derby-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/derby-xa-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/derby-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  JBoss DataSource Configuration                                       -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: derby-xa-ds.xml 77479 2008-08-26 10:33:09Z alex.loubyansky at jboss.com $ -->
-
 <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">
@@ -16,13 +8,9 @@
       <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-datasource-class>org.apache.derby.jdbc.EmbeddedXADataSource</xa-datasource-class>
      
       <!-- uncomment to enable interleaving <interleaving/> -->
       <is-same-rm-override>false</is-same-rm-override>
-      
-     
    </xa-datasource>
-
-
 </datasources>

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-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: informix-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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="InformixDS" pool-name="InformixDS">
     <user-name>x</user-name>
     <password>y</password>
@@ -21,4 +15,4 @@
     <!-- 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/informix-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-<!-- $Id: informix-xa-ds.xml 26313 2004-12-02 10:52:37Z schrouf $ -->
+
 <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/jee/schema/ironjacamar/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>
@@ -23,4 +18,4 @@
     <!-- sql to call when connection is created -->
     <new-connection-sql>some arbitrary sql</new-connection-sql>
   </xa-datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/jdatastore-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/jdatastore-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/jdatastore-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: jdatastore-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
-<!-- ==================================================================== -->
+<!-- ====)================================================================ -->
 <!-- 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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="JDataStoreDS" pool-name="JDataStoreDS">
     <user-name>x</user-name>
     <password>y</password>
     <connection-url>jdbc:borland:dslocal:/home/brent/JBuilder6/samples/JDataStore/datastores/employee.jds</connection-url>
     <driver-class>com.borland.datastore.jdbc.DataStoreDriver</driver-class>
   </datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: jsql-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
-<!-- ====================================================================== -->
-<!-- ConnectionManager setup for JSQL Microsoft SQL Server 2000 driver -->
 <!-- ===================================================================== -->
 <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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="JSQLDS" pool-name="JSQLDS">
     <user-name>x</user-name>
     <password>y</password>
@@ -22,4 +15,4 @@
     </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/mimer-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: mimer-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
 <!-- ==================================================================== -->
-<!-- ConnectionManager setup for Mimer SQL for local transactions -->
-<!-- -->
-<!-- Supplied by fredrik.alund at upright.se -->
-<!-- ==================================================================== -->
 <!-- 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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="MimerDS" pool-name="MimerDS">
     <min-pool-size>5</min-pool-size>
     <max-pool-size>100</max-pool-size>
@@ -20,4 +16,4 @@
       <idle-timeout-minutes>15</idle-timeout-minutes>
     </time-out>
   </datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: mimer-xa-ds.xml 23720 2004-09-15 14:37:40Z loubyansky $ -->
-<!-- ==================================================================== -->
-<!-- ConnectionManager setup for Mimer SQL for distributed transactions -->
-<!-- -->
-<!-- Requires version 9 -->
-<!-- -->
-<!-- Supplied by fredrik.alund at upright.se -->
-<!-- ==================================================================== -->
 <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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <xa-datasource jndi-name="XAMimerDS" pool-name="XAMimerDS">
     <min-pool-size>5</min-pool-size>
     <max-pool-size>100</max-pool-size>
@@ -23,4 +15,4 @@
       <idle-timeout-minutes>15</idle-timeout-minutes>
     </time-out>
   </xa-datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/msaccess-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/msaccess-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/msaccess-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: msaccess-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
-<!-- ==================================================================== -->
-<!-- This uses the sun jdbc-odbc driver, so don't expect miracles -->
-<!-- Thanks to Alan Moor, who warns... -->
-<!-- Remember, though, never trust critical data, or data that you can't -->
-<!-- afford to lose, or data that you need quick access to, or data that -->
-<!-- needs to be secure, to Microsoft Access. -->
 <!-- ===================================================================== -->
 <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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="MSAccessDS" pool-name="MSAccessDS">
     <user-name>x</user-name>
     <password>y</password>
@@ -22,4 +11,4 @@
     <connection-url>jdbc:odbc:INsightDSN</connection-url>
     <driver-class>sun.jdbc.odbc.JdbcOdbcDriver</driver-class>
   </datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: mssql-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
-<!-- ====================================================================== -->
-<!-- New ConnectionManager setup for Microsoft SQL Server 2005 driver -->
-<!-- Further information about the Microsoft JDBC Driver version 1.1 -->
-<!-- can be found here: -->
-<!-- http://msdn2.microsoft.com/en-us/library/aa496082.aspx -->
 <!-- ===================================================================== -->
 <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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="MSSQLDS" pool-name="MSSQLDS">
     <user-name>x</user-name>
     <password>y</password>
@@ -25,4 +15,4 @@
     </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/mssql-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-xa-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-<!-- $Id: mssql-xa-ds.xml 93459 2009-09-14 08:49:20Z istudens at redhat.com $ -->
-<!-- ==================================================================== -->
-<!-- ConnectionManager setup for xa Microsoft SQL Server 2005, using -->
-<!-- Microsoft's JDBC driver. -->
-<!-- Thanks to Benjamin Geer <benjamin.geer at misys.com> -->
-<!-- Be sure to set the JndiName property to the name you want to look up -->
-<!-- the datasource under and set the location of your database in -->
-<!-- the xa-datasource-property section. -->
-<!-- Further information about the Microsoft JDBC Driver version 1.1 -->
-<!-- can be found here: -->
-<!-- http://msdn2.microsoft.com/en-us/library/aa496082.aspx -->
-<!-- ==================================================================== -->
 <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="MSSQLXADS" pool-name="MSSQLXADS">
@@ -28,4 +11,4 @@
     <!-- uncomment to enable interleaving <interleaving/> -->
     <is-same-rm-override>false</is-same-rm-override>
   </xa-datasource>
-</datasources>
\ No newline at end of file
+</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-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: mysql-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
-<!-- Datasource config for MySQL using 3.0.9 available from: http://www.mysql.com/downloads/api-jdbc-stable.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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="MySqlDS" pool-name="MySqlDS">
     <user-name>x</user-name>
     <password>y</password>
@@ -19,4 +18,4 @@
     </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/mysql-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: mysql-ds.xml 88948 2009-05-15 14:09:08Z jesper.pedersen $ -->
-<!-- Datasource config for MySQL using 3.0.9 available from: http://www.mysql.com/downloads/api-jdbc-stable.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/jee/schema/ironjacamar/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>
@@ -15,6 +14,5 @@
         for newer drivers <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> -->
-    <track-connection-by-tx>true</track-connection-by-tx>
   </xa-datasource>
-</datasources>
\ No newline at end of file
+</datasources>

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-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: oracle-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
-<!-- ==================================================================== -->
-<!-- Datasource config for Oracle originally from Steven Coy -->
-<!-- ==================================================================== -->
+<!-- ===================================================================== -->
 <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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="OracleDS" pool-name="OracleDS">
     <user-name>x</user-name>
     <password>y</password>
@@ -29,4 +22,4 @@
     </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/oracle-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-<!-- $Id: oracle-xa-ds.xml 77479 2008-08-26 10:33:09Z alex.loubyansky at jboss.com $ -->
-<!-- ===================================================================== -->
 <!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
 <!-- ===================================================================== -->
 <datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,4 +21,4 @@
     </validation>
     <no-tx-separate-pools />
   </xa-datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Example of the pointbase 4.8 datasource configuration -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: pointbase-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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="DefaultDS" pool-name="DefaultDS">
     <user-name>@pointbase.user@</user-name>
     <password>@pointbase.passwd@</password>
@@ -11,4 +9,4 @@
     <driver-class>com.pointbase.jdbc.jdbcUniversalDriver</driver-class>
     <!-- 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/pointbase-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-xa-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Example of the pointbase 4.8 XA datasource configuration -->
-<!-- $Id: pointbase-xa-ds.xml 23720 2004-09-15 14:37:40Z loubyansky $ -->
 <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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <xa-datasource jndi-name="PointbaseXA" pool-name="PointbaseXA">
     <user-name>@pointbase.user@</user-name>
     <password>@pointbase.passwd@</password>
@@ -10,4 +8,4 @@
     <xa-datasource-property name="DatabaseName">9092</xa-datasource-property>
     <xa-datasource-class>com.pointbase.xa.xaDataSource</xa-datasource-class>
   </xa-datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  JBoss Server Configuration                                           -->
-<!--                                                                       -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
 <!-- ===================================================================== -->
 
-<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: postgres-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
-<!-- ==================================================================== -->
-<!--  Datasource config for Postgres                                      -->
-<!-- ==================================================================== -->
-
-
 <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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="PostgresDS" pool-name="PostgresDS">
      <user-name>x</user-name>
     <password>y</password>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-xa-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
+
 <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/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>
@@ -13,6 +9,5 @@
     <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>
-    <track-connection-by-tx>true</track-connection-by-tx>
   </xa-datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/progress-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/progress-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/progress-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: progress-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
 <!-- ==================================================================== -->
-<!-- Datasource config for Progress 9.1 -->
-<!-- -->
-<!-- Based on config provided by victorstar in the forums -->
-<!-- -->
-<!-- Beside adding the driver jar to server/[config]/lib you also -->
-<!-- need to add the native library to your path. -->
-<!-- e.g. JdbcProgress.dll on windows -->
-<!-- ==================================================================== -->
 <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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="ProgressDS" pool-name="ProgressDS">
     <user-name>user</user-name>
     <password>password</password>
     <connection-url>jdbc:JdbcProgress:T:dbserver:3305:liveappl</connection-url>
     <driver-class>com.progress.sql.jdbc.JdbcProgressDriver</driver-class>
   </datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/sapdb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/sapdb-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sapdb-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- New ConnectionManager setup for Sapdb using the sapdbc driver -->
-<!-- Thanks to Kasper Nielsen <news at kav.dk> -->
-<!-- See http://www.sapdb.org/sap_db_jdbc.htm for details -->
-<!-- This is a minimal example. See the generic example for other stuff -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: sapdb-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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="SapdbDS" pool-name="SapdbDS">
     <user-name>x</user-name>
     <password>y</password>
     <connection-url>jdbc:sapdb://127.0.0.1/DB_NAME</connection-url>
     <driver-class>com.sap.dbtech.jdbc.DriverSapDB</driver-class>
   </datasource>
-</datasources>
\ No newline at end of file
+</datasources>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/solid-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/solid-ds.xml	2010-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/solid-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: solid-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
-<!-- ==================================================================== -->
-<!-- DataSource configuration for solid using 3.0 driver -->
-<!-- Thanks to Casey Haakenson -->
-<!-- ==================================================================== -->
+<!-- ===================================================================== -->
 <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/jee/schema/ironjacamar/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>
\ No newline at end of file
+</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-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- New ConnectionManager setup for Sybase ASE/ASA jConnect driver -->
-<!-- Thanks to Marc Zampetti <zampetti at aol.net> -->
-<!-- This is a minimal example. See the generic example for other stuff -->
-<!-- ===================================================================== -->
 <!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about datasource -->
-<!-- $Id: sybase-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/jee/schema/ironjacamar/datasources_1_0.xsd">
   <datasource jndi-name="jdbc/SybaseDB" pool-name="jdbc/SybaseDB">
     <user-name>x</user-name>
     <password>y</password>
@@ -25,4 +18,4 @@
     </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-08-30 13:00:49 UTC (rev 107887)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml	2010-08-30 13:25:21 UTC (rev 107888)
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- Thanks to kosulin in the forumns -->
-<!-- ===================================================================== -->
-<!-- $Id: sybase-xa-ds.xml 93459 2009-09-14 08:49:20Z istudens at redhat.com $ -->
 <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/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 
@@ -38,4 +32,4 @@
       <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
     </validation>
   </xa-datasource>
-</datasources>
\ No newline at end of file
+</datasources>



More information about the jboss-cvs-commits mailing list