[jboss-cvs] JBossAS SVN: r112352 - in projects/jboss-jca/trunk: as/src/main/java/org/jboss/jca/as/converters and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Oct 16 22:57:07 EDT 2011
Author: jeff.zhang
Date: 2011-10-16 22:57:07 -0400 (Sun, 16 Oct 2011)
New Revision: 112352
Added:
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/package.html
projects/jboss-jca/trunk/as/src/test/java/org/jboss/jca/as/converters/package.html
Modified:
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/ConnectionFactory.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DataSource.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DataSourceConverter.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DatasourcesImpl.java
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/LegacyTxDataSourceImpl.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/Main.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxConnectionFactory.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/TxConnectionFactory.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java
projects/jboss-jca/trunk/as/src/test/java/org/jboss/jca/as/converters/ParserTestCase.java
projects/jboss-jca/trunk/build.xml
Log:
[JBJCA-679] fix checkstyle format
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/ConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/ConnectionFactory.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/ConnectionFactory.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -121,7 +121,8 @@
*
* A Tag.
*/
- public enum Tag {
+ public enum Tag
+ {
/**
* always first
*/
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DataSource.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DataSource.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DataSource.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -243,7 +243,8 @@
*
* A Tag.
*/
- public enum Tag {
+ public enum Tag
+ {
/**
* always first
*/
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DataSourceConverter.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DataSourceConverter.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DataSourceConverter.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -30,11 +30,20 @@
public class DataSourceConverter
{
private DataSources dss;
+
+ /**
+ * DataSourceConverter constructor
+ * @param dss DataSources
+ */
public DataSourceConverter(DataSources dss)
{
this.dss = dss;
}
+ /**
+ * convert DataSources to string
+ * @return xml string
+ */
public String convert()
{
return dss.toString();
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DatasourcesImpl.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DatasourcesImpl.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/DatasourcesImpl.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -32,10 +32,16 @@
public class DatasourcesImpl implements DataSources
{
- List<NoTxDataSource> noTxDatasource;
- List<LocalTxDataSource> localTxDatasource;
- List<XaDataSource> xaDataSource;
+ private List<NoTxDataSource> noTxDatasource;
+ private List<LocalTxDataSource> localTxDatasource;
+ private List<XaDataSource> xaDataSource;
+ /**
+ * DatasourcesImpl
+ * @param noTxDatasource list of NoTxDatasource
+ * @param localTxDatasource list of LocalTxDataSource
+ * @param xaDataSource list of XaDataSource
+ */
public DatasourcesImpl(
List<NoTxDataSource> noTxDatasource,
List<LocalTxDataSource> localTxDatasource,
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-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -24,13 +24,9 @@
import org.jboss.jca.common.api.metadata.Defaults;
import org.jboss.jca.common.api.metadata.common.Extension;
import org.jboss.jca.common.api.metadata.common.FlushStrategy;
+import org.jboss.jca.common.api.metadata.ds.Statement.TrackStatementsEnum;
import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
-import org.jboss.jca.common.api.metadata.ds.Statement.TrackStatementsEnum;
-import static javax.xml.stream.XMLStreamConstants.CHARACTERS;
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -40,6 +36,10 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import static javax.xml.stream.XMLStreamConstants.CHARACTERS;
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
import org.jboss.logging.Logger;
/**
@@ -52,6 +52,12 @@
{
private static Logger log = Logger.getLogger(LegacyDsParser.class);
+ /**
+ * parse xml string to datasources
+ * @param xmlInputStream xml file input stream
+ * @return DataSources
+ * @throws Exception exception
+ */
public DataSources parse(InputStream xmlInputStream) throws Exception
{
XMLStreamReader reader = null;
@@ -74,12 +80,15 @@
int level = 1;
while (reader.hasNext() && level > 0)
{
- switch (reader.next()) {
- case END_ELEMENT : {
+ switch (reader.next())
+ {
+ case END_ELEMENT :
+ {
level--;
break;
}
- case START_ELEMENT : {
+ case START_ELEMENT :
+ {
level++;
break;
}
@@ -640,7 +649,8 @@
*
* A Tag.
*/
- public enum Tag {
+ public enum Tag
+ {
/**
* always first
*/
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyTxDataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyTxDataSourceImpl.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyTxDataSourceImpl.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -26,10 +26,10 @@
import org.jboss.jca.common.api.metadata.common.FlushStrategy;
import org.jboss.jca.common.api.metadata.ds.DsSecurity;
import org.jboss.jca.common.api.metadata.ds.Statement;
+import org.jboss.jca.common.api.metadata.ds.Statement.TrackStatementsEnum;
import org.jboss.jca.common.api.metadata.ds.TimeOut;
import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
import org.jboss.jca.common.api.metadata.ds.Validation;
-import org.jboss.jca.common.api.metadata.ds.Statement.TrackStatementsEnum;
import org.jboss.jca.common.metadata.common.CommonPoolImpl;
import org.jboss.jca.common.metadata.ds.DataSourceImpl;
import org.jboss.jca.common.metadata.ds.DsSecurityImpl;
@@ -61,47 +61,47 @@
private final HashMap<String, String> connectionProperties;
- protected final TransactionIsolation transactionIsolation;
+ private final TransactionIsolation transactionIsolation;
- protected TimeOut timeOut;
+ private TimeOut timeOut;
- protected DsSecurity security;
+ private DsSecurity security;
- protected Statement statement;
+ private Statement statement;
- protected Validation validation;
+ private Validation validation;
private CommonPool pool;
- protected String urlDelimiter;
+ private String urlDelimiter;
- protected String urlSelectorStrategyClassName;
+ private String urlSelectorStrategyClassName;
private String newConnectionSql;
- protected Boolean useJavaContext;
+ private Boolean useJavaContext;
- protected String poolName;
+ private String poolName;
- protected Boolean enabled;
+ private Boolean enabled;
- protected String jndiName;
+ private String jndiName;
- protected Boolean spy;
+ private Boolean spy;
- protected Boolean useCcm;
+ private Boolean useCcm;
- protected Boolean jta;
+ private Boolean jta;
- /*
- (String connectionUrl, String driverClass, String dataSourceClass, 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, Boolean enabled, String jndiName,
- Boolean spy, Boolean useccm, Boolean jta, CommonPool pool)
- */
-
+ /**
+ * create a LegacyTxDataSourceImpl
+ * @param connectionUrl connectionUrl
+ * @param driverClass driverClass
+ * @param dataSourceClass dataSourceClass
+ * @param driver driver
+ * @param transactionIsolation transactionIsolation
+ * @param connectionProperties connectionProperties
+ */
public LegacyTxDataSourceImpl(String connectionUrl, String driverClass, String dataSourceClass, String driver,
TransactionIsolation transactionIsolation, Map<String, String> connectionProperties)
{
@@ -121,6 +121,10 @@
this.transactionIsolation = transactionIsolation;
}
+ /**
+ * buildDataSourceImpl
+ * @throws Exception exception
+ */
public void buildDataSourceImpl() throws Exception
{
dsImpl = new DataSourceImpl(connectionUrl, driverClass, dataSourceClass, driver, transactionIsolation,
@@ -137,22 +141,56 @@
return out;
}
- public LegacyTxDataSourceImpl buildTimeOut(Long blockingTimeoutMillis, Long idleTimeoutMinutes, Integer allocationRetry,
- Long allocationRetryWaitMillis, Integer xaResourceTimeout, Boolean setTxQueryTimeout, Long queryTimeout,
- Long useTryLock) throws Exception
+ /**
+ * build timeout part
+ *
+ * @param blockingTimeoutMillis blockingTimeoutMillis
+ * @param idleTimeoutMinutes idleTimeoutMinutes
+ * @param allocationRetry allocationRetry
+ * @param allocationRetryWaitMillis allocationRetryWaitMillis
+ * @param xaResourceTimeout xaResourceTimeout
+ * @param setTxQueryTimeout setTxQueryTimeout
+ * @param queryTimeout queryTimeout
+ * @param useTryLock useTryLock
+ * @return this
+ * @throws Exception exception
+ */
+ public LegacyTxDataSourceImpl buildTimeOut(Long blockingTimeoutMillis, Long idleTimeoutMinutes,
+ Integer allocationRetry, Long allocationRetryWaitMillis, Integer xaResourceTimeout,
+ Boolean setTxQueryTimeout, Long queryTimeout, Long useTryLock) throws Exception
{
- timeOut = new TimeOutImpl(blockingTimeoutMillis, idleTimeoutMinutes, allocationRetry,allocationRetryWaitMillis, xaResourceTimeout, setTxQueryTimeout,
+ timeOut = new TimeOutImpl(blockingTimeoutMillis, idleTimeoutMinutes, allocationRetry,
+ allocationRetryWaitMillis, xaResourceTimeout, setTxQueryTimeout,
queryTimeout, useTryLock);
return this;
}
- public LegacyTxDataSourceImpl buildDsSecurity(String userName, String password, String securityDomain, Extension reauthPlugin)
- throws Exception
+ /**
+ * build security part
+ *
+ * @param userName userName
+ * @param password password
+ * @param securityDomain securityDomain
+ * @param reauthPlugin reauthPlugin
+ * @return this
+ * @throws Exception exception
+ */
+ public LegacyTxDataSourceImpl buildDsSecurity(String userName, String password, String securityDomain,
+ Extension reauthPlugin) throws Exception
{
security = new DsSecurityImpl(userName, password, securityDomain, reauthPlugin);
return this;
}
+ /**
+ * build statement part
+ *
+ * @param sharePreparedStatements sharePreparedStatements
+ * @param preparedStatementsCacheSize preparedStatementsCacheSize
+ * @param trackStatements trackStatements
+ * @return this
+ * @throws Exception exception
+ */
public LegacyTxDataSourceImpl buildStatement(Boolean sharePreparedStatements, Long preparedStatementsCacheSize,
TrackStatementsEnum trackStatements) throws Exception
{
@@ -160,7 +198,22 @@
return this;
}
- public LegacyTxDataSourceImpl buildValidation(Boolean backgroundValidation, Long backgroundValidationMillis, Boolean useFastFail,
+ /**
+ * build validation part
+ *
+ * @param backgroundValidation backgroundValidation
+ * @param backgroundValidationMillis backgroundValidationMillis
+ * @param useFastFail useFastFail
+ * @param validConnectionChecker validConnectionChecker
+ * @param checkValidConnectionSql checkValidConnectionSql
+ * @param validateOnMatch validateOnMatch
+ * @param staleConnectionChecker staleConnectionChecker
+ * @param exceptionSorter exceptionSorter
+ * @return this
+ * @throws Exception exception
+ */
+ public LegacyTxDataSourceImpl buildValidation(Boolean backgroundValidation, Long backgroundValidationMillis,
+ Boolean useFastFail,
Extension validConnectionChecker, String checkValidConnectionSql, Boolean validateOnMatch,
Extension staleConnectionChecker, Extension exceptionSorter) throws Exception
{
@@ -170,6 +223,17 @@
return this;
}
+ /**
+ * build pool part
+ *
+ * @param minPoolSize minPoolSize
+ * @param maxPoolSize maxPoolSize
+ * @param prefill prefill
+ * @param useStrictMin useStrictMin
+ * @param flushStrategy flushStrategy
+ * @return this
+ * @throws Exception exception
+ */
public LegacyTxDataSourceImpl buildCommonPool(Integer minPoolSize, Integer maxPoolSize,
Boolean prefill, Boolean useStrictMin,
FlushStrategy flushStrategy) throws Exception
@@ -178,7 +242,23 @@
return this;
}
- public LegacyTxDataSourceImpl buildOther(String urlDelimiter, String urlSelectorStrategyClassName, String newConnectionSql,
+ /**
+ * build other properties
+ *
+ * @param urlDelimiter urlDelimiter
+ * @param urlSelectorStrategyClassName urlSelectorStrategyClassName
+ * @param newConnectionSql newConnectionSql
+ * @param useJavaContext useJavaContext
+ * @param poolName poolName
+ * @param enabled enabled
+ * @param jndiName jndiName
+ * @param spy spy
+ * @param useCcm useCcm
+ * @param jta jta
+ * @return this
+ */
+ public LegacyTxDataSourceImpl buildOther(String urlDelimiter, String urlSelectorStrategyClassName,
+ String newConnectionSql,
Boolean useJavaContext, String poolName, Boolean enabled, String jndiName,
Boolean spy, Boolean useCcm, Boolean jta)
{
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-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -27,10 +27,10 @@
import org.jboss.jca.common.api.metadata.common.Recovery;
import org.jboss.jca.common.api.metadata.ds.DsSecurity;
import org.jboss.jca.common.api.metadata.ds.Statement;
+import org.jboss.jca.common.api.metadata.ds.Statement.TrackStatementsEnum;
import org.jboss.jca.common.api.metadata.ds.TimeOut;
import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
import org.jboss.jca.common.api.metadata.ds.Validation;
-import org.jboss.jca.common.api.metadata.ds.Statement.TrackStatementsEnum;
import org.jboss.jca.common.metadata.common.CommonXaPoolImpl;
import org.jboss.jca.common.metadata.ds.DsSecurityImpl;
import org.jboss.jca.common.metadata.ds.StatementImpl;
@@ -60,58 +60,57 @@
private final HashMap<String, String> xaDataSourceProperty;
- protected final TransactionIsolation transactionIsolation;
+ private final TransactionIsolation transactionIsolation;
- protected TimeOut timeOut;
+ private TimeOut timeOut;
- protected DsSecurity security;
+ private DsSecurity security;
- protected Statement statement;
+ private Statement statement;
- protected Validation validation;
+ private Validation validation;
private CommonXaPool xaPool;
- protected String urlDelimiter;
+ private String urlDelimiter;
- protected String urlSelectorStrategyClassName;
+ private String urlSelectorStrategyClassName;
private String newConnectionSql;
- protected Boolean useJavaContext;
+ private Boolean useJavaContext;
- protected String poolName;
+ private String poolName;
- protected Boolean enabled;
+ private Boolean enabled;
- protected String jndiName;
+ private String jndiName;
- protected Boolean spy;
+ private Boolean spy;
- protected Boolean useCcm;
+ private Boolean useCcm;
- protected Boolean jta;
+ private Boolean jta;
- Recovery recovery;
+ private Recovery recovery;
- Boolean isSameRmOverride;
+ private Boolean isSameRmOverride;
- Boolean interleaving;
+ private Boolean interleaving;
- Boolean padXid;
+ private Boolean padXid;
- Boolean wrapXaDataSource;
+ private Boolean wrapXaDataSource;
- Boolean noTxSeparatePool;
+ private Boolean noTxSeparatePool;
- /*
- * TransactionIsolation transactionIsolation, TimeOut timeOut, DsSecurity security,
- Statement statement, Validation validation, String urlDelimiter, String urlSelectorStrategyClassName,
- Boolean useJavaContext, String poolName, Boolean enabled, String jndiName, Boolean spy, Boolean useCcm,
- Map<String, String> xaDataSourceProperty, String xaDataSourceClass, String driver, String newConnectionSql,
- CommonXaPool xaPool, Recovery recovery
- */
-
+ /**
+ * create a LegacyXaDataSourceImp
+ * @param xaDataSourceClass xaDataSourceClass
+ * @param driver driver
+ * @param transactionIsolation transactionIsolation
+ * @param xaDataSourceProperty xaDataSourceProperty
+ */
public LegacyXaDataSourceImp(String xaDataSourceClass, String driver,
TransactionIsolation transactionIsolation, Map<String, String> xaDataSourceProperty)
{
@@ -131,6 +130,10 @@
this.transactionIsolation = transactionIsolation;
}
+ /**
+ * buildXaDataSourceImpl
+ * @throws Exception exception
+ */
public void buildXaDataSourceImpl() throws Exception
{
dsImpl = new XADataSourceImpl(transactionIsolation, timeOut, security,
@@ -147,30 +150,80 @@
return out;
}
- public LegacyXaDataSourceImp buildTimeOut(Long blockingTimeoutMillis, Long idleTimeoutMinutes, Integer allocationRetry,
- Long allocationRetryWaitMillis, Integer xaResourceTimeout, Boolean setTxQueryTimeout, Long queryTimeout,
+ /**
+ * build timeout part
+ *
+ * @param blockingTimeoutMillis blockingTimeoutMillis
+ * @param idleTimeoutMinutes idleTimeoutMinutes
+ * @param allocationRetry allocationRetry
+ * @param allocationRetryWaitMillis allocationRetryWaitMillis
+ * @param xaResourceTimeout xaResourceTimeout
+ * @param setTxQueryTimeout setTxQueryTimeout
+ * @param queryTimeout queryTimeout
+ * @param useTryLock useTryLock
+ * @return this
+ * @throws Exception exception
+ */
+ public LegacyXaDataSourceImp buildTimeOut(Long blockingTimeoutMillis, Long idleTimeoutMinutes,
+ Integer allocationRetry, Long allocationRetryWaitMillis, Integer xaResourceTimeout,
+ Boolean setTxQueryTimeout, Long queryTimeout,
Long useTryLock) throws Exception
{
- timeOut = new TimeOutImpl(blockingTimeoutMillis, idleTimeoutMinutes, allocationRetry,allocationRetryWaitMillis, xaResourceTimeout, setTxQueryTimeout,
+ timeOut = new TimeOutImpl(blockingTimeoutMillis, idleTimeoutMinutes, allocationRetry,
+ allocationRetryWaitMillis, xaResourceTimeout, setTxQueryTimeout,
queryTimeout, useTryLock);
return this;
}
- public LegacyXaDataSourceImp buildDsSecurity(String userName, String password, String securityDomain, Extension reauthPlugin)
- throws Exception
+ /**
+ * build security part
+ *
+ * @param userName userName
+ * @param password password
+ * @param securityDomain securityDomain
+ * @param reauthPlugin reauthPlugin
+ * @return this
+ * @throws Exception exception
+ */
+ public LegacyXaDataSourceImp buildDsSecurity(String userName, String password, String securityDomain,
+ Extension reauthPlugin) throws Exception
{
security = new DsSecurityImpl(userName, password, securityDomain, reauthPlugin);
return this;
}
-
+
+ /**
+ * build statement part
+ *
+ * @param sharePreparedStatements sharePreparedStatements
+ * @param preparedStatementsCacheSize preparedStatementsCacheSize
+ * @param trackStatements trackStatements
+ * @return this
+ * @throws Exception exception
+ */
public LegacyXaDataSourceImp buildStatement(Boolean sharePreparedStatements, Long preparedStatementsCacheSize,
TrackStatementsEnum trackStatements) throws Exception
{
statement = new StatementImpl(sharePreparedStatements, preparedStatementsCacheSize, trackStatements);
return this;
}
-
- public LegacyXaDataSourceImp buildValidation(Boolean backgroundValidation, Long backgroundValidationMillis, Boolean useFastFail,
+
+ /**
+ * build validation part
+ *
+ * @param backgroundValidation backgroundValidation
+ * @param backgroundValidationMillis backgroundValidationMillis
+ * @param useFastFail useFastFail
+ * @param validConnectionChecker validConnectionChecker
+ * @param checkValidConnectionSql checkValidConnectionSql
+ * @param validateOnMatch validateOnMatch
+ * @param staleConnectionChecker staleConnectionChecker
+ * @param exceptionSorter exceptionSorter
+ * @return this
+ * @throws Exception exception
+ */
+ public LegacyXaDataSourceImp buildValidation(Boolean backgroundValidation, Long backgroundValidationMillis,
+ Boolean useFastFail,
Extension validConnectionChecker, String checkValidConnectionSql, Boolean validateOnMatch,
Extension staleConnectionChecker, Extension exceptionSorter) throws Exception
{
@@ -179,7 +232,18 @@
staleConnectionChecker, exceptionSorter);
return this;
}
-
+
+ /**
+ * build pool part
+ *
+ * @param minPoolSize minPoolSize
+ * @param maxPoolSize maxPoolSize
+ * @param prefill prefill
+ * @param useStrictMin useStrictMin
+ * @param flushStrategy flushStrategy
+ * @return this
+ * @throws Exception exception
+ */
public LegacyXaDataSourceImp buildCommonPool(Integer minPoolSize, Integer maxPoolSize,
Boolean prefill, Boolean useStrictMin,
FlushStrategy flushStrategy) throws Exception
@@ -190,7 +254,23 @@
return this;
}
- public LegacyXaDataSourceImp buildOther(String urlDelimiter, String urlSelectorStrategyClassName, String newConnectionSql,
+ /**
+ * build other properties
+ *
+ * @param urlDelimiter urlDelimiter
+ * @param urlSelectorStrategyClassName urlSelectorStrategyClassName
+ * @param newConnectionSql newConnectionSql
+ * @param useJavaContext useJavaContext
+ * @param poolName poolName
+ * @param enabled enabled
+ * @param jndiName jndiName
+ * @param spy spy
+ * @param useCcm useCcm
+ * @param jta jta
+ * @return this
+ */
+ public LegacyXaDataSourceImp buildOther(String urlDelimiter, String urlSelectorStrategyClassName,
+ String newConnectionSql,
Boolean useJavaContext, String poolName, Boolean enabled, String jndiName,
Boolean spy, Boolean useCcm, Boolean jta)
{
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-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LocalTxDataSource.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -41,13 +41,17 @@
*/
public TransactionIsolation getTransactionIsolation();
+ /**
+ * isNoTxSeparatePools
+ * @return nTxSeparatePools
+ */
public boolean isNoTxSeparatePools();
/**
- *
* A Tag.
*/
- public enum Tag {
+ public enum Tag
+ {
/**
* always first
*/
@@ -59,6 +63,9 @@
*/
TRANSACTION_ISOLATION("transaction-isolation"),
+ /**
+ * no-tx-separate-pools tag
+ */
NO_TX_SEPARATE_POOLS("no-tx-separate-pools"),
/**
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/Main.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/Main.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/Main.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -40,7 +40,8 @@
/**
* Main
- * @param args
+ * @param args args
+ * @throws Exception exception
*/
public static void main(String[] args) throws Exception
{
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxConnectionFactory.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxConnectionFactory.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -59,15 +59,25 @@
*
* A Tag.
*/
- public enum Tag {
+ public enum Tag
+ {
/**
* always first
*/
UNKNOWN(null),
//more by ConnectionFactory
+ /**
+ * rar-name tag
+ */
RAR_NAME("rar-name"),
+ /**
+ * connection-definition tag
+ */
CONNECTION_DEFINITION("connection-definition"),
+ /**
+ * config-property tag
+ */
CONFIG_PROPERTY("config-property"),
/**
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-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/NoTxDataSource.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -57,7 +57,8 @@
*
* A Tag.
*/
- public enum Tag {
+ public enum Tag
+ {
/**
* always first
*/
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/TxConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/TxConnectionFactory.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/TxConnectionFactory.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -46,7 +46,8 @@
*
* A Tag.
*/
- public enum Tag {
+ public enum Tag
+ {
/**
* always first
*/
@@ -67,9 +68,20 @@
*/
XA_RESOURCE_TIMEOUT("xa-resource-timeout"),
- RAR_NAME("rar-name"), CONNECTION_DEFINITION("connection-definition"), CONFIG_PROPERTY("config-property"),
-
/**
+ * rar-name tag
+ */
+ RAR_NAME("rar-name"),
+ /**
+ * connection-definition tag
+ */
+ CONNECTION_DEFINITION("connection-definition"),
+ /**
+ * config-property tag
+ */
+ CONFIG_PROPERTY("config-property"),
+
+ /**
* jndiName tag
*/
JNDI_NAME("jndi-name"),
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-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -86,7 +86,8 @@
*
* A Tag.
*/
- public enum Tag {
+ public enum Tag
+ {
/**
* always first
*/
Added: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/package.html
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/package.html (rev 0)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/package.html 2011-10-17 02:57:07 UTC (rev 112352)
@@ -0,0 +1,3 @@
+<body>
+This package contains the IronJacamar converter.
+</body>
Modified: projects/jboss-jca/trunk/as/src/test/java/org/jboss/jca/as/converters/ParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/as/src/test/java/org/jboss/jca/as/converters/ParserTestCase.java 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/as/src/test/java/org/jboss/jca/as/converters/ParserTestCase.java 2011-10-17 02:57:07 UTC (rev 112352)
@@ -27,7 +27,6 @@
import org.jboss.logging.Logger;
import org.junit.Test;
-import org.junit.Ignore;
import static org.junit.Assert.*;
/**
@@ -40,48 +39,48 @@
{
private static Logger log = Logger.getLogger(ParserTestCase.class);
- String[] xaFilesName = {
- "db2-jcc-xa-ds.xml",
- "informix-xa-ds.xml",
- "mysql-xa-ds.xml",
- "postgres-xa-ds.xml",
- "db2-xa-ds.xml",
- "mimer-xa-ds.xml",
- "oracle-xa-ds.xml",
- "sybase-xa-ds.xml",
- "derby-xa-ds.xml",
- "mssql-xa-ds.xml",
- "pointbase-xa-ds.xml"
- };
+ private String[] xaFilesName = {
+ "db2-jcc-xa-ds.xml",
+ "informix-xa-ds.xml",
+ "mysql-xa-ds.xml",
+ "postgres-xa-ds.xml",
+ "db2-xa-ds.xml",
+ "mimer-xa-ds.xml",
+ "oracle-xa-ds.xml",
+ "sybase-xa-ds.xml",
+ "derby-xa-ds.xml",
+ "mssql-xa-ds.xml",
+ "pointbase-xa-ds.xml"
+ };
- String[] dsFilesName = {
- "asapxcess-jb3.2-ds.xml",
- "hsqldb-ds.xml",
- "cicsr9s-ds.xml",
- "hsqldb-encrypted-ds.xml",
- "oracle-ds.xml",
- "db2-400-ds.xml",
- "informix-ds.xml",
- "db2-ds.xml",
- "pointbase-ds.xml",
- "jdatastore-ds.xml",
- "jms-ds.xml",
- "postgres-ds.xml",
- "derby-ds.xml",
- "jsql-ds.xml",
- "mimer-ds.xml",
- "progress-ds.xml",
- "facets-ds.xml",
- "sapdb-ds.xml",
- "fastobjects-jboss32-ds.xml",
- "msaccess-ds.xml",
- "sapr3-ds.xml",
- "firebird-ds.xml",
- "mssql-ds.xml",
- "solid-ds.xml",
- "sybase-ds.xml",
- "hajndi-jms-ds.xml",
- "mysql-ds.xml"
+ private String[] dsFilesName = {
+ "asapxcess-jb3.2-ds.xml",
+ "hsqldb-ds.xml",
+ "cicsr9s-ds.xml",
+ "hsqldb-encrypted-ds.xml",
+ "oracle-ds.xml",
+ "db2-400-ds.xml",
+ "informix-ds.xml",
+ "db2-ds.xml",
+ "pointbase-ds.xml",
+ "jdatastore-ds.xml",
+ "jms-ds.xml",
+ "postgres-ds.xml",
+ "derby-ds.xml",
+ "jsql-ds.xml",
+ "mimer-ds.xml",
+ "progress-ds.xml",
+ "facets-ds.xml",
+ "sapdb-ds.xml",
+ "fastobjects-jboss32-ds.xml",
+ "msaccess-ds.xml",
+ "sapr3-ds.xml",
+ "firebird-ds.xml",
+ "mssql-ds.xml",
+ "solid-ds.xml",
+ "sybase-ds.xml",
+ "hajndi-jms-ds.xml",
+ "mysql-ds.xml"
};
/**
Added: projects/jboss-jca/trunk/as/src/test/java/org/jboss/jca/as/converters/package.html
===================================================================
--- projects/jboss-jca/trunk/as/src/test/java/org/jboss/jca/as/converters/package.html (rev 0)
+++ projects/jboss-jca/trunk/as/src/test/java/org/jboss/jca/as/converters/package.html 2011-10-17 02:57:07 UTC (rev 112352)
@@ -0,0 +1,3 @@
+<body>
+This package contains the IronJacamar converter testcase.
+</body>
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2011-10-14 16:14:39 UTC (rev 112351)
+++ projects/jboss-jca/trunk/build.xml 2011-10-17 02:57:07 UTC (rev 112352)
@@ -388,6 +388,7 @@
<ant dir="codegenerator" inheritRefs="true" target="prepare-test"/>
<ant dir="adapters" inheritRefs="true" target="prepare-test"/>
<ant dir="rhq" inheritRefs="true" target="prepare-test"/>
+ <ant dir="as" inheritRefs="true" target="prepare-test"/>
</target>
<!-- =================================
@@ -401,6 +402,7 @@
<ant dir="validator" inheritRefs="true" target="test"/>
<ant dir="adapters" inheritRefs="true" target="test"/>
<ant dir="rhq" inheritRefs="true" target="test"/>
+ <ant dir="as" inheritRefs="true" target="test"/>
</target>
<!-- =================================
More information about the jboss-cvs-commits
mailing list