[jboss-cvs] JBossAS SVN: r110343 - branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jan 12 18:00:30 EST 2011


Author: raggz
Date: 2011-01-12 18:00:30 -0500 (Wed, 12 Jan 2011)
New Revision: 110343

Added:
   branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/BooleanSystemPropertyXmlJavaTypeAdapter.java
Modified:
   branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
   branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
   branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
Log:
JBPAPP-5758

Copied: branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/BooleanSystemPropertyXmlJavaTypeAdapter.java (from rev 110330, branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/metadata/mcf/BooleanSystemPropertyXmlJavaTypeAdapter.java)
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/BooleanSystemPropertyXmlJavaTypeAdapter.java	                        (rev 0)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/BooleanSystemPropertyXmlJavaTypeAdapter.java	2011-01-12 23:00:30 UTC (rev 110343)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.resource.metadata.mcf;
+
+/**
+ * A BooleanSystemPropertyXmlJavaTypeAdapter.
+ * 
+ * @author <a href="jeff.zhang at jboss.org">Jeff Zhang</a>
+ * @version $Revision:  $
+ */
+public class BooleanSystemPropertyXmlJavaTypeAdapter extends AbstractSystemPropertyXmlJavaTypeAdapter<Boolean>
+{
+   @Override
+   Boolean convertType(String v)
+   {
+      return Boolean.parseBoolean(v);
+   }
+}

Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java	2011-01-12 22:09:54 UTC (rev 110342)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java	2011-01-12 23:00:30 UTC (rev 110343)
@@ -88,10 +88,12 @@
    private Integer preparedStatementCacheSize = 0;
    
    @XmlElement(name="share-prepared-statements")
-   private boolean sharePreparedStatements;
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
+   private Boolean sharePreparedStatements = Boolean.FALSE;
    
    @XmlElement(name="set-tx-query-timeout")
-   private boolean useQueryTimeout;
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
+   private Boolean useQueryTimeout = Boolean.FALSE;
    
    @XmlElement(name="query-timeout")
    @XmlJavaTypeAdapter(IntegerSystemPropertyXmlJavaTypeAdapter.class)

Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2011-01-12 22:09:54 UTC (rev 110342)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2011-01-12 23:00:30 UTC (rev 110343)
@@ -74,7 +74,8 @@
    
    /** The useJavaContext */
    @XmlElement(name="use-java-context")
-   private boolean useJavaContext = true;   
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
+   private Boolean useJavaContext = Boolean.TRUE;
    
    /** The connectionDefinition */
    @XmlElement(name="connection-definition")
@@ -103,17 +104,20 @@
    private Integer idleTimeout = 30;
    
    @XmlElement(name="prefill")
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
    private Boolean prefill = Boolean.FALSE;
    
    @XmlElement(name="background-validation")
-   private boolean backgroundValidation;
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
+   private Boolean backgroundValidation = Boolean.FALSE;
    
    @XmlElement(name="background-validation-millis")
    @XmlJavaTypeAdapter(LongSystemPropertyXmlJavaTypeAdapter.class)
    private Long backgroundValidationMillis = new Long(0L);
 
    @XmlElement(name="validate-on-match")
-   private boolean validateOnMatch = true;
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
+   private Boolean validateOnMatch = Boolean.TRUE;
    
    @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
    @XmlElement(name="use-strict-min")
@@ -128,6 +132,7 @@
    private String statisticsFormatter = "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter";
    
    @XmlElement(name="isSameRM-override-value")
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
    private Boolean isSameRMOverrideValue = Boolean.FALSE;
 
    // is always true now and left here for the xml binding

Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2011-01-12 22:09:54 UTC (rev 110342)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5758/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2011-01-12 23:00:30 UTC (rev 110343)
@@ -80,6 +80,7 @@
    private String recoverPassWord;
 
    @XmlElement(name="no-recover")
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
    private Boolean noRecover = Boolean.FALSE;
 
    /** The recoverSecurityMetaData */



More information about the jboss-cvs-commits mailing list