[jboss-cvs] JBossAS SVN: r108173 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/metadata/common and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 16 10:05:25 EDT 2010
Author: maeste
Date: 2010-09-16 10:05:23 -0400 (Thu, 16 Sep 2010)
New Revision: 108173
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.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/TimeOutImpl.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
Log:
JBJCA-400, JBJCA-401, JBJCA-414: fixing data types
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -55,7 +55,7 @@
*
* @return the allocationRetryWaitMillis.
*/
- public Long getAllocationRetry();
+ public Integer getAllocationRetry();
/**
* Get the allocationRetryWaitMillis.
@@ -69,7 +69,7 @@
*
* @return the xaResourceTimeout.
*/
- public Long getXaResourceTimeout();
+ public Integer getXaResourceTimeout();
/**
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -40,35 +40,35 @@
*
* @return the isSameRmOverride.
*/
- public boolean isSameRmOverride();
+ public Boolean isSameRmOverride();
/**
* Get the interleaving.
*
* @return the interleaving.
*/
- public boolean isInterleaving();
+ public Boolean isInterleaving();
/**
* Get the padXid.
*
* @return the padXid.
*/
- public boolean isPadXid();
+ public Boolean isPadXid();
/**
* Get the wrapXaDataSource.
*
* @return the wrapXaDataSource.
*/
- public boolean isWrapXaDataSource();
+ public Boolean isWrapXaDataSource();
/**
* Get the noTxSeparatePool.
*
* @return the noTxSeparatePool.
*/
- public boolean isNoTxSeparatePool();
+ public Boolean isNoTxSeparatePool();
/**
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -230,8 +230,8 @@
Long blockingTimeoutMillis = null;
Long allocationRetryWaitMillis = null;
Long idleTimeoutMinutes = null;
- Long allocationRetry = null;
- Long xaResourceTimeout = null;
+ Integer allocationRetry = null;
+ Integer xaResourceTimeout = null;
while (reader.hasNext())
{
@@ -261,7 +261,7 @@
break;
}
case ALLOCATIONRETRY : {
- allocationRetry = elementAsLong(reader);
+ allocationRetry = elementAsInteger(reader);
break;
}
case BLOCKINGTIMEOUTMILLIS : {
@@ -276,7 +276,7 @@
if (!isXa)
throw new ParserException("Element:" + reader.getLocalName() +
"cannot be set without an xa-pool");
- xaResourceTimeout = elementAsLong(reader);
+ xaResourceTimeout = elementAsInteger(reader);
break;
}
default :
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -43,13 +43,13 @@
protected final Long idleTimeoutMinutes;
/** allocationRetry **/
- protected final Long allocationRetry;
+ protected final Integer allocationRetry;
/** allocationRetryWaitMillis **/
protected final Long allocationRetryWaitMillis;
/** xaResourceTimeout **/
- protected final Long xaResourceTimeout;
+ protected final Integer xaResourceTimeout;
/**
* Create a new STimeOutImpl.
@@ -60,8 +60,8 @@
* @param allocationRetryWaitMillis allocationRetryWaitMillis
* @param xaResourceTimeout xaResourceTimeout
*/
- public CommonTimeOutImpl(Long blockingTimeoutMillis, Long idleTimeoutMinutes, Long allocationRetry,
- Long allocationRetryWaitMillis, Long xaResourceTimeout)
+ public CommonTimeOutImpl(Long blockingTimeoutMillis, Long idleTimeoutMinutes, Integer allocationRetry,
+ Long allocationRetryWaitMillis, Integer xaResourceTimeout)
{
super();
this.blockingTimeoutMillis = blockingTimeoutMillis;
@@ -99,7 +99,7 @@
* @return the allocationRetry.
*/
@Override
- public final Long getAllocationRetry()
+ public final Integer getAllocationRetry()
{
return allocationRetry;
}
@@ -121,7 +121,7 @@
* @return the xaResourceTimeout.
*/
@Override
- public Long getXaResourceTimeout()
+ public Integer getXaResourceTimeout()
{
return xaResourceTimeout;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -35,15 +35,15 @@
/** The serialVersionUID */
private static final long serialVersionUID = 3261597366235425250L;
- private final boolean isSameRmOverride;
+ private final Boolean isSameRmOverride;
- private final boolean interleaving;
+ private final Boolean interleaving;
- private final boolean padXid;
+ private final Boolean padXid;
- private final boolean wrapXaDataSource;
+ private final Boolean wrapXaDataSource;
- private final boolean noTxSeparatePool;
+ private final Boolean noTxSeparatePool;
@@ -60,9 +60,9 @@
* @param wrapXaDataSource wrapXaDataSource
* @param noTxSeparatePool noTxSeparatePool
*/
- public CommonXaPoolImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill, boolean useStrictMin,
- boolean isSameRmOverride, boolean interleaving, boolean padXid, boolean wrapXaDataSource,
- boolean noTxSeparatePool)
+ public CommonXaPoolImpl(Integer minPoolSize, Integer maxPoolSize, Boolean prefill, Boolean useStrictMin,
+ Boolean isSameRmOverride, Boolean interleaving, Boolean padXid, Boolean wrapXaDataSource,
+ Boolean noTxSeparatePool)
{
super(minPoolSize, maxPoolSize, prefill, useStrictMin);
this.isSameRmOverride = isSameRmOverride;
@@ -78,7 +78,7 @@
* @return the isSameRmOverride.
*/
@Override
- public final boolean isSameRmOverride()
+ public final Boolean isSameRmOverride()
{
return isSameRmOverride;
}
@@ -89,7 +89,7 @@
* @return the interleaving.
*/
@Override
- public final boolean isInterleaving()
+ public final Boolean isInterleaving()
{
return interleaving;
}
@@ -100,7 +100,7 @@
* @return the padXid.
*/
@Override
- public final boolean isPadXid()
+ public final Boolean isPadXid()
{
return padXid;
}
@@ -111,7 +111,7 @@
* @return the wrapXaDataSource.
*/
@Override
- public final boolean isWrapXaDataSource()
+ public final Boolean isWrapXaDataSource()
{
return wrapXaDataSource;
}
@@ -122,7 +122,7 @@
* @return the noTxSeparatePool.
*/
@Override
- public final boolean isNoTxSeparatePool()
+ public final Boolean isNoTxSeparatePool()
{
return noTxSeparatePool;
}
@@ -132,11 +132,11 @@
{
final int prime = 31;
int result = 1;
- result = prime * result + (interleaving ? 1231 : 1237);
- result = prime * result + (isSameRmOverride ? 1231 : 1237);
- result = prime * result + (noTxSeparatePool ? 1231 : 1237);
- result = prime * result + (padXid ? 1231 : 1237);
- result = prime * result + (wrapXaDataSource ? 1231 : 1237);
+ result = prime * result + ((interleaving == null) ? 0 : interleaving.hashCode());
+ result = prime * result + ((isSameRmOverride == null) ? 0 : isSameRmOverride.hashCode());
+ result = prime * result + ((noTxSeparatePool == null) ? 0 : noTxSeparatePool.hashCode());
+ result = prime * result + ((padXid == null) ? 0 : padXid.hashCode());
+ result = prime * result + ((wrapXaDataSource == null) ? 0 : wrapXaDataSource.hashCode());
return result;
}
@@ -150,15 +150,40 @@
if (!(obj instanceof CommonXaPoolImpl))
return false;
CommonXaPoolImpl other = (CommonXaPoolImpl) obj;
- if (interleaving != other.interleaving)
+ if (interleaving == null)
+ {
+ if (other.interleaving != null)
+ return false;
+ }
+ else if (!interleaving.equals(other.interleaving))
return false;
- if (isSameRmOverride != other.isSameRmOverride)
+ if (isSameRmOverride == null)
+ {
+ if (other.isSameRmOverride != null)
+ return false;
+ }
+ else if (!isSameRmOverride.equals(other.isSameRmOverride))
return false;
- if (noTxSeparatePool != other.noTxSeparatePool)
+ if (noTxSeparatePool == null)
+ {
+ if (other.noTxSeparatePool != null)
+ return false;
+ }
+ else if (!noTxSeparatePool.equals(other.noTxSeparatePool))
return false;
- if (padXid != other.padXid)
+ if (padXid == null)
+ {
+ if (other.padXid != null)
+ return false;
+ }
+ else if (!padXid.equals(other.padXid))
return false;
- if (wrapXaDataSource != other.wrapXaDataSource)
+ if (wrapXaDataSource == null)
+ {
+ if (other.wrapXaDataSource != null)
+ return false;
+ }
+ else if (!wrapXaDataSource.equals(other.wrapXaDataSource))
return false;
return true;
}
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 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -508,10 +508,10 @@
Long idleTimeoutMinutes = null;
boolean setTxQuertTimeout = false;
Long queryTimeout = null;
- Long allocationRetry = null;
+ Integer allocationRetry = null;
Long allocationRetryWaitMillis = null;
Long useTryLock = null;
- Long xaResourceTimeout = null;
+ Integer xaResourceTimeout = null;
while (reader.hasNext())
{
@@ -538,7 +538,7 @@
switch (TimeOut.Tag.forName(reader.getLocalName()))
{
case ALLOCATIONRETRY : {
- allocationRetry = elementAsLong(reader);
+ allocationRetry = elementAsInteger(reader);
break;
}
case ALLOCATIONRETRYWAITMILLIS : {
@@ -566,7 +566,7 @@
break;
}
case XARESOURCETIMEOUT : {
- xaResourceTimeout = elementAsLong(reader);
+ xaResourceTimeout = elementAsInteger(reader);
break;
}
default :
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -53,8 +53,8 @@
* @param queryTimeout queryTimeout
* @param useTryLock useTryLock
*/
- public TimeOutImpl(Long blockingTimeoutMillis, Long idleTimeoutMinutes, Long allocationRetry,
- Long allocationRetryWaitMillis, Long xaResourceTimeout, boolean setTxQuertTimeout, Long queryTimeout,
+ public TimeOutImpl(Long blockingTimeoutMillis, Long idleTimeoutMinutes, Integer allocationRetry,
+ Long allocationRetryWaitMillis, Integer xaResourceTimeout, boolean setTxQuertTimeout, Long queryTimeout,
Long useTryLock)
{
super(blockingTimeoutMillis, idleTimeoutMinutes, allocationRetry, allocationRetryWaitMillis,
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -420,11 +420,11 @@
//timeout defaults
CommonTimeOut t = connDef.getTimeOut();
- assertThat(t.getAllocationRetry(), new IsNull<Long>());
+ assertThat(t.getAllocationRetry(), new IsNull<Integer>());
assertThat(t.getAllocationRetryWaitMillis(), new IsNull<Long>());
assertThat(t.getBlockingTimeoutMillis(), new IsNull<Long>());
assertThat(t.getIdleTimeoutMinutes(), new IsNull<Long>());
- assertThat(t.getXaResourceTimeout(), new IsNull<Long>());
+ assertThat(t.getXaResourceTimeout(), new IsNull<Integer>());
//validation default
CommonValidation v = connDef.getValidation();
@@ -482,11 +482,11 @@
//timeout defaults
CommonTimeOut t = connDef.getTimeOut();
- assertThat(t.getAllocationRetry(), new IsNull<Long>());
+ assertThat(t.getAllocationRetry(), new IsNull<Integer>());
assertThat(t.getAllocationRetryWaitMillis(), new IsNull<Long>());
assertThat(t.getBlockingTimeoutMillis(), new IsNull<Long>());
assertThat(t.getIdleTimeoutMinutes(), new IsNull<Long>());
- assertThat(t.getXaResourceTimeout(), new IsNull<Long>());
+ assertThat(t.getXaResourceTimeout(), new IsNull<Integer>());
//validation default
CommonValidation v = connDef.getValidation();
@@ -560,7 +560,7 @@
//timeout
CommonTimeOut t = connDef.getTimeOut();
- assertThat(t.getXaResourceTimeout(), is(100L));
+ assertThat(t.getXaResourceTimeout(), is(100));
}
finally
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -31,7 +31,7 @@
import javax.transaction.TransactionManager;
/**
- * The connection manager factory.
+ * The connection manager factory.
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
public class ConnectionManagerFactory
@@ -51,10 +51,8 @@
* @param allocationRetryWaitMillis The allocation retry millis value
* @return The connection manager instance
*/
- public NoTxConnectionManager createNonTransactional(final TransactionSupportLevel tsl,
- final Pool pool,
- final Long allocationRetry,
- final Long allocationRetryWaitMillis)
+ public NoTxConnectionManager createNonTransactional(final TransactionSupportLevel tsl, final Pool pool,
+ final Integer allocationRetry, final Long allocationRetryWaitMillis)
{
if (tsl == null)
throw new IllegalArgumentException("TransactionSupportLevel is null");
@@ -66,17 +64,17 @@
switch (tsl)
{
- case NoTransaction:
+ case NoTransaction :
cm = new NoTxConnectionManagerImpl();
break;
- case LocalTransaction:
+ case LocalTransaction :
throw new IllegalArgumentException("Transactional connection manager not supported");
- case XATransaction:
+ case XATransaction :
throw new IllegalArgumentException("Transactional connection manager not supported");
- default:
+ default :
throw new IllegalArgumentException("Unknown transaction support level " + tsl);
}
@@ -94,11 +92,8 @@
* @param tm The transaction manager
* @return The connection manager instance
*/
- public TxConnectionManager createTransactional(final TransactionSupportLevel tsl,
- final Pool pool,
- final Long allocationRetry,
- final Long allocationRetryWaitMillis,
- final TransactionManager tm)
+ public TxConnectionManager createTransactional(final TransactionSupportLevel tsl, final Pool pool,
+ final Integer allocationRetry, final Long allocationRetryWaitMillis, final TransactionManager tm)
{
if (tsl == null)
throw new IllegalArgumentException("TransactionSupportLevel is null");
@@ -113,18 +108,18 @@
switch (tsl)
{
- case NoTransaction:
+ case NoTransaction :
throw new IllegalArgumentException("Non transactional connection manager not supported");
- case LocalTransaction:
+ case LocalTransaction :
cm = new TxConnectionManagerImpl(tm, true);
break;
- case XATransaction:
+ case XATransaction :
cm = new TxConnectionManagerImpl(tm, false);
break;
- default:
+ default :
throw new IllegalArgumentException("Unknown transaction support level " + tsl);
}
@@ -142,11 +137,8 @@
* @param tm The transaction manager
* @return The updated connection manager
*/
- private AbstractConnectionManager setProperties(AbstractConnectionManager cm,
- Pool pool,
- Long allocationRetry,
- Long allocationRetryWaitMillis,
- TransactionManager tm)
+ private AbstractConnectionManager setProperties(AbstractConnectionManager cm, Pool pool,
+ Integer allocationRetry, Long allocationRetryWaitMillis, TransactionManager tm)
{
pool.setConnectionListenerFactory(cm);
cm.setPool(pool);
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -253,7 +253,7 @@
if (!jndiName.startsWith("java:/"))
jndiName = "java:/" + jndiName;
- Object cf = deployDataSource(dataSource,
+ Object cf = deployDataSource(dataSource,
jndiName,
urlJdbcLocal,
jdbcLocalDeployment.getClassLoader());
@@ -399,7 +399,7 @@
Pool pool = pf.create(PoolStrategy.ONE_POOL, mcf, pc, true);
// Connection manager properties
- Long allocationRetry = null; // TODO
+ Integer allocationRetry = null; // TODO
Long allocationRetryWaitMillis = null;
if (ds.getTimeOut() != null)
@@ -411,7 +411,7 @@
// Select the correct connection manager
TransactionSupportLevel tsl = TransactionSupportLevel.LocalTransaction;
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
- ConnectionManager cm = cmf.createTransactional(tsl,
+ ConnectionManager cm = cmf.createTransactional(tsl,
pool,
allocationRetry,
allocationRetryWaitMillis,
@@ -474,7 +474,7 @@
Pool pool = pf.create(PoolStrategy.ONE_POOL, mcf, pc, true);
// Connection manager properties
- Long allocationRetry = null; // TODO
+ Integer allocationRetry = null; // TODO
Long allocationRetryWaitMillis = null;
if (ds.getTimeOut() != null)
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -400,7 +400,7 @@
tsl = ((TransactionSupport) mcf).getTransactionSupport();
// Connection manager properties
- Long allocationRetry = null; // TODO
+ Integer allocationRetry = null; // TODO
Long allocationRetryWaitMillis = null;
if (ijmd != null)
@@ -523,7 +523,7 @@
tsl = ((TransactionSupport) mcf).getTransactionSupport();
// Connection manager properties
- Long allocationRetry = null; // TODO
+ Integer allocationRetry = null; // TODO
Long allocationRetryWaitMillis = null;
if (ijmd != null)
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -295,7 +295,7 @@
}
// Connection manager properties
- Long allocationRetry = null; // TODO
+ Integer allocationRetry = null; // TODO
Long allocationRetryWaitMillis = null;
if (ijmd != null)
@@ -431,7 +431,7 @@
tsl = ((TransactionSupport) mcf).getTransactionSupport();
// Connection manager properties
- Long allocationRetry = null; // TODO
+ Integer allocationRetry = null; // TODO
Long allocationRetryWaitMillis = null;
if (ijmd != null)
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2010-09-16 13:32:37 UTC (rev 108172)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2010-09-16 14:05:23 UTC (rev 108173)
@@ -404,7 +404,7 @@
tsl = ((TransactionSupport) mcf).getTransactionSupport();
// Connection manager properties
- Long allocationRetry = null; // TODO
+ Integer allocationRetry = null; // TODO
Long allocationRetryWaitMillis = null;
if (ijmd != null)
@@ -543,7 +543,7 @@
tsl = ((TransactionSupport) mcf).getTransactionSupport();
// Connection manager properties
- Long allocationRetry = null; // TODO
+ Integer allocationRetry = null; // TODO
Long allocationRetryWaitMillis = null;
if (ijmd != null)
More information about the jboss-cvs-commits
mailing list