[jboss-cvs] JBossAS SVN: r65797 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 3 08:18:16 EDT 2007
Author: adrian at jboss.org
Date: 2007-10-03 08:18:15 -0400 (Wed, 03 Oct 2007)
New Revision: 65797
Modified:
trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.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-1425] - Bring the datasource deployment up-to-date with JBoss5 MCFs
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 10:53:41 UTC (rev 65796)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2007-10-03 12:18:15 UTC (rev 65797)
@@ -25,7 +25,6 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
import org.jboss.managed.api.annotation.ManagementProperty;
@@ -46,9 +45,6 @@
@XmlElement(name="transaction-isolation")
private String transactionIsolation;
-
- @XmlElements({@XmlElement(name="xa-datasource-property"), @XmlElement(name="connection-property")})
- private List<DataSourceConnectionPropertyMetaData> connectionProperties = new ArrayList<DataSourceConnectionPropertyMetaData>();
@XmlElement(name="user-name")
private String userName;
@@ -68,6 +64,9 @@
@XmlElement(name="exception-sorter-class-name")
private String exceptionSorterClassName;
+ @XmlElement(name="stale-connection-checker-class-name")
+ private String staleConnectionCheckerClassName;
+
@XmlElement(name="track-statements")
private boolean trackStatements = false;
@@ -83,6 +82,12 @@
@XmlElement(name="query-timeout")
private int queryTimeout;
+ @XmlElement(name="url-delimiter")
+ private String urlDelimiter;
+
+ @XmlElement(name="url-selector-strategy-class-name")
+ private String urlSelectorStrategyClassName;
+
public DataSourceDeploymentMetaData()
{
setConnectionDefinition(CONNECTION_DEFINITION);
@@ -101,12 +106,6 @@
{
this.transactionIsolation = transactionIsolation;
}
-
- @ManagementProperty(name="connection-property", description="The DataSource connection property info", managed=true)
- public List<DataSourceConnectionPropertyMetaData> getDataSourceConnectionProperties()
- {
- return this.connectionProperties;
- }
@ManagementProperty(name="password", description="The DataSource password")
public String getPassWord()
@@ -176,6 +175,39 @@
{
this.validConnectionCheckerClassName = validConnectionCheckerClassName;
}
+
+ @ManagementProperty(name="stale-connection-checker-class-name", description="The DataSource stale connection checker class name")
+ public String getStaleConnectionCheckerClassName()
+ {
+ return staleConnectionCheckerClassName;
+ }
+
+ public void setStaleConnectionCheckerClassName(String staleConnectionCheckerClassName)
+ {
+ this.staleConnectionCheckerClassName = staleConnectionCheckerClassName;
+ }
+
+ @ManagementProperty(name="url-delimiter", description="The DataSource url delimiter")
+ public String getURLDelimiter()
+ {
+ return urlDelimiter;
+ }
+
+ public void setURLDelimiter(String urlDelimiter)
+ {
+ this.urlDelimiter = urlDelimiter;
+ }
+
+ @ManagementProperty(name="url-selector-strategy-class-name", description="The DataSource url selector strategy class name")
+ public String getURLSelectorStrategyClassName()
+ {
+ return urlSelectorStrategyClassName;
+ }
+
+ public void setURLSelectorStrategyClassName(String urlSelectorStrategyClassName)
+ {
+ this.urlSelectorStrategyClassName = urlSelectorStrategyClassName;
+ }
@ManagementProperty(name="prepared-statement-cache-size",
description="The DataSource prepared statement cache size")
@@ -301,6 +333,30 @@
properties.add(property);
}
+ if(getStaleConnectionCheckerClassName() != null)
+ {
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("StaleConnectionCheckerClassName");
+ property.setValue(getStaleConnectionCheckerClassName());
+ properties.add(property);
+ }
+
+ if(getURLSelectorStrategyClassName() != null)
+ {
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("StaleConnectionCheckerClassName");
+ property.setValue(getStaleConnectionCheckerClassName());
+ properties.add(property);
+ }
+
+ if(getURLDelimiter() != null)
+ {
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("URLDelimiter");
+ property.setValue(getURLDelimiter());
+ properties.add(property);
+ }
+
property = new ManagedConnectionFactoryPropertyMetaData();
property.setName("PreparedStatementCacheSize");
property.setType("java.lang.Integer");
@@ -312,11 +368,31 @@
property.setType("java.lang.Boolean");
property.setValue(String.valueOf(isSharePreparedStatements()));
properties.add(property);
-
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("QueryTimeout");
+ property.setType("java.lang.Integer");
+ property.setValue(String.valueOf(getQueryTimeout()));
+ properties.add(property);
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("TransactionQueryTimeout");
+ property.setType("java.lang.Boolean");
+ property.setValue(String.valueOf(isUseQueryTimeout()));
+ properties.add(property);
+
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("ValidateOnMatch");
+ property.setType("java.lang.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);
+
return properties;
}
-
-
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2007-10-03 10:53:41 UTC (rev 65796)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2007-10-03 12:18:15 UTC (rev 65797)
@@ -21,14 +21,13 @@
*/
package org.jboss.resource.metadata.mcf;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import org.jboss.managed.api.annotation.ManagementComponent;
-import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementProperty;
/**
@@ -39,7 +38,7 @@
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class NonXADataSourceDeploymentMetaData extends DataSourceDeploymentMetaData
@@ -49,6 +48,9 @@
@XmlElement(name="connection-url", required=true)
private String connectionUrl;
+
+ @XmlElement(name="connection-property")
+ private List<DataSourceConnectionPropertyMetaData> connectionProperties = new ArrayList<DataSourceConnectionPropertyMetaData>();
@ManagementProperty(name="connection-url", description="The DataSource connection URL")
public String getConnectionUrl()
@@ -72,6 +74,17 @@
this.driverClass = driverClass;
}
+ @ManagementProperty(name="connection-properties", description="The DataSource connection properties", managed=true)
+ public List<DataSourceConnectionPropertyMetaData> getDataSourceConnectionProperties()
+ {
+ return this.connectionProperties;
+ }
+
+ public void setDataSourceConnectionProperties(List<DataSourceConnectionPropertyMetaData> connectionProperties)
+ {
+ this.connectionProperties = connectionProperties;
+ }
+
@Override
@ManagementProperty(name="config-property", description="The connection factory property info", managed=true)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
@@ -99,10 +112,13 @@
StringBuffer propBuff = new StringBuffer();
List<DataSourceConnectionPropertyMetaData> dsProps = getDataSourceConnectionProperties();
-
- for (DataSourceConnectionPropertyMetaData prop : dsProps)
+
+ if (dsProps != null)
{
- propBuff.append(prop.getName() + "=" + prop.getValue() + "\n");
+ for (DataSourceConnectionPropertyMetaData prop : dsProps)
+ {
+ propBuff.append(prop.getName() + "=" + prop.getValue() + "\n");
+ }
}
property = new ManagedConnectionFactoryPropertyMetaData();
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-03 10:53:41 UTC (rev 65796)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2007-10-03 12:18:15 UTC (rev 65797)
@@ -1,5 +1,6 @@
package org.jboss.resource.metadata.mcf;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
@@ -32,6 +33,12 @@
@XmlElement(name="xa-datasource-class")
private String xaDataSourceClass;
+ @XmlElement(name="xa-datasource-property")
+ private List<XAConnectionPropertyMetaData> xaDataSourceProperties = new ArrayList<XAConnectionPropertyMetaData>();
+
+ @XmlElement(name="url-property")
+ private String urlProperty;
+
@XmlElement(name="xa-resource-timeout")
private int xaResourceTimeout;
@@ -41,7 +48,7 @@
setTransactionSupportMetaData(ManagedConnectionFactoryTransactionSupportMetaData.XA);
}
- @ManagementProperty(name="xa-datasource-class", description="The XADataSoure class")
+ @ManagementProperty(name="xa-datasource-class", description="The XADataSource class")
public String getXaDataSourceClass()
{
return xaDataSourceClass;
@@ -52,7 +59,18 @@
this.xaDataSourceClass = xaDataSourceClass;
}
- @ManagementProperty(name="xa-resource-timeout", description="The XADataSoure class")
+ @ManagementProperty(name="url-property", description="The url-property")
+ public String getURLProperty()
+ {
+ return urlProperty;
+ }
+
+ public void setURLProperty(String urlProperty)
+ {
+ this.urlProperty = urlProperty;
+ }
+
+ @ManagementProperty(name="xa-resource-timeout", description="The XAResource timeout")
public int getXaResourceTimeout()
{
return xaResourceTimeout;
@@ -63,6 +81,17 @@
this.xaResourceTimeout = xaResourceTimeout;
}
+ @ManagementProperty(name="xa-datasource-properties", description="The DataSource properties", managed=true)
+ public List<XAConnectionPropertyMetaData> getXADataSourceProperties()
+ {
+ return this.xaDataSourceProperties;
+ }
+
+ public void setXADataSourceProperties(List<XAConnectionPropertyMetaData> xaDataSourceProperties)
+ {
+ this.xaDataSourceProperties = xaDataSourceProperties;
+ }
+
@Override
@ManagementProperty(name="config-property", description="The connection factory property info", managed=true)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
@@ -77,13 +106,16 @@
property.setValue(getXaDataSourceClass());
}
- List<DataSourceConnectionPropertyMetaData> dsProps = getDataSourceConnectionProperties();
+ List<XAConnectionPropertyMetaData> dsProps = getXADataSourceProperties();
StringBuffer dsBuff = new StringBuffer();
-
- for (DataSourceConnectionPropertyMetaData data : dsProps)
+
+ if (dsProps != null)
{
- dsBuff.append(data.getName() + "=" + data.getValue() + "\n");
+ for (XAConnectionPropertyMetaData data : dsProps)
+ {
+ dsBuff.append(data.getName() + "=" + data.getValue() + "\n");
+ }
}
property = new ManagedConnectionFactoryPropertyMetaData();
@@ -91,9 +123,13 @@
property.setValue(dsBuff.toString());
properties.add(property);
+ if(getURLProperty() != null)
+ {
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("URLProperty");
+ property.setValue(getURLProperty());
+ }
+
return properties;
-
}
-
-
}
More information about the jboss-cvs-commits
mailing list