[jboss-cvs] JBossAS SVN: r107525 - in projects/jboss-jca/trunk: adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2010-08-10 13:28:42 -0400 (Tue, 10 Aug 2010)
New Revision: 107525

Modified:
   projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnectionFactory.java
   projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java
   projects/jboss-jca/trunk/lib/
Log:
[JBJCA-399] Initial JDBC resource adapter import

Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnectionFactory.java	2010-08-10 15:04:17 UTC (rev 107524)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnectionFactory.java	2010-08-10 17:28:42 UTC (rev 107525)
@@ -99,7 +99,7 @@
    protected int transactionIsolation = -1;
 
    /** The prepared statement cache size */
-   protected int preparedStatementCacheSize = 0;
+   protected Integer preparedStatementCacheSize = Integer.valueOf(0);
 
    /** Query timeout enabled */
    protected boolean doQueryTimeout = false;
@@ -144,13 +144,13 @@
    protected int trackStatements = TRACK_STATEMENTS_NOWARN_INT;
 
    /** Whether to share cached prepared statements */
-   protected boolean sharePS = false;
+   protected Boolean sharePS = Boolean.FALSE;
    
    /** Transaction query timeout */
-   protected boolean isTransactionQueryTimeout = false;
+   protected Boolean isTransactionQueryTimeout = Boolean.FALSE;
    
    /** Query timeout */
-   protected int queryTimeout = 0;
+   protected Integer queryTimeout = Integer.valueOf(0);
    
    /** 
     * The variable <code>urlDelimiter</code> holds the url delimiter 
@@ -163,7 +163,7 @@
 
    private URLSelectorStrategy urlSelectorStrategy;
 
-   private boolean validateOnMatch = true;
+   private Boolean validateOnMatch = Boolean.TRUE;
 
    /** Whether to use a try lock */
    private Integer useTryLock = Integer.valueOf(60);
@@ -246,7 +246,7 @@
     * Get the prepared statement cache size
     * @return The value
     */
-   public int getPreparedStatementCacheSize()
+   public Integer getPreparedStatementCacheSize()
    {
       return preparedStatementCacheSize;
    }
@@ -255,16 +255,17 @@
     * Set the prepared statement cache size
     * @param size The value
     */
-   public void setPreparedStatementCacheSize(int size)
+   public void setPreparedStatementCacheSize(Integer size)
    {
-      preparedStatementCacheSize = size;
+      if (size != null)
+         preparedStatementCacheSize = size;
    }
 
    /**
     * Get the prepared statement share status
     * @return The value
     */
-   public boolean getSharePreparedStatements()
+   public Boolean getSharePreparedStatements()
    {
       return sharePS;
    }
@@ -273,9 +274,10 @@
     * Set the prepared statement share status
     * @param sharePS The value
     */
-   public void setSharePreparedStatements(boolean sharePS)
+   public void setSharePreparedStatements(Boolean sharePS)
    {
-      this.sharePS = sharePS;
+      if (sharePS != null)
+         this.sharePS = sharePS;
    }
 
    /**
@@ -443,7 +445,7 @@
     * Get the validate on match value
     * @return The value
     */
-   public boolean getValidateOnMatch()
+   public Boolean getValidateOnMatch()
    {
       return this.validateOnMatch;
    }
@@ -452,9 +454,10 @@
     * Set the validate on match value
     * @param validateOnMatch The value
     */
-   public void setValidateOnMatch(boolean validateOnMatch)
+   public void setValidateOnMatch(Boolean validateOnMatch)
    {
-      this.validateOnMatch = validateOnMatch;
+      if (validateOnMatch != null)
+         this.validateOnMatch = validateOnMatch;
    }
    
    /**
@@ -497,7 +500,7 @@
     * Is transaction query timeout set
     * @return The value
     */
-   public boolean isTransactionQueryTimeout()
+   public Boolean isTransactionQueryTimeout()
    {
       return isTransactionQueryTimeout;
    }
@@ -506,16 +509,17 @@
     * Set transaction query timeout
     * @param value The value
     */
-   public void setTransactionQueryTimeout(boolean value)
+   public void setTransactionQueryTimeout(Boolean value)
    {
-      isTransactionQueryTimeout = value;
+      if (value != null)
+         isTransactionQueryTimeout = value;
    }
 
    /**
     * Get the query timeout
     * @return The value
     */
-   public int getQueryTimeout()
+   public Integer getQueryTimeout()
    {
       return queryTimeout;
    }
@@ -524,9 +528,10 @@
     * Set the query timeout
     * @param timeout The value
     */
-   public void setQueryTimeout(int timeout)
+   public void setQueryTimeout(Integer timeout)
    {
-      queryTimeout = timeout;
+      if (timeout != null)
+         queryTimeout = timeout;
    }
    
    /**

Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java	2010-08-10 15:04:17 UTC (rev 107524)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java	2010-08-10 17:28:42 UTC (rev 107525)
@@ -149,7 +149,7 @@
 
       if (xaDataSourceProperties != null)
       {
-         // Map any \ to \                                              \
+         // Map any \ to \\
          xaDataSourceProperties = xaDataSourceProperties.replaceAll("\\\\", "\\\\\\\\");
          
          InputStream is = new ByteArrayInputStream(xaDataSourceProperties.getBytes());


Property changes on: projects/jboss-jca/trunk/lib
___________________________________________________________________
Name: svn:ignore
   - *.jar
standalone
test
qe
sjc
common
embedded
jetty
arquillian
ironjacamar-core-api
ironjacamar-deployers-fungal
ironjacamar-codegenerator
ironjacamar-spec-api
ironjacamar-validator-ant
ironjacamar-validator
ironjacamar-common-impl
ironjacamar-core-impl
ironjacamar-embedded-arquillian
ironjacamar-embedded

   + *.jar
standalone
test
qe
sjc
common
embedded
jetty
arquillian
tools
ironjacamar-core-api
ironjacamar-deployers-fungal
ironjacamar-codegenerator
ironjacamar-spec-api
ironjacamar-validator-ant
ironjacamar-validator
ironjacamar-common-impl
ironjacamar-core-impl
ironjacamar-embedded-arquillian
ironjacamar-embedded