[jboss-cvs] JBossAS SVN: r110980 - in projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common: metadata/ds and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 21 11:17:03 EDT 2011
Author: maeste
Date: 2011-03-21 11:17:03 -0400 (Mon, 21 Mar 2011)
New Revision: 110980
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
Log:
JBJCA-532
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java 2011-03-21 14:23:16 UTC (rev 110979)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java 2011-03-21 15:17:03 UTC (rev 110980)
@@ -107,8 +107,8 @@
public boolean isSpy();
/**
- * Get the module
+ * Get the driver
* @return The value
*/
- public String getModule();
+ public String getDriver();
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-03-21 14:23:16 UTC (rev 110979)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-03-21 15:17:03 UTC (rev 110980)
@@ -125,7 +125,7 @@
/**
* module tag
*/
- MODULE("module"),
+ DRIVER("driver"),
/**
* transactionIsolation tag
*/
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-03-21 14:23:16 UTC (rev 110979)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-03-21 15:17:03 UTC (rev 110980)
@@ -119,7 +119,7 @@
/**
* module tag
*/
- MODULE("module"),
+ DRIVER("driver"),
/**
* transactionIsolation tag
*/
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2011-03-21 14:23:16 UTC (rev 110979)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2011-03-21 15:17:03 UTC (rev 110980)
@@ -50,7 +50,7 @@
private final String driverClass;
- private final String module;
+ private final String driver;
private final HashMap<String, String> connectionProperties;
@@ -63,7 +63,7 @@
*
* @param connectionUrl connectionUrl
* @param driverClass driverClass
- * @param module module
+ * @param driver driver
* @param transactionIsolation transactionIsolation
* @param connectionProperties connectionProperties
* @param timeOut timeOut
@@ -81,7 +81,7 @@
* @param pool pool
* @throws ValidateException ValidateException
*/
- public DataSourceImpl(String connectionUrl, String driverClass, String module,
+ public DataSourceImpl(String connectionUrl, String driverClass, String driver,
TransactionIsolation transactionIsolation, Map<String, String> connectionProperties, TimeOut timeOut,
DsSecurity security, Statement statement, Validation validation, String urlDelimiter,
String urlSelectorStrategyClassName, String newConnectionSql, boolean useJavaContext, String poolName,
@@ -91,7 +91,7 @@
urlSelectorStrategyClassName, useJavaContext, poolName, enabled, jndiName, spy);
this.connectionUrl = connectionUrl;
this.driverClass = driverClass;
- this.module = module;
+ this.driver = driver;
if (connectionProperties != null)
{
this.connectionProperties = new HashMap<String, String>(connectionProperties.size());
@@ -129,14 +129,14 @@
}
/**
- * Get the module.
+ * Get the driver.
*
- * @return the module.
+ * @return the driver.
*/
@Override
- public final String getModule()
+ public final String getDriver()
{
- return module;
+ return driver;
}
/**
@@ -212,8 +212,8 @@
int result = super.hashCode();
result = prime * result + ((connectionProperties == null) ? 0 : connectionProperties.hashCode());
result = prime * result + ((connectionUrl == null) ? 0 : connectionUrl.hashCode());
+ result = prime * result + ((driver == null) ? 0 : driver.hashCode());
result = prime * result + ((driverClass == null) ? 0 : driverClass.hashCode());
- result = prime * result + ((module == null) ? 0 : module.hashCode());
result = prime * result + ((newConnectionSql == null) ? 0 : newConnectionSql.hashCode());
result = prime * result + ((pool == null) ? 0 : pool.hashCode());
return result;
@@ -243,19 +243,19 @@
}
else if (!connectionUrl.equals(other.connectionUrl))
return false;
- if (driverClass == null)
+ if (driver == null)
{
- if (other.driverClass != null)
+ if (other.driver != null)
return false;
}
- else if (!driverClass.equals(other.driverClass))
+ else if (!driver.equals(other.driver))
return false;
- if (module == null)
+ if (driverClass == null)
{
- if (other.module != null)
+ if (other.driverClass != null)
return false;
}
- else if (!module.equals(other.module))
+ else if (!driverClass.equals(other.driverClass))
return false;
if (newConnectionSql == null)
{
@@ -277,13 +277,9 @@
@Override
public String toString()
{
- return "DataSourceImpl [connectionUrl=" + connectionUrl + ", driverClass=" + driverClass + ", module=" +
- module + ", connectionProperties=" + connectionProperties + ", newConnectionSql=" + newConnectionSql +
- ", pool=" + pool + ", transactionIsolation=" + transactionIsolation + ", timeOut=" + timeOut +
- ", security=" + security + ", statement=" + statement + ", validation=" + validation +
- ", urlDelimiter=" + urlDelimiter + ", urlSelectorStrategyClassName=" + urlSelectorStrategyClassName +
- ", useJavaContext=" + useJavaContext + ", poolName=" + poolName + ", enabled=" + enabled +
- ", jndiName=" + jndiName + "]";
+ return "DataSourceImpl [connectionUrl=" + connectionUrl + ", driverClass=" + driverClass + ", driver=" +
+ driver + ", connectionProperties=" + connectionProperties + ", newConnectionSql=" + newConnectionSql +
+ ", pool=" + pool + "]";
}
@Override
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2011-03-21 14:23:16 UTC (rev 110979)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2011-03-21 15:17:03 UTC (rev 110980)
@@ -188,7 +188,7 @@
Recovery recovery = null;
String xaDataSourceClass = null;
- String module = null;
+ String driver = null;
//attributes reading
@@ -239,7 +239,7 @@
return new XADataSourceImpl(transactionIsolation, timeOutSettings, securitySettings,
statementSettings, validationSettings, urlDelimiter,
urlSelectorStrategyClassName, useJavaContext, poolName, enabled,
- jndiName, spy, xaDataSourceProperty, xaDataSourceClass, module,
+ jndiName, spy, xaDataSourceProperty, xaDataSourceClass, driver,
newConnectionSql, xaPool, recovery);
}
else
@@ -262,8 +262,8 @@
xaDataSourceClass = elementAsString(reader);
break;
}
- case MODULE : {
- module = elementAsString(reader);
+ case DRIVER : {
+ driver = elementAsString(reader);
break;
}
case XA_POOL : {
@@ -379,7 +379,7 @@
{
String connectionUrl = null;
String driverClass = null;
- String module = null;
+ String driver = null;
TransactionIsolation transactionIsolation = null;
Map<String, String> connectionProperties = new HashMap<String, String>();
TimeOut timeOutSettings = null;
@@ -436,7 +436,7 @@
if (DataSources.Tag.forName(reader.getLocalName()) == DataSources.Tag.DATASOURCE)
{
- return new DataSourceImpl(connectionUrl, driverClass, module, transactionIsolation,
+ return new DataSourceImpl(connectionUrl, driverClass, driver, transactionIsolation,
connectionProperties, timeOutSettings, securitySettings,
statementSettings, validationSettings, urlDelimiter,
urlSelectorStrategyClassName, newConnectionSql, useJavaContext, poolName,
@@ -466,8 +466,8 @@
driverClass = elementAsString(reader);
break;
}
- case MODULE : {
- module = elementAsString(reader);
+ case DRIVER : {
+ driver = elementAsString(reader);
break;
}
case POOL : {
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2011-03-21 14:23:16 UTC (rev 110979)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2011-03-21 15:17:03 UTC (rev 110980)
@@ -51,7 +51,7 @@
private final String xaDataSourceClass;
- private final String module;
+ private final String driver;
private final String newConnectionSql;
@@ -76,7 +76,7 @@
* @param spy spy
* @param xaDataSourceProperty xaDataSourceProperty
* @param xaDataSourceClass xaDataSourceClass
- * @param module module
+ * @param driver driver
* @param newConnectionSql newConnectionSql
* @param xaPool xaPool
* @param recovery recovery
@@ -85,7 +85,7 @@
public XADataSourceImpl(TransactionIsolation transactionIsolation, TimeOut timeOut, DsSecurity security,
Statement statement, Validation validation, String urlDelimiter, String urlSelectorStrategyClassName,
boolean useJavaContext, String poolName, boolean enabled, String jndiName, boolean spy,
- Map<String, String> xaDataSourceProperty, String xaDataSourceClass, String module, String newConnectionSql,
+ Map<String, String> xaDataSourceProperty, String xaDataSourceClass, String driver, String newConnectionSql,
CommonXaPool xaPool, Recovery recovery) throws ValidateException
{
super(transactionIsolation, timeOut, security, statement, validation, urlDelimiter,
@@ -100,7 +100,7 @@
this.xaDataSourceProperty = new HashMap<String, String>(0);
}
this.xaDataSourceClass = xaDataSourceClass;
- this.module = module;
+ this.driver = driver;
this.newConnectionSql = newConnectionSql;
this.xaPool = xaPool;
this.recovery = recovery;
@@ -119,14 +119,14 @@
}
/**
- * Get the module.
+ * Get the driver.
*
- * @return the module.
+ * @return the driver.
*/
@Override
- public final String getModule()
+ public final String getDriver()
{
- return module;
+ return driver;
}
/**
@@ -178,7 +178,7 @@
{
final int prime = 31;
int result = super.hashCode();
- result = prime * result + ((module == null) ? 0 : module.hashCode());
+ result = prime * result + ((driver == null) ? 0 : driver.hashCode());
result = prime * result + ((newConnectionSql == null) ? 0 : newConnectionSql.hashCode());
result = prime * result + ((xaDataSourceClass == null) ? 0 : xaDataSourceClass.hashCode());
result = prime * result + ((xaDataSourceProperty == null) ? 0 : xaDataSourceProperty.hashCode());
@@ -196,12 +196,12 @@
if (!(obj instanceof XADataSourceImpl))
return false;
XADataSourceImpl other = (XADataSourceImpl) obj;
- if (module == null)
+ if (driver == null)
{
- if (other.module != null)
+ if (other.driver != null)
return false;
}
- else if (!module.equals(other.module))
+ else if (!driver.equals(other.driver))
return false;
if (newConnectionSql == null)
{
@@ -238,7 +238,7 @@
public String toString()
{
return "XADataSourceImpl [xaDataSourceProperty=" + xaDataSourceProperty + ", xaDataSourceClass=" +
- xaDataSourceClass + ", module=" + module + ", newConnectionSql=" + newConnectionSql + ", xaPool=" +
+ xaDataSourceClass + ", driver=" + driver + ", newConnectionSql=" + newConnectionSql + ", xaPool=" +
xaPool + ", transactionIsolation=" + transactionIsolation + ", timeOut=" + timeOut + ", security=" +
security + ", statement=" + statement + ", validation=" + validation + ", urlDelimiter=" + urlDelimiter +
", urlSelectorStrategyClassName=" + urlSelectorStrategyClassName + ", useJavaContext=" + useJavaContext +
More information about the jboss-cvs-commits
mailing list