[jboss-cvs] JBossAS SVN: r75434 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 7 07:05:22 EDT 2008
Author: jeff.zhang
Date: 2008-07-07 07:05:22 -0400 (Mon, 07 Jul 2008)
New Revision: 75434
Modified:
trunk/connector/src/main/org/jboss/resource/metadata/mcf/DBMSMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
Log:
[JBAS-5715] -ds.xml not trimming whitespace in jboss5
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/DBMSMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/DBMSMetaData.java 2008-07-07 10:37:13 UTC (rev 75433)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/DBMSMetaData.java 2008-07-07 11:05:22 UTC (rev 75434)
@@ -26,6 +26,8 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
/**
* A DBMSMetaData.
@@ -40,6 +42,7 @@
private static final long serialVersionUID = -5511233258559770711L;
@XmlElement(name="type-mapping")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String typeMapping;
public String getTypeMapping()
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2008-07-07 10:37:13 UTC (rev 75433)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2008-07-07 11:05:22 UTC (rev 75434)
@@ -25,6 +25,8 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
@@ -45,30 +47,39 @@
private static final String RAR_NAME = "jboss-local-jdbc.rar";
@XmlElement(name="transaction-isolation")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String transactionIsolation;
@XmlElement(name="user-name")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String userName;
@XmlElement(name="password")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String passWord;
@XmlElement(name="new-connection-sql")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String newConnectionSQL;
@XmlElement(name="check-valid-connection-sql")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String checkValidConnectionSQL;
@XmlElement(name="valid-connection-checker-class-name")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String validConnectionCheckerClassName;
@XmlElement(name="exception-sorter-class-name")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String exceptionSorterClassName;
@XmlElement(name="stale-connection-checker-class-name")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String staleConnectionCheckerClassName;
@XmlElement(name="track-statements")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String trackStatements;
@XmlElement(name="prepared-statement-cache-size")
@@ -87,9 +98,11 @@
private long useTryLock;
@XmlElement(name="url-delimiter")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String urlDelimiter;
@XmlElement(name="url-selector-strategy-class-name")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String urlSelectorStrategyClassName;
public DataSourceDeploymentMetaData()
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2008-07-07 10:37:13 UTC (rev 75433)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2008-07-07 11:05:22 UTC (rev 75434)
@@ -59,10 +59,12 @@
/** The jndiName */
@XmlElement(name="jndi-name")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String jndiName;
/** The rarName */
@XmlElement(name="rar-name")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String rarName;
/** The useJavaContext */
@@ -76,6 +78,7 @@
/** The jmxInvokerName */
@XmlElement(name="jmx-invoker-name")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String jmxInvokerName = "jboss:service=invoker,type=jrmp";
@XmlElement(name="min-pool-size")
@@ -111,6 +114,7 @@
private Boolean noTxSeparatePools = Boolean.FALSE;
@XmlElement(name="statistics-formatter")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String statisticsFormatter = "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter";
@XmlElement(name="isSameRM-override-value")
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2008-07-07 10:37:13 UTC (rev 75433)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2008-07-07 11:05:22 UTC (rev 75434)
@@ -27,6 +27,8 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
@@ -45,9 +47,11 @@
public abstract class NonXADataSourceDeploymentMetaData extends DataSourceDeploymentMetaData
{
@XmlElement(name="driver-class", required=true)
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String driverClass;
@XmlElement(name="connection-url", required=true)
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String connectionUrl;
@XmlElement(name="connection-property")
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2008-07-07 10:37:13 UTC (rev 75433)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2008-07-07 11:05:22 UTC (rev 75434)
@@ -28,6 +28,8 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.managed.api.annotation.ManagementComponent;
import org.jboss.managed.api.annotation.ManagementObject;
@@ -54,12 +56,14 @@
private static final String RAR_NAME = "jboss-xa-jdbc.rar";
@XmlElement(name="xa-datasource-class")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String xaDataSourceClass;
@XmlElement(name="xa-datasource-property")
private List<XAConnectionPropertyMetaData> xaDataSourceProperties = new ArrayList<XAConnectionPropertyMetaData>();
@XmlElement(name="url-property")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String urlProperty;
@XmlElement(name="xa-resource-timeout")
More information about the jboss-cvs-commits
mailing list