[jboss-cvs] JBossAS SVN: r66052 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 11 17:48:08 EDT 2007
Author: weston.price at jboss.com
Date: 2007-10-11 17:48:08 -0400 (Thu, 11 Oct 2007)
New Revision: 66052
Modified:
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxConnectionFactoryDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxDataSourceDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
Log:
[JBAS-1425] [JBAS-4809] Reworked and cleaned up metadata for
transaction support where local transactions were being flagged incorrectly for both datasources and non-datasource deployments.
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-11 21:43:31 UTC (rev 66051)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java 2007-10-11 21:48:08 UTC (rev 66052)
@@ -41,8 +41,8 @@
public int getIdleTimeoutMinutes();
public void setIdleTimeoutMinutes(int idleTimeout);
- public void setPrefill(boolean prefill);
- public boolean isPrefill();
+ public void setPrefill(Boolean prefill);
+ public Boolean isPrefill();
public void setBackgroundValidation(boolean bgv);
public boolean isBackgroundValidation();
@@ -52,7 +52,9 @@
public void setValidateOnMatch(boolean validateOnMatch);
public boolean isValidateOnMatch();
-
+ public void setNoTxSeperatePools(boolean notxpool);
+ public boolean getNoTxSeparatePools();
+
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java 2007-10-11 21:43:31 UTC (rev 66051)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java 2007-10-11 21:48:08 UTC (rev 66052)
@@ -49,4 +49,10 @@
setLocalTransactions(true);
setTransactionSupportMetaData(ManagedConnectionFactoryTransactionSupportMetaData.LOCAL);
}
+
+ @Override
+ public Boolean getLocalTransactions()
+ {
+ return Boolean.TRUE;
+ }
}
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-11 21:43:31 UTC (rev 66051)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java 2007-10-11 21:48:08 UTC (rev 66052)
@@ -41,7 +41,7 @@
Boolean results = Boolean.FALSE;
- if (e.getNodeName().equals("track-connection-by-tx") || e.getNodeName().equals("no-tx-separate-pools")
+ if (e.getNodeName().equals("track-connection-by-tx") || e.getNodeName().equals("no-tx-seperate-pools")
|| e.getNodeName().equals("local-transaction") || e.getNodeName().equals("use-strict-min") || e.getNodeName().equals("xa-transaction"))
{
results = Boolean.TRUE;
@@ -52,7 +52,7 @@
}
@Override
- public Object marshal(Boolean arg0) throws Exception
+ public Object marshal(Boolean b) throws Exception
{
return null;
}
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-11 21:43:31 UTC (rev 66051)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-10-11 21:48:08 UTC (rev 66052)
@@ -33,7 +33,6 @@
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;
import org.jboss.managed.api.annotation.ManagementObjectID;
import org.jboss.managed.api.annotation.ManagementObjectRef;
@@ -90,7 +89,7 @@
private int idleTimeout = 30;
@XmlElement(name="prefill")
- private boolean prefill;
+ private Boolean prefill = Boolean.FALSE;
@XmlElement(name="background-validation")
private boolean backgroundValidation;
@@ -104,6 +103,10 @@
@XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
@XmlElement(name="use-strict-min")
private Boolean useStrictMin = Boolean.FALSE;
+
+ @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
+ @XmlElement(name="no-tx-seperate-pools")
+ private Boolean noTxSeperatePools = Boolean.FALSE;
@XmlElement(name="statistics-formatter")
private String statisticsFormatter = "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter";
@@ -139,7 +142,7 @@
/** The localTransactions */
@XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
@XmlElement(name="local-transaction")
- private Boolean localTransactions = Boolean.TRUE;
+ private Boolean localTransactions = Boolean.FALSE;
/**
@@ -427,12 +430,12 @@
}
@ManagementProperty(name="prefill")
- public void setPrefill(boolean prefill)
+ public void setPrefill(Boolean prefill)
{
this.prefill = prefill;
}
- public boolean isPrefill()
+ public Boolean isPrefill()
{
return this.prefill;
@@ -527,4 +530,14 @@
{
this.statisticsFormatter = statisticsFormatter;
}
+
+ public boolean getNoTxSeparatePools()
+ {
+ return this.noTxSeperatePools;
+ }
+
+ public void setNoTxSeperatePools(boolean notxpool)
+ {
+ this.noTxSeperatePools = notxpool;
+ }
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxConnectionFactoryDeploymentMetaData.java 2007-10-11 21:43:31 UTC (rev 66051)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxConnectionFactoryDeploymentMetaData.java 2007-10-11 21:48:08 UTC (rev 66052)
@@ -43,12 +43,6 @@
private static final long serialVersionUID = -8637168894246737692L;
@Override
- public Boolean getLocalTransactions()
- {
- return false;
- }
-
- @Override
@ManagementProperty(ignored=true)
public ManagedConnectionFactoryTransactionSupportMetaData getTransactionSupportMetaData()
{
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxDataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxDataSourceDeploymentMetaData.java 2007-10-11 21:43:31 UTC (rev 66051)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxDataSourceDeploymentMetaData.java 2007-10-11 21:48:08 UTC (rev 66052)
@@ -48,4 +48,6 @@
return ManagedConnectionFactoryTransactionSupportMetaData.NONE;
}
+
+
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java 2007-10-11 21:43:31 UTC (rev 66051)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java 2007-10-11 21:48:08 UTC (rev 66052)
@@ -56,7 +56,7 @@
@XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
@XmlElement(name="xa-transaction")
- private Boolean xaTransaction;
+ private Boolean xaTransaction = Boolean.FALSE;
public int getXaResourceTimeout()
{
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2007-10-11 21:43:31 UTC (rev 66051)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2007-10-11 21:48:08 UTC (rev 66052)
@@ -91,7 +91,7 @@
{
this.xaDataSourceProperties = xaDataSourceProperties;
}
-
+
@Override
@ManagementProperty(name="config-property", description="The connection factory property info", managed=true)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
More information about the jboss-cvs-commits
mailing list