[jboss-cvs] JBossAS SVN: r112358 - projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 18 23:33:49 EDT 2011
Author: jeff.zhang
Date: 2011-10-18 23:33:49 -0400 (Tue, 18 Oct 2011)
New Revision: 112358
Modified:
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LocalTxDataSource.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxDataSource.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java
Log:
[JBJCA-679] add some tag support
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java 2011-10-19 01:53:28 UTC (rev 112357)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java 2011-10-19 03:33:49 UTC (rev 112358)
@@ -50,6 +50,7 @@
*/
public class LegacyDsParser extends AbstractParser
{
+ private static final String DEFAULT_SECURITY_DOMAIN = "other";
private static Logger log = Logger.getLogger(LegacyDsParser.class);
/**
@@ -97,6 +98,7 @@
}
}
log.info("Skip parse " + reader.getLocalName());
+ //System.out.println("Skip parse " + reader.getLocalName());
}
@@ -244,7 +246,7 @@
TrackStatementsEnum trackStatements = TrackStatementsEnum.FALSE;
TransactionIsolation transactionIsolation = TransactionIsolation.TRANSACTION_NONE;
- String securityDomain = ""; //TODO
+ String securityDomain = DEFAULT_SECURITY_DOMAIN;
Extension reauthPlugin = null;
Boolean backgroundValidation = Defaults.BACKGROUND_VALIDATION;
@@ -259,6 +261,12 @@
Boolean useStrictMin = Defaults.USE_STRICT_MIN;
FlushStrategy flushStrategy = Defaults.FLUSH_STRATEGY;
+ Boolean isSameRmOverride = Defaults.IS_SAME_RM_OVERRIDE;
+ Boolean interleaving = Defaults.INTERLEAVING;
+ Boolean padXid = Defaults.PAD_XID;
+ Boolean wrapXaDataSource = Defaults.WRAP_XA_RESOURCE;
+ Boolean noTxSeparatePool = Defaults.NO_TX_SEPARATE_POOL;
+
//elements reading
while (reader.hasNext())
{
@@ -276,7 +284,8 @@
xaDsImpl.buildValidation(backgroundValidation, backgroundValidationMillis, useFastFail,
validConnectionChecker, checkValidConnectionSql, validateOnMatch, staleConnectionChecker,
exceptionSorter);
- xaDsImpl.buildCommonPool(minPoolSize, maxPoolSize, prefill, useStrictMin, flushStrategy);
+ xaDsImpl.buildCommonPool(minPoolSize, maxPoolSize, prefill, useStrictMin, flushStrategy,
+ isSameRmOverride, interleaving, padXid, wrapXaDataSource, noTxSeparatePool);
xaDsImpl.buildOther(urlDelimiter, urlSelectorStrategyClassName, newConnectionSql, useJavaContext,
poolName, enabled, jndiName, spy, useCcm, jta);
xaDsImpl.buildXaDataSourceImpl();
@@ -318,10 +327,47 @@
transactionIsolation = TransactionIsolation.valueOf(elementAsString(reader));
break;
}
+
+ case INTERLEAVING : {
+ interleaving = elementAsBoolean(reader);
+ break;
+ }
+ case IS_SAME_RM_OVERRIDE : {
+ isSameRmOverride = elementAsBoolean(reader);
+ break;
+ }
+ case NO_TX_SEPARATE_POOLS : {
+ noTxSeparatePool = elementAsBoolean(reader);
+ break;
+ }
+ case PAD_XID : {
+ padXid = elementAsBoolean(reader);
+ break;
+ }
+ case WRAP_XA_RESOURCE : {
+ wrapXaDataSource = elementAsBoolean(reader);
+ break;
+ }
+
+ case VALID_CONNECTION_CHECKER : {
+ String classname = elementAsString(reader);
+ validConnectionChecker = new Extension(classname, null);
+ break;
+ }
+ case EXCEPTION_SORTER : {
+ String classname = elementAsString(reader);
+ exceptionSorter = new Extension(classname, null);
+ break;
+ }
+ case STALE_CONNECTION_CHECKER : {
+ String classname = elementAsString(reader);
+ staleConnectionChecker = new Extension(classname, null);
+ break;
+ }
case JNDI_NAME : {
- jndiName = elementAsString(reader);
- poolName = jndiName;
+ poolName = elementAsString(reader);
+ jndiName = "java:jboss/datasources/" + poolName;
break;
}
case USE_JAVA_CONTEXT : {
@@ -432,13 +478,11 @@
String driverClass = null;
String dataSourceClass = null;
String driver = null;
- //TransactionIsolation transactionIsolation = null;
Map<String, String> connectionProperties = new HashMap<String, String>();
String urlDelimiter = null;
String urlSelectorStrategyClassName = null;
String newConnectionSql = null;
- //CommonPool pool = null;
//attributes reading
Boolean useJavaContext = Defaults.USE_JAVA_CONTEXT;
@@ -469,7 +513,7 @@
Boolean setTxQueryTimeout = Defaults.SET_TX_QUERY_TIMEOUT;
TransactionIsolation transactionIsolation = TransactionIsolation.TRANSACTION_NONE;
- String securityDomain = ""; //TODO
+ String securityDomain = DEFAULT_SECURITY_DOMAIN;
Extension reauthPlugin = null;
Boolean backgroundValidation = Defaults.BACKGROUND_VALIDATION;
@@ -519,6 +563,22 @@
case START_ELEMENT : {
switch (LocalTxDataSource.Tag.forName(reader.getLocalName()))
{
+ case VALID_CONNECTION_CHECKER : {
+ String classname = elementAsString(reader);
+ validConnectionChecker = new Extension(classname, null);
+ break;
+ }
+ case EXCEPTION_SORTER : {
+ String classname = elementAsString(reader);
+ exceptionSorter = new Extension(classname, null);
+ break;
+ }
+ case STALE_CONNECTION_CHECKER : {
+ String classname = elementAsString(reader);
+ staleConnectionChecker = new Extension(classname, null);
+ break;
+ }
+
case CONNECTION_PROPERTY : {
connectionProperties.put(attributeAsString(reader, "name"), elementAsString(reader));
break;
@@ -548,8 +608,8 @@
break;
}
case JNDI_NAME : {
- jndiName = elementAsString(reader);
- poolName = jndiName;
+ poolName = elementAsString(reader);
+ jndiName = "java:jboss/datasources/" + poolName;
break;
}
case USE_JAVA_CONTEXT : {
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java 2011-10-19 01:53:28 UTC (rev 112357)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java 2011-10-19 03:33:49 UTC (rev 112358)
@@ -241,16 +241,23 @@
* @param prefill prefill
* @param useStrictMin useStrictMin
* @param flushStrategy flushStrategy
+ * @param isSameRmOverride isSameRmOverride
+ * @param interleaving interleaving
+ * @param padXid padXid
+ * @param wrapXaResource wrapXaResource
+ * @param noTxSeparatePool noTxSeparatePool
* @return this
* @throws Exception exception
*/
public LegacyXaDataSourceImp buildCommonPool(Integer minPoolSize, Integer maxPoolSize,
Boolean prefill, Boolean useStrictMin,
- FlushStrategy flushStrategy) throws Exception
+ FlushStrategy flushStrategy, Boolean isSameRmOverride, Boolean interleaving,
+ Boolean padXid, Boolean wrapXaResource,
+ Boolean noTxSeparatePool) throws Exception
{
xaPool = new CommonXaPoolImpl(minPoolSize, maxPoolSize, prefill, useStrictMin, flushStrategy,
isSameRmOverride, interleaving, padXid,
- wrapXaDataSource, noTxSeparatePool);
+ wrapXaResource, noTxSeparatePool);
return this;
}
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LocalTxDataSource.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LocalTxDataSource.java 2011-10-19 01:53:28 UTC (rev 112357)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LocalTxDataSource.java 2011-10-19 03:33:49 UTC (rev 112358)
@@ -155,15 +155,15 @@
/**
* validConnectionCheckerClassName tag
*/
- VALID_CONNECTION_CHECKER("valid-connection-checker"),
+ VALID_CONNECTION_CHECKER("valid-connection-checker-class-name"),
/**
* exceptionSorterClassName tag
*/
- EXCEPTION_SORTER("exception-sorter"),
+ EXCEPTION_SORTER("exception-sorter-class-name"),
/**
* staleConnectionCheckerClassName tag
*/
- STALE_CONNECTION_CHECKER("stale-connection-checker"),
+ STALE_CONNECTION_CHECKER("stale-connection-checker-class-name"),
/**
* trackStatements tag
*/
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxDataSource.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxDataSource.java 2011-10-19 01:53:28 UTC (rev 112357)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxDataSource.java 2011-10-19 03:33:49 UTC (rev 112358)
@@ -153,15 +153,15 @@
/**
* validConnectionCheckerClassName tag
*/
- VALID_CONNECTION_CHECKER("valid-connection-checker"),
+ VALID_CONNECTION_CHECKER("valid-connection-checker-class-name"),
/**
* exceptionSorterClassName tag
*/
- EXCEPTION_SORTER("exception-sorter"),
+ EXCEPTION_SORTER("exception-sorter-class-name"),
/**
* staleConnectionCheckerClassName tag
*/
- STALE_CONNECTION_CHECKER("stale-connection-checker"),
+ STALE_CONNECTION_CHECKER("stale-connection-checker-class-name"),
/**
* trackStatements tag
*/
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java 2011-10-19 01:53:28 UTC (rev 112357)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java 2011-10-19 03:33:49 UTC (rev 112358)
@@ -101,13 +101,22 @@
/**
* isSameRmOverrideValue tag
*/
- IS_SAME_RM_OVERRIDE("is-same-rm-override"),
+ IS_SAME_RM_OVERRIDE("isSameRM-override-value"),
/**
* interleaving tag
*/
INTERLEAVING("interleaving"),
+ /**
+ * pad-xid tag
+ */
+ PAD_XID("pad-xid"),
/**
+ * wrap-xa-resource tag
+ */
+ WRAP_XA_RESOURCE("wrap-xa-resource"),
+
+ /**
* xaDatasourceProperty tag
*/
TRACK_CONNECTION_BY_TX("track_connection-by_tx"),
@@ -195,15 +204,15 @@
/**
* validConnectionCheckerClassName tag
*/
- VALID_CONNECTION_CHECKER("valid-connection-checker"),
+ VALID_CONNECTION_CHECKER("valid-connection-checker-class-name"),
/**
* exceptionSorterClassName tag
*/
- EXCEPTION_SORTER("exception-sorter"),
+ EXCEPTION_SORTER("exception-sorter-class-name"),
/**
* staleConnectionCheckerClassName tag
*/
- STALE_CONNECTION_CHECKER("stale-connection-checker"),
+ STALE_CONNECTION_CHECKER("stale-connection-checker-class-name"),
/**
* trackStatements tag
*/
More information about the jboss-cvs-commits
mailing list