[jboss-cvs] JBossAS SVN: r65798 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.

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

Author: adrian at jboss.org
Date: 2007-10-03 09:52:54 -0400 (Wed, 03 Oct 2007)
New Revision: 65798

Modified:
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/JDBCProviderSupport.java
Log:
[JBAS-1425] - Fix the properties that have primitive types and also change TrackStatements to be java.lang.String

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java	2007-10-03 12:18:15 UTC (rev 65797)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java	2007-10-03 13:52:54 UTC (rev 65798)
@@ -68,7 +68,7 @@
    private String staleConnectionCheckerClassName;
    
    @XmlElement(name="track-statements")
-   private boolean trackStatements = false;
+   private String trackStatements;
    
    @XmlElement(name="prepared-statement-cache-size")
    private int preparedStatementCacheSize = 0;
@@ -243,13 +243,13 @@
       this.sharePreparedStatements = sharePreparedStatements;
    }
 
-   @ManagementProperty(name="track-statements", description="The query timeout")
-   public boolean isTrackStatements()
+   @ManagementProperty(name="track-statements", description="The track statements method")
+   public String getTrackStatements()
    {
       return trackStatements;
    }
 
-   public void setTrackStatements(boolean trackStatements)
+   public void setTrackStatements(String trackStatements)
    {
       this.trackStatements = trackStatements;
    }
@@ -359,39 +359,42 @@
       
       property = new ManagedConnectionFactoryPropertyMetaData();
       property.setName("PreparedStatementCacheSize");
-      property.setType("java.lang.Integer");
+      property.setType("int");
       property.setValue(String.valueOf(getPreparedStatementCacheSize()));
       properties.add(property);
       
       property = new ManagedConnectionFactoryPropertyMetaData();
       property.setName("SharePreparedStatements");
-      property.setType("java.lang.Boolean");
+      property.setType("boolean");
       property.setValue(String.valueOf(isSharePreparedStatements()));
       properties.add(property);
       
       property = new ManagedConnectionFactoryPropertyMetaData();
       property.setName("QueryTimeout");
-      property.setType("java.lang.Integer");
+      property.setType("int");
       property.setValue(String.valueOf(getQueryTimeout()));
       properties.add(property);
       
       property = new ManagedConnectionFactoryPropertyMetaData();
       property.setName("TransactionQueryTimeout");
-      property.setType("java.lang.Boolean");
+      property.setType("boolean");
       property.setValue(String.valueOf(isUseQueryTimeout()));
       properties.add(property);
       
       property = new ManagedConnectionFactoryPropertyMetaData();
       property.setName("ValidateOnMatch");
-      property.setType("java.lang.Boolean");
+      property.setType("boolean");
       property.setValue(String.valueOf(isValidateOnMatch()));
       properties.add(property);
       
-      property = new ManagedConnectionFactoryPropertyMetaData();
-      property.setName("TrackStatements");
-      property.setType("java.lang.Boolean");
-      property.setValue(String.valueOf(isTrackStatements()));
-      properties.add(property);
+      if (getTrackStatements() != null)
+      {
+         property = new ManagedConnectionFactoryPropertyMetaData();
+         property.setName("TrackStatements");
+         property.setType("java.lang.String");
+         property.setValue(String.valueOf(getTrackStatements()));
+         properties.add(property);
+      }
       
       return properties;
    }

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/JDBCProviderSupport.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/JDBCProviderSupport.java	2007-10-03 12:18:15 UTC (rev 65797)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/JDBCProviderSupport.java	2007-10-03 13:52:54 UTC (rev 65798)
@@ -41,8 +41,8 @@
    public String getExceptionSorterClassName();
    public void setExceptionSorterClassName(String exceptionSorterClassName);
    
-   public void setTrackStatements(boolean trackStatements);
-   public boolean isTrackStatements();
+   public void setTrackStatements(String trackStatements);
+   public String getTrackStatements();
    
    public void setPreparedStatementCacheSize(int cacheSize);
    public int getPreparedStatementCacheSize();