[jboss-cvs] JBossAS SVN: r66180 - in trunk: connector/src/main/org/jboss/resource/metadata/mcf and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 16 10:40:48 EDT 2007
Author: alesj
Date: 2007-10-16 10:40:47 -0400 (Tue, 16 Oct 2007)
New Revision: 66180
Modified:
trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/DBMSMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
trunk/testsuite/src/resources/jca/deployment/empty-content-ds.xml
trunk/testsuite/src/resources/jca/deployment/invalid-content-ds.xml
Log:
Fixing javabean property names and types (use IDE next time!).
Making DBMSMMetaData serializable.
Modified: trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java 2007-10-16 14:22:33 UTC (rev 66179)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java 2007-10-16 14:40:47 UTC (rev 66180)
@@ -92,7 +92,7 @@
poolAttribute = buildSimpleAttribute("BackGroundValidationMinutes", String.valueOf(md.getBackgroundValidationMinutes()));
poolAttributes.add(poolAttribute);
- poolAttribute = buildSimpleAttribute("PreFill", String.valueOf(md.isPrefill()));
+ poolAttribute = buildSimpleAttribute("PreFill", String.valueOf(md.getPrefill()));
poolAttributes.add(poolAttribute);
poolAttribute = buildSimpleAttribute("StrictMin", String.valueOf(md.getUseStrictMin()));
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java 2007-10-16 14:22:33 UTC (rev 66179)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java 2007-10-16 14:40:47 UTC (rev 66180)
@@ -42,7 +42,7 @@
public void setIdleTimeoutMinutes(int idleTimeout);
public void setPrefill(Boolean prefill);
- public Boolean isPrefill();
+ public Boolean getPrefill();
public void setBackgroundValidation(boolean bgv);
public boolean isBackgroundValidation();
@@ -53,8 +53,6 @@
public void setValidateOnMatch(boolean validateOnMatch);
public boolean isValidateOnMatch();
- public void setNoTxSeperatePools(boolean notxpool);
- public boolean getNoTxSeparatePools();
-
-
+ public void setNoTxSeparatePools(Boolean notxpool);
+ public Boolean getNoTxSeparatePools();
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/DBMSMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/DBMSMetaData.java 2007-10-16 14:22:33 UTC (rev 66179)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/DBMSMetaData.java 2007-10-16 14:40:47 UTC (rev 66180)
@@ -21,6 +21,7 @@
*/
package org.jboss.resource.metadata.mcf;
+import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@@ -34,8 +35,10 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name="metadata")
-public class DBMSMetaData
+public class DBMSMetaData implements Serializable
{
+ private static final long serialVersionUID = -5511233258559770711L;
+
@XmlElement(name="type-mapping")
private String typeMapping;
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java 2007-10-16 14:22:33 UTC (rev 66179)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java 2007-10-16 14:40:47 UTC (rev 66180)
@@ -41,7 +41,7 @@
Boolean results = Boolean.FALSE;
- if (e.getNodeName().equals("track-connection-by-tx") || e.getNodeName().equals("no-tx-seperate-pools")
+ if (e.getNodeName().equals("track-connection-by-tx") || e.getNodeName().equals("no-tx-separate-pools")
|| e.getNodeName().equals("local-transaction") || e.getNodeName().equals("use-strict-min") || e.getNodeName().equals("xa-transaction"))
{
results = Boolean.TRUE;
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-10-16 14:22:33 UTC (rev 66179)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-10-16 14:40:47 UTC (rev 66180)
@@ -105,8 +105,8 @@
private Boolean useStrictMin = Boolean.FALSE;
@XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
- @XmlElement(name="no-tx-seperate-pools")
- private Boolean noTxSeperatePools = Boolean.FALSE;
+ @XmlElement(name="no-tx-separate-pools")
+ private Boolean noTxSeparatePools = Boolean.FALSE;
@XmlElement(name="statistics-formatter")
private String statisticsFormatter = "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter";
@@ -438,7 +438,7 @@
this.prefill = prefill;
}
- public Boolean isPrefill()
+ public Boolean getPrefill()
{
return this.prefill;
@@ -534,14 +534,14 @@
this.statisticsFormatter = statisticsFormatter;
}
- public boolean getNoTxSeparatePools()
+ public Boolean getNoTxSeparatePools()
{
- return this.noTxSeperatePools;
+ return this.noTxSeparatePools;
}
- public void setNoTxSeperatePools(boolean notxpool)
+ public void setNoTxSeparatePools(Boolean notxpool)
{
- this.noTxSeperatePools = notxpool;
+ this.noTxSeparatePools = notxpool;
}
public DBMSMetaData getDBMSMetaData()
Modified: trunk/testsuite/src/resources/jca/deployment/empty-content-ds.xml
===================================================================
--- trunk/testsuite/src/resources/jca/deployment/empty-content-ds.xml 2007-10-16 14:22:33 UTC (rev 66179)
+++ trunk/testsuite/src/resources/jca/deployment/empty-content-ds.xml 2007-10-16 14:40:47 UTC (rev 66180)
@@ -9,7 +9,7 @@
<type-mapping>Hypersonic SQL</type-mapping>
</metadata>
<track-connection-by-tx/>
- <no-tx-seperate-pools/>
+ <no-tx-separate-pools/>
<use-strict-min/>
</local-tx-datasource>
</datasources>
\ No newline at end of file
Modified: trunk/testsuite/src/resources/jca/deployment/invalid-content-ds.xml
===================================================================
--- trunk/testsuite/src/resources/jca/deployment/invalid-content-ds.xml 2007-10-16 14:22:33 UTC (rev 66179)
+++ trunk/testsuite/src/resources/jca/deployment/invalid-content-ds.xml 2007-10-16 14:40:47 UTC (rev 66180)
@@ -8,7 +8,7 @@
<type-mapping>Hypersonic SQL</type-mapping>
</metadata>
<track-connection-by-tx/>
- <no-tx-seperate-pools/>
+ <no-tx-separate-pools/>
<use-strict-min/>
</local-tx-datasource>
</datasources>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list