[jboss-cvs] JBossAS SVN: r96649 - in projects/jboss-jca/trunk: core/src/main/java/org/jboss/jca/core/connectionmanager and 18 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 20 13:13:27 EST 2009
Author: jesper.pedersen
Date: 2009-11-20 13:13:26 -0500 (Fri, 20 Nov 2009)
New Revision: 96649
Added:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/InternalConnectionManager.java
Removed:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionCounter.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/RealConnectionManager.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/ConnectionCounterTestCase.java
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/ConnectionManager.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/CachedConnectionManager.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionValidator.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/IdleRemover.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/KeyConnectionAssociation.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/ConnectionListener.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/ConnectionState.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManager.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/InternalManagedConnectionPool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolFiller.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolParams.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/SubPoolContext.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/ManagedConnectionPool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/CriKey.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/SubjectCriKey.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/SubjectKey.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManager.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/LocalXAResource.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java
projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/common/MockConnectionManager.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/nontx/NonTxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/tx/TxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/tx/XATxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/resources/connectionmanager-jboss-beans.xml
projects/jboss-jca/trunk/deployers/build.xml
projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
Log:
ConnectionManager: Rip out connection stats and statistics
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/ConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/ConnectionManager.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/ConnectionManager.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -26,10 +26,10 @@
* The JBoss specific connection manager interface.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
+ * @version $Rev$
*/
public interface ConnectionManager extends
- javax.resource.spi.ConnectionManager
+ javax.resource.spi.ConnectionManager, java.io.Serializable
{
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -53,10 +53,9 @@
* AbstractConnectionManager.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev$
*/
-public abstract class AbstractConnectionManager implements RealConnectionManager
+public abstract class AbstractConnectionManager implements InternalConnectionManager
{
/**Log instance*/
@@ -109,7 +108,7 @@
*/
protected Logger getLog()
{
- return this.log;
+ return log;
}
/**
@@ -127,7 +126,7 @@
*/
public ManagedConnectionPool getPoolingStrategy()
{
- return this.poolingStrategy;
+ return poolingStrategy;
}
/**
@@ -155,7 +154,7 @@
*/
public CachedConnectionManager getCachedConnectionManager()
{
- return this.cachedConnectionManager;
+ return cachedConnectionManager;
}
/**
@@ -225,12 +224,11 @@
*/
public javax.resource.spi.ManagedConnectionFactory getManagedConnectionFactory()
{
- if (this.poolingStrategy == null)
+ if (poolingStrategy == null)
{
- if (this.log.isTraceEnabled())
+ if (trace)
{
log.trace("No pooling strategy found! for connection manager : " + this);
-
return null;
}
}
@@ -308,7 +306,7 @@
{
ResourceException failure = null;
- if (this.shutdown.get())
+ if (shutdown.get())
{
throw new ResourceException("The connection manager is shutdown " + jndiName);
}
@@ -316,23 +314,23 @@
// First attempt
try
{
- return this.poolingStrategy.getConnection(transaction, subject, cri);
+ return poolingStrategy.getConnection(transaction, subject, cri);
}
catch (ResourceException e)
{
failure = e;
// Retry?
- if (this.allocationRetry != 0)
+ if (allocationRetry != 0)
{
- for (int i = 0; i < this.allocationRetry; i++)
+ for (int i = 0; i < allocationRetry; i++)
{
- if (this.shutdown.get())
+ if (shutdown.get())
{
throw new ResourceException("The connection manager is shutdown " + jndiName);
}
- if (this.trace)
+ if (trace)
{
log.trace("Attempting allocation retry for cri=" + cri);
}
@@ -371,7 +369,7 @@
public void returnManagedConnection(ConnectionListener cl, boolean kill)
{
ManagedConnectionPool localStrategy = cl.getManagedConnectionPool();
- if (localStrategy != this.poolingStrategy)
+ if (localStrategy != poolingStrategy)
{
kill = true;
}
@@ -416,14 +414,14 @@
public Object allocateConnection(ManagedConnectionFactory mcf, ConnectionRequestInfo cri) throws ResourceException
{
//Check for pooling!
- if (this.poolingStrategy == null)
+ if (poolingStrategy == null)
{
throw new ResourceException("You are trying to use a connection factory that has been shut down: " +
"ManagedConnectionFactory is null.");
}
//it is an explicit spec requirement that equals be used for matching rather than ==.
- if (!this.poolingStrategy.getManagedConnectionFactory().equals(mcf))
+ if (!poolingStrategy.getManagedConnectionFactory().equals(mcf))
{
throw new ResourceException("Wrong ManagedConnectionFactory sent to allocateConnection!");
}
@@ -459,9 +457,9 @@
// Associate managed connection with the connection
registerAssociation(cl, connection);
- if (this.cachedConnectionManager != null)
+ if (cachedConnectionManager != null)
{
- this.cachedConnectionManager.registerConnection(this, cl, connection, cri);
+ cachedConnectionManager.registerConnection(this, cl, connection, cri);
}
return connection;
@@ -516,7 +514,7 @@
{
// if we have an unshareable connection do not remove the association
// nothing to do
- if (unsharableResources.contains(this.jndiName))
+ if (unsharableResources.contains(jndiName))
{
log.trace("disconnect for unshareable connection: nothing to do");
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/CachedConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/CachedConnectionManager.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/CachedConnectionManager.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -57,7 +57,7 @@
/**
* CacheConnectionManager.
- * @version $Rev$ $Date$
+ * @version $Rev$
*
*/
public class CachedConnectionManager implements
@@ -95,8 +95,8 @@
* the idiot spec compliant behavior.
*/
private final Map<KeyConnectionAssociation, Map<ConnectionCacheListener, Collection<ConnectionRecord>>>
- objectToConnectionManagerMap = new HashMap<KeyConnectionAssociation,
- Map<ConnectionCacheListener, Collection<ConnectionRecord>>>();
+ objectToConnectionManagerMap = new HashMap<KeyConnectionAssociation,
+ Map<ConnectionCacheListener, Collection<ConnectionRecord>>>();
/**
* Connection stacktraces
@@ -117,7 +117,7 @@
*/
public TransactionManager getTransactionManager()
{
- return this.transactionManager;
+ return transactionManager;
}
/**
@@ -189,9 +189,9 @@
@SuppressWarnings("unchecked")
public void popMetaAwareObject(Set unsharableResources) throws ResourceException
{
- LinkedList<Object> stack = this.currentObjects.get();
+ LinkedList<Object> stack = currentObjects.get();
KeyConnectionAssociation oldKey = (KeyConnectionAssociation) stack.removeLast();
- if (this.trace)
+ if (trace)
{
log.trace("popped object: " + Strings.defaultToString(oldKey));
}
@@ -201,9 +201,9 @@
disconnect(oldKey, unsharableResources);
} // end of if ()
- if (this.debug)
+ if (debug)
{
- if (closeAll(oldKey.getCMToConnectionsMap()) && this.error)
+ if (closeAll(oldKey.getCMToConnectionsMap()) && error)
{
throw new ResourceException("Some connections were not closed, " +
"see the log for the allocation stacktraces");
@@ -222,17 +222,17 @@
public void registerConnection(ConnectionCacheListener cm, ConnectionListener cl,
Object connection, ConnectionRequestInfo cri)
{
- if (this.debug)
+ if (debug)
{
- synchronized (this.connectionStackTraces)
+ synchronized (connectionStackTraces)
{
- this.connectionStackTraces.put(connection, new Throwable("STACKTRACE"));
+ connectionStackTraces.put(connection, new Throwable("STACKTRACE"));
}
}
KeyConnectionAssociation key = peekMetaAwareObject();
- if (this.trace)
+ if (trace)
{
log.trace("registering connection from connection manager " + cm +
", connection : " + connection + ", key: " + key);
@@ -262,7 +262,7 @@
*/
public void unregisterConnection(ConnectionCacheListener cm, Object connection)
{
- if (this.debug)
+ if (debug)
{
CloseConnectionSynchronization cas = getCloseConnectionSynchronization(false);
if (cas != null)
@@ -270,15 +270,15 @@
cas.remove(connection);
}
- synchronized (this.connectionStackTraces)
+ synchronized (connectionStackTraces)
{
- this.connectionStackTraces.remove(connection);
+ connectionStackTraces.remove(connection);
}
}
KeyConnectionAssociation key = peekMetaAwareObject();
- if (this.trace)
+ if (trace)
{
log.trace("unregistering connection from connection manager " + cm +
", object: " + connection + ", key: " + key);
@@ -314,10 +314,10 @@
@SuppressWarnings("unchecked")
public void pushMetaAwareObject(final Object rawKey, Set unsharableResources) throws ResourceException
{
- LinkedList<Object> stack = this.currentObjects.get();
+ LinkedList<Object> stack = currentObjects.get();
if (stack == null)
{
- if (this.trace)
+ if (trace)
{
log.trace("new stack for key: " + Strings.defaultToString(rawKey));
}
@@ -355,9 +355,9 @@
private void reconnect(KeyConnectionAssociation key, Set unsharableResources) throws ResourceException
{
Map<ConnectionCacheListener, Collection<ConnectionRecord>> cmToConnectionsMap = null;
- synchronized (this.objectToConnectionManagerMap)
+ synchronized (objectToConnectionManagerMap)
{
- cmToConnectionsMap = this.objectToConnectionManagerMap.get(key);
+ cmToConnectionsMap = objectToConnectionManagerMap.get(key);
if (cmToConnectionsMap == null)
{
return;
@@ -427,7 +427,7 @@
synchronized (objectToConnectionManagerMap)
{
Iterator<Map<ConnectionCacheListener, Collection<ConnectionRecord>>> it =
- this.objectToConnectionManagerMap.values().iterator();
+ objectToConnectionManagerMap.values().iterator();
while (it.hasNext())
{
@@ -491,9 +491,9 @@
try
{
Transaction tx = null;
- if (this.transactionManager != null)
+ if (transactionManager != null)
{
- tx = this.transactionManager.getTransaction();
+ tx = transactionManager.getTransaction();
}
if (tx != null)
@@ -628,7 +628,7 @@
*/
public void afterCompletion(int status)
{
- this.closing.set(true);
+ closing.set(true);
for (Iterator<Object> i = connections.iterator(); i.hasNext();)
{
Deleted: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionCounter.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionCounter.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionCounter.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -1,149 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.jca.core.connectionmanager;
-
-/**
- * Counter for connection related operations.
- *
- * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
- */
-public class ConnectionCounter
-{
- /**Number of created connection*/
- private volatile int created = 0;
-
- /**Number of destroyed connection*/
- private volatile int destroyed = 0;
-
- /**Total wait time to get Connection from Pool.*/
- private volatile long totalBlockTime;
-
- /**Idle timed out Connection Count.*/
- private volatile int timedOut;
-
- /**The maximum wait time */
- private volatile long maxWaitTime;
-
- /**
- * Returns current connection count
- * @return current connection count
- */
- public int getGuaranteedCount()
- {
- return created - destroyed;
- }
-
- /**
- * Returns current connection count
- * @return current connection count
- */
- public int getCount()
- {
- return created - destroyed;
- }
-
- /**
- * Returns number of created connection.
- * @return connection created
- */
- public int getCreatedCount()
- {
- return created;
- }
-
- /**
- * Returns number of destroyed connection.
- * @return destroyed connection
- */
- public int getDestroyedCount()
- {
- return destroyed;
- }
-
- /**
- * Increment created.
- */
- public void inc()
- {
- ++created;
- }
-
- /**
- * Increment destroyed.
- */
- public void dec()
- {
- ++destroyed;
- }
-
- /**
- * Update block time.
- * @param latest latest block
- */
- public void updateBlockTime(long latest)
- {
- totalBlockTime += latest;
- if (maxWaitTime < latest)
- {
- maxWaitTime = latest;
- }
- }
-
- /**
- * Returns total block time.
- * @return total block time
- */
- public long getTotalBlockTime()
- {
- return totalBlockTime;
- }
-
- /**
- * Gets timed out connections.
- * @return timeout
- */
- public int getTimedOutCount()
- {
- return timedOut;
- }
-
- /**
- * Increment timeout connection.
- */
- public void incTimedOutCount()
- {
- ++timedOut;
- }
-
- /**
- * Returns max wait time.
- * @return max wait time
- */
- public long getMaxWaitTime()
- {
- return maxWaitTime;
- }
-
-}
Deleted: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerImpl.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerImpl.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.jca.core.connectionmanager;
-
-import org.jboss.jca.core.api.ConnectionManager;
-
-import javax.resource.ResourceException;
-import javax.resource.spi.ConnectionRequestInfo;
-import javax.resource.spi.ManagedConnectionFactory;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-
-/**
- * The JBoss specific connection manager interface
- */
-public class ConnectionManagerImpl implements ConnectionManager
-{
- /**Serial version UID*/
- private static final long serialVersionUID = 2843159124540746692L;
-
- /**Real connection manager*/
- private transient RealConnectionManager realConnectionManager;
-
- /**
- * Creates a new instance of connection manager.
- */
- public ConnectionManagerImpl()
- {
- this.realConnectionManager = null;
- }
-
- /**
- * Allocate a connection
- * @param mcf The managed connection factory
- * @param cxRequestInfo The connection request info
- * @return The connection
- * @throws ResourceException Thrown if an error occurs
- */
- public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo cxRequestInfo)
- throws ResourceException
- {
- return this.realConnectionManager.allocateConnection(mcf, cxRequestInfo);
- }
-
- /**
- * {@inheritDoc}
- */
- public void checkTransactionActive() throws RollbackException, SystemException
- {
- this.realConnectionManager.checkTransactionActive();
- }
-
- /**
- * {@inheritDoc}
- */
- public long getTimeLeftBeforeTransactionTimeout(boolean errorRollback) throws RollbackException
- {
- return this.realConnectionManager.getTimeLeftBeforeTransactionTimeout(errorRollback);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getTransactionTimeout() throws SystemException
- {
- return this.realConnectionManager.getTransactionTimeout();
- }
-
- /**
- * {@inheritDoc}
- */
- public RealConnectionManager getRealConnectionManager()
- {
- return this.realConnectionManager;
- }
-
- /**
- * {@inheritDoc}
- */
- public void setRealConnectionManager(RealConnectionManager realConnectionManager)
- {
- this.realConnectionManager = realConnectionManager;
- }
-}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionValidator.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionValidator.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionValidator.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -41,8 +41,7 @@
* Connection validator class.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
public class ConnectionValidator
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/IdleRemover.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/IdleRemover.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/IdleRemover.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -39,8 +39,7 @@
* Connection validator class.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
public class IdleRemover
{
Copied: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/InternalConnectionManager.java (from rev 96642, projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/RealConnectionManager.java)
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/InternalConnectionManager.java (rev 0)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/InternalConnectionManager.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.core.connectionmanager;
+
+import org.jboss.jca.core.api.ConnectionManager;
+import org.jboss.jca.core.connectionmanager.listener.ConnectionCacheListener;
+import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
+import org.jboss.jca.core.connectionmanager.transaction.JTATransactionChecker;
+
+import javax.resource.ResourceException;
+import javax.resource.spi.ConnectionRequestInfo;
+import javax.resource.spi.ManagedConnectionFactory;
+
+import org.jboss.tm.TransactionTimeoutConfiguration;
+
+/**
+ * Internal connection manager contract.
+ * <p>
+ * <ul>
+ * <li>Responsible for managing cached connections over transactional
+ * components via {@link ConnectionCacheListener}</li>
+ * <li>Responsible for managing connection instances using event listener
+ * via {@link ConnectionListenerFactory}</li>
+ * <li>Responsible for managing transaction operations via
+ * {@link TransactionTimeoutConfiguration} and {@link JTATransactionChecker}</li>.
+ * </ul>
+ * </p>
+ * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
+ * @version $Rev: $
+ *
+ */
+public interface InternalConnectionManager extends
+ ConnectionManager,
+ ConnectionCacheListener,
+ ConnectionListenerFactory,
+ TransactionTimeoutConfiguration,
+ JTATransactionChecker
+
+{
+ /**
+ * Gets connection handle instance.
+ * @param mcf managed connection factory
+ * @param cri connection request info
+ * @return ne wconnection
+ * @throws ResourceException for exception
+ */
+ public Object allocateConnection(ManagedConnectionFactory mcf, ConnectionRequestInfo cri) throws ResourceException;
+}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/KeyConnectionAssociation.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/KeyConnectionAssociation.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/KeyConnectionAssociation.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -34,8 +34,8 @@
* The class <code>KeyConnectionAssociation</code> wraps objects so they may be used in hashmaps
* based on their object identity rather than equals implementation. Used for keys.
*
- * @author gurkanerdogdu
- * @version $Rev$ $Date$
+ * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
+ * @version $Rev$
*/
final class KeyConnectionAssociation
{
Deleted: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/RealConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/RealConnectionManager.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/RealConnectionManager.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.core.connectionmanager;
-
-import org.jboss.jca.core.connectionmanager.listener.ConnectionCacheListener;
-import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
-import org.jboss.jca.core.connectionmanager.transaction.JTATransactionChecker;
-
-import javax.resource.ResourceException;
-import javax.resource.spi.ConnectionRequestInfo;
-import javax.resource.spi.ManagedConnectionFactory;
-
-import org.jboss.tm.TransactionTimeoutConfiguration;
-
-/**
- * Real connection manager contract.
- * <p>
- * <ul>
- * <li>Responsible for managing cached connections over transactional
- * components via {@link ConnectionCacheListener}</li>
- * <li>Responsible for managing connection instances using event listener
- * via {@link ConnectionListenerFactory}</li>
- * <li>Responsible for managing transaction operations via
- * {@link TransactionTimeoutConfiguration} and {@link JTATransactionChecker}</li>.
- * </ul>
- * </p>
- * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
- */
-public interface RealConnectionManager extends
- ConnectionCacheListener,
- ConnectionListenerFactory,
- TransactionTimeoutConfiguration,
- JTATransactionChecker
-
-{
- /**
- * Gets connection handle instance.
- * @param mcf managed connection factory
- * @param cri connection request info
- * @return ne wconnection
- * @throws ResourceException for exception
- */
- public Object allocateConnection(ManagedConnectionFactory mcf, ConnectionRequestInfo cri) throws ResourceException;
-}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -40,8 +40,8 @@
* Abstract implementation of the {@link ConnectionListener} interface
* contract.
*
- * @author gurkanerdogdu
- * @version $Rev$ $Date$
+ * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
+ * @version $Rev: $
*
*/
public abstract class AbstractConnectionListener implements ConnectionListener
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/ConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/ConnectionListener.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/ConnectionListener.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -31,8 +31,8 @@
/**
* Connection listener.
*
- * @version $Rev$ $Date$
- * @author gurkanerdogdu
+ * @version $Rev: $
+ * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @author <a href="weston.price at jboss.com">Weston Price</a>
*/
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/ConnectionState.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/ConnectionState.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/ConnectionState.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -30,9 +30,8 @@
* <li>DESTROYED</li>
* </ul>
*
- * @version $Rev$ $Date$
- * @author gurkanerdogdu
- *
+ * @version $Rev: $
+ * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
*/
public enum ConnectionState
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -32,7 +32,7 @@
* NoTx Connection Listener.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
+ * @version $Rev$
* @see AbstractConnectionListener
*/
public class NoTxConnectionListener extends AbstractConnectionListener
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -48,8 +48,7 @@
/**
* Tx connection listener.
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev$
*/
public class TxConnectionListener extends AbstractConnectionListener
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManager.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManager.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -34,17 +34,19 @@
* Non transactional connection manager implementation.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
+ * @version $Rev$
*
*/
public class NoTxConnectionManager extends AbstractConnectionManager
{
+ /** Serial version uid */
+ private static final long serialVersionUID = 1L;
+
/**
* Default constructor.
*/
public NoTxConnectionManager()
{
-
}
/**
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -51,7 +51,7 @@
* method to create map key object.
* </p>
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
+ * @version $Rev$
*
*/
public abstract class AbstractPool implements ManagedConnectionPool, PreFillPoolSupport
@@ -78,37 +78,9 @@
private String poolName;
/** Is trace enabled */
- private boolean traceEnabled = false;
+ private boolean trace = false;
/**
- * Types of the pool's connection
- * counts. Used internally to repeat same
- * code again.
- *
- * @see AbstractPool#getCounts(PoolCounts)
- */
- private enum PoolCounts
- {
- /**Pool connection count*/
- CONNECTION_COUNT,
-
- /**Pool in use connection count*/
- CONNECTION_IN_USE_COUNT,
-
- /**Created connection count for pool*/
- CONNECTION_CREATED_COUNT,
-
- /**Destroyed connection count for pool*/
- CONNECTION_DESTROYED_COUNT,
-
- /**Pool get available connection count*/
- CONNECTION_GET_AVAILABLE_COUNT,
-
- /**Get Max connections in use count*/
- CONNECTION_GET_MAX_CONNECTIONS_IN_USE_COUNT
- }
-
- /**
* Create a new base pool.
*
* @param mcf the managed connection factory
@@ -121,7 +93,7 @@
this.mcf = mcf;
this.poolParams = poolParams;
this.noTxSeparatePools = noTxSeparatePools;
- this.traceEnabled = log.isTraceEnabled();
+ this.trace = log.isTraceEnabled();
}
/**
@@ -198,7 +170,7 @@
{
if (pool != null)
{
- Iterator<SubPoolContext> itSubPoolContexts = this.subPools.values().iterator();
+ Iterator<SubPoolContext> itSubPoolContexts = subPools.values().iterator();
SubPoolContext other = null;
while (itSubPoolContexts.hasNext())
{
@@ -218,7 +190,7 @@
*/
public void flush()
{
- Iterator<SubPoolContext> itSubPoolContexts = this.subPools.values().iterator();
+ Iterator<SubPoolContext> itSubPoolContexts = subPools.values().iterator();
SubPoolContext subPoolContext = null;
while (itSubPoolContexts.hasNext())
{
@@ -226,19 +198,11 @@
subPoolContext.getSubPool().flush();
}
- this.subPools.clear();
+ subPools.clear();
}
/**
* {@inheritDoc}
- */
- public long getAvailableConnectionCount()
- {
- return getCounts(PoolCounts.CONNECTION_GET_AVAILABLE_COUNT);
- }
-
- /**
- * {@inheritDoc}
*/
public ConnectionListener getConnection(Transaction trackByTransaction, Subject subject, ConnectionRequestInfo cri)
throws ResourceException
@@ -247,7 +211,7 @@
boolean separateNoTx = false;
- if (this.noTxSeparatePools)
+ if (noTxSeparatePools)
{
separateNoTx = clf.isTransactional();
}
@@ -307,7 +271,7 @@
//Get connection from imcp
cl = imcp.getConnection(subject, cri);
- if (this.traceEnabled)
+ if (trace)
{
dump("Got connection from pool : " + cl);
}
@@ -333,7 +297,7 @@
//Getting connection from pool
cl = imcp.getConnection(subject, cri);
- if (traceEnabled)
+ if (trace)
{
dump("Got connection from pool (retried) " + cl);
}
@@ -371,7 +335,7 @@
cl = (ConnectionListener) trackByTx.get(trackByTransaction);
if (cl != null)
{
- if (traceEnabled)
+ if (trace)
{
dump("Previous connection tracked by transaction " + cl + " tx=" + trackByTransaction);
}
@@ -410,7 +374,7 @@
// Instead we do a double check after we got the transaction to see
// whether another thread beat us to the punch.
cl = mcp.getConnection(subject, cri);
- if (traceEnabled)
+ if (trace)
{
dump("Got connection from pool tracked by transaction " + cl + " tx=" + trackByTransaction);
}
@@ -423,7 +387,7 @@
catch (Throwable t)
{
mcp.returnConnection(cl, false);
- if (traceEnabled)
+ if (trace)
{
dump("Had to return connection tracked by transaction " + cl + " tx=" +
trackByTransaction + " error=" + t.getMessage());
@@ -439,7 +403,7 @@
if (other != null)
{
mcp.returnConnection(cl, false);
- if (traceEnabled)
+ if (trace)
{
dump("Another thread already got a connection tracked by transaction " +
other + " tx=" + trackByTransaction);
@@ -452,7 +416,7 @@
cl.setTrackByTx(true);
trackByTx.set(cl);
- if (traceEnabled)
+ if (trace)
{
dump("Using connection from pool tracked by transaction " + cl + " tx=" + trackByTransaction);
}
@@ -465,62 +429,13 @@
return cl;
}
-
-
- /**
- * {@inheritDoc}
- */
- public int getConnectionCount()
- {
- return (int)getCounts(PoolCounts.CONNECTION_COUNT);
- }
/**
* {@inheritDoc}
- */
- public int getConnectionCreatedCount()
- {
- return (int)getCounts(PoolCounts.CONNECTION_CREATED_COUNT);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getConnectionDestroyedCount()
- {
- return (int)getCounts(PoolCounts.CONNECTION_DESTROYED_COUNT);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getInUseConnectionCount()
- {
- return (int)getCounts(PoolCounts.CONNECTION_IN_USE_COUNT);
- }
-
- /**
- * {@inheritDoc}
- */
+ */
public ManagedConnectionFactory getManagedConnectionFactory()
- {
- return this.mcf;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getMaxConnectionsInUseCount()
{
- return (int)getCounts(PoolCounts.CONNECTION_GET_MAX_CONNECTIONS_IN_USE_COUNT);
- }
-
- /**
- * {@inheritDoc}
- */
- public Object listUnderlyingNativeConnectionStatistics()
- {
- return null;
+ return mcf;
}
/**
@@ -535,7 +450,7 @@
//Return connection to the pool
mcp.returnConnection(cl, kill);
- if (traceEnabled)
+ if (trace)
{
dump("Returning connection to pool " + cl);
}
@@ -554,7 +469,7 @@
*/
public void shutdown()
{
- Iterator<SubPoolContext> itSubPoolContexts = this.subPools.values().iterator();
+ Iterator<SubPoolContext> itSubPoolContexts = subPools.values().iterator();
SubPoolContext subPoolContext = null;
while (itSubPoolContexts.hasNext())
{
@@ -562,7 +477,7 @@
subPoolContext.getSubPool().shutdown();
}
- this.subPools.clear();
+ subPools.clear();
}
/**
@@ -597,7 +512,6 @@
//Get sub-pool automatically initializes pool
getSubPool(key, subject, cri);
-
}
catch (Throwable t)
{
@@ -632,75 +546,24 @@
*/
public boolean getPreFill()
{
- return this.poolParams.isPrefill();
-
+ return poolParams.isPrefill();
}
-
-
/**
* Dump the stats to the trace log
- *
* @param info some context
*/
private void dump(String info)
{
- if (this.traceEnabled)
- {
- StringBuffer toLog = new StringBuffer(100);
- toLog.append(info).append(" [InUse/Available/Max]: [");
- toLog.append(this.getInUseConnectionCount()).append("/");
- toLog.append(this.getAvailableConnectionCount()).append("/");
- toLog.append(this.poolParams.getMaxSize());
- toLog.append("]");;
- log.trace(toLog);
- }
+ StringBuffer toLog = new StringBuffer(100);
+ toLog.append(info);
+ /*
+ .append(" [InUse/Available/Max]: [");
+ toLog.append(getInUseConnectionCount()).append("/");
+ toLog.append(getAvailableConnectionCount()).append("/");
+ toLog.append(poolParams.getMaxSize());
+ toLog.append("]");
+ */
+ log.trace(toLog);
}
-
- /**
- * Gets pool specific count.
- * @param countType count type
- * @return counts
- */
- private long getCounts(PoolCounts countType)
- {
- long count = 0L;
-
- Iterator<SubPoolContext> itSubPoolContexts = this.subPools.values().iterator();
- SubPoolContext subPoolContext = null;
- while (itSubPoolContexts.hasNext())
- {
- subPoolContext = itSubPoolContexts.next();
- if (countType.equals(PoolCounts.CONNECTION_COUNT))
- {
- count += subPoolContext.getSubPool().getConnectionCount();
- }
- else if (countType.equals(PoolCounts.CONNECTION_IN_USE_COUNT))
- {
- count += subPoolContext.getSubPool().getConnectionInUseCount();
- }
- else if (countType.equals(PoolCounts.CONNECTION_CREATED_COUNT))
- {
- count += subPoolContext.getSubPool().getConnectionCreatedCount();
- }
- else if (countType.equals(PoolCounts.CONNECTION_DESTROYED_COUNT))
- {
- count += subPoolContext.getSubPool().getConnectionDestroyedCount();
- }
- else if (countType.equals(PoolCounts.CONNECTION_GET_AVAILABLE_COUNT))
- {
- count += subPoolContext.getSubPool().getAvailableConnections();
- }
- else if (countType.equals(PoolCounts.CONNECTION_GET_MAX_CONNECTIONS_IN_USE_COUNT))
- {
- count += subPoolContext.getSubPool().getMaxConnectionsInUseCount();
- }
- else
- {
- log.warn("Unknown count type : " + countType.toString());
- }
- }
-
- return count;
- }
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/InternalManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/InternalManagedConnectionPool.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/InternalManagedConnectionPool.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -23,7 +23,6 @@
package org.jboss.jca.core.connectionmanager.pool;
import org.jboss.jca.common.api.JBossResourceException;
-import org.jboss.jca.core.connectionmanager.ConnectionCounter;
import org.jboss.jca.core.connectionmanager.ConnectionValidator;
import org.jboss.jca.core.connectionmanager.IdleConnectionRemovalSupport;
import org.jboss.jca.core.connectionmanager.IdleRemover;
@@ -73,7 +72,7 @@
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
*
- * @version $Rev$ $Date$
+ * @version $Rev: $
*
* @see AbstractPool
*/
@@ -112,9 +111,6 @@
/** Whether trace is enabled */
private final boolean trace = log.isTraceEnabled();
- /** Stats */
- private final ConnectionCounter connectionCounter = new ConnectionCounter();
-
/** The checked out connections */
private final CopyOnWriteArraySet<ConnectionListener> checkedOut = new CopyOnWriteArraySet<ConnectionListener>();
@@ -180,15 +176,9 @@
try
{
- //Update blocked time
- this.connectionCounter.updateBlockTime(System.currentTimeMillis() - startWait);
-
//Check connection is available, and if not waits for the blocking timeout
if (this.permits.tryAcquire(this.poolParams.getBlockingTimeout(), TimeUnit.MILLISECONDS))
{
- long poolBlockTime = (System.currentTimeMillis() - startWait);
- this.connectionCounter.updateBlockTime(poolBlockTime);
-
do
{
//Check shutdown
@@ -275,8 +265,6 @@
catch (InterruptedException e)
{
long end = System.currentTimeMillis() - startWait;
- connectionCounter.updateBlockTime(end);
-
throw new ResourceException("Interrupted while requesting permit! Waited " + end + " ms");
}
@@ -392,14 +380,12 @@
throws ResourceException
{
ManagedConnection mc = mcf.createManagedConnection(subject, cri);
- connectionCounter.inc();
try
{
return clf.createConnectionListener(mc, this);
}
catch (ResourceException re)
{
- connectionCounter.dec();
mc.destroy();
throw re;
}
@@ -419,7 +405,6 @@
return;
}
- connectionCounter.dec();
cl.setState(ConnectionState.DESTROYED);
try
@@ -451,7 +436,6 @@
ConnectionListener cl = cls.get(0);
if (cl.isTimedOut(timeout) && shouldRemove())
{
- connectionCounter.incTimedOutCount();
// We need to destroy this one
cls.remove(0);
if (destroy == null)
@@ -653,99 +637,8 @@
}
}
-
-
- /**
- * Gets connection in use count.
- * @return connection in use
- */
- public int getConnectionInUseCount()
- {
- return this.checkedOut.size();
- }
-
- /**
- * Gets total connection for this pool.
- * @return total connection
- */
- public int getConnectionCount()
- {
- return this.connectionCounter.getCount();
- }
-
- /**
- * Gets total block time.
- * @return total block time
- */
- public long getTotalBlockTime()
- {
- return this.connectionCounter.getTotalBlockTime();
- }
-
- /**
- * Gets timed out.
- * @return timed out
- */
- public int getTimedOutCount()
- {
- return this.connectionCounter.getTimedOutCount();
- }
-
- /**
- * Gets average blocked time.
- * @return average block time.
- */
- public long getAverageBlockTime()
- {
- return this.connectionCounter.getTotalBlockTime() / getConnectionCreatedCount();
- }
-
- /**
- * Gets max wait time.
- * @return max wait time.
- */
- public long getMaxWaitTime()
- {
- return this.connectionCounter.getMaxWaitTime();
- }
/**
- * Gets connection created count.
- * @return connection created count
- */
- public int getConnectionCreatedCount()
- {
- return this.connectionCounter.getCreatedCount();
- }
-
- /**
- * Gets connection destroyed count.
- * @return connection destroyed count
- */
- public int getConnectionDestroyedCount()
- {
- return this.connectionCounter.getDestroyedCount();
- }
-
- /**
- * Gets available connections.
- * @return available connections
- */
- public long getAvailableConnections()
- {
- return permits.availablePermits();
- }
-
- /**
- * Gets max connection in-use count.
- * @return max connection in-use count
- */
- public int getMaxConnectionsInUseCount()
- {
- return this.maxUsedConnections;
- }
-
- /**
* Pool is shut down.
*/
public void shutdown()
@@ -867,12 +760,13 @@
return;
}
- // We already have enough connections
- if (getMinSize() - connectionCounter.getGuaranteedCount() <= 0)
- {
- return;
- }
+ // We already have enough connections -- TODO
+ //if (getMinSize() - connectionCounter.getGuaranteedCount() <= 0)
+ //{
+ return;
+ //}
+ /* -- TODO
// Create a connection to fill the pool
try
{
@@ -889,6 +783,7 @@
log.warn("Unable to fill pool ", re);
return;
}
+ */
}
finally
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolFiller.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolFiller.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolFiller.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -37,7 +37,7 @@
* @author Scott.Stark at jboss.org
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
+ * @version $Rev: $
*/
public class PoolFiller implements Runnable
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolParams.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolParams.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolParams.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -25,8 +25,7 @@
/**
* Pooling parameters.
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- *
- * @version $Rev$ $Date$
+ * @version $Rev: $
*/
public class PoolParams
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/SubPoolContext.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/SubPoolContext.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/SubPoolContext.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -35,8 +35,7 @@
* Sub-pool context.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- *
- * @version $Rev$ $Date$
+ * @version $Rev: $
*/
public class SubPoolContext
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/ManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/ManagedConnectionPool.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/ManagedConnectionPool.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -78,43 +78,13 @@
throws ResourceException;
/**
- * @return the connection count
+ * Shutdown the pool
*/
- int getConnectionCount ();
-
- /**
- * @return the connections in use count
- */
- int getInUseConnectionCount();
-
- /**
- * @return the connections created count
- */
- int getConnectionCreatedCount();
-
- /**
- * @return the connections destroyed count
- */
- int getConnectionDestroyedCount();
-
- /**
- * shutdown the pool
- */
void shutdown();
/**
- * @return the available connections
+ * Flush the pool
*/
- long getAvailableConnectionCount();
-
- /**
- * @return the available connections
- */
- int getMaxConnectionsInUseCount();
-
- /**
- * flush the pool
- */
void flush();
/**
@@ -122,10 +92,4 @@
* @param pool the internal managed connection pool
*/
void emptySubPool(InternalManagedConnectionPool pool);
-
- /**
- * @return the native connection statistics of underlying
- * connection.
- */
- Object listUnderlyingNativeConnectionStatistics();
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/CriKey.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/CriKey.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/CriKey.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -28,8 +28,7 @@
* Pool by {@link ConnectionRequestInfo} key.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
class CriKey
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -35,8 +35,7 @@
* Single pool implementation.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
public class OnePool extends AbstractPool
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -34,8 +34,7 @@
* Pool implementation that uses subject.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
public class PoolByCri extends AbstractPool
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -34,8 +34,7 @@
* Pool implementation that uses subject.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
public class PoolBySubject extends AbstractPool
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -35,8 +35,7 @@
* request info for its pool partition.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
public class PoolBySubjectAndCri extends AbstractPool
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/SubjectCriKey.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/SubjectCriKey.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/SubjectCriKey.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -35,9 +35,7 @@
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @author <a href="mailto:weston.price at jboss.com">Weston Price</a>
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
- *
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
class SubjectCriKey
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/SubjectKey.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/SubjectKey.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/SubjectKey.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -30,8 +30,7 @@
* Pool by {@link Subject} key.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
- *
+ * @version $Rev: $
*/
class SubjectKey
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -45,7 +45,7 @@
*
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @author gurkanerdogdu
- * @version $Rev$ $Date$
+ * @version $Rev$
*/
public class TransactionSynchronizer implements Synchronization
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManager.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManager.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -29,6 +29,9 @@
import org.jboss.jca.core.connectionmanager.xa.LocalXAResource;
import org.jboss.jca.core.connectionmanager.xa.XAResourceWrapperImpl;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -124,8 +127,11 @@
*/
public class TxConnectionManager extends AbstractConnectionManager
{
+ /** Serial version uid */
+ private static final long serialVersionUID = 1L;
+
/**Transaction manager instance*/
- private TransactionManager transactionManager;
+ private transient TransactionManager transactionManager;
/**Interleaving or not*/
private boolean interleaving;
@@ -156,46 +162,24 @@
}
/**
- * Gets transaction manager instance.
- * @return transaction manager
+ * Get the transaction manager instance
+ * @return The transaction manager
*/
public TransactionManager getTransactionManager()
{
- return this.transactionManager;
+ return transactionManager;
}
/**
- * Sets transaction manager.
- * @param tm transaction manager
+ * Set the transaction manager.
+ * @param tm The transaction manager
*/
public void setTransactionManager(TransactionManager tm)
{
- this.transactionManager = tm;
+ transactionManager = tm;
}
/**
- * Gets track connection by tx.
- * @return track connection by tx
- */
- @Deprecated
- public boolean isTrackConnectionByTx()
- {
- getLog().warn("isTrackConnectionByTx() is deprecated in favor of isInterleaving()");
- return !isInterleaving();
- }
-
- /**
- * Set track connection by tx.
- * @param trackConnectionByTx track connection by tx
- */
- @Deprecated
- public void setTrackConnectionByTx(boolean trackConnectionByTx)
- {
- getLog().warn("setTrackConnectionByTx(boolean value) is deprecated in favor of setInterleaving(boolean value)");
- setInterleaving(!trackConnectionByTx);
- }
-
- /**
* Gets interleaving flag.
* @return interleaving flag
*/
@@ -553,5 +537,19 @@
throw new IllegalStateException(context + " tx=" + tx + " marked for rollback.");
throw new NestedRuntimeException(context + " tx=" + tx + " got unexpected error ", t);
}
-
+
+
+ private void writeObject(ObjectOutputStream out)
+ throws IOException
+ {
+
+
+ }
+
+
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
+
+ }
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/LocalXAResource.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/LocalXAResource.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/LocalXAResource.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -37,7 +37,7 @@
* Local XA resource implementation.
*
* @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @version $Rev$ $Date$
+ * @version $Rev$
*/
public class LocalXAResource implements XAResource, LastResource
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -54,8 +54,8 @@
/**
* The work manager implementation.
*
- * @author gurkanerdogdu
- * @version $Rev$ $Date$
+ * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
+ * @version $Rev: $
*/
public class WorkManagerImpl implements WorkManager
{
Modified: projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml 2009-11-20 18:13:26 UTC (rev 96649)
@@ -29,8 +29,4 @@
<property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
</bean>
- <!-- Connection Manager -->
- <bean name="ConnectionManager" interface="org.jboss.jca.core.api.ConnectionManager" class="org.jboss.jca.core.connectionmanager.ConnectionManagerImpl">
- </bean>
-
</deployment>
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/common/MockConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/common/MockConnectionManager.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/common/MockConnectionManager.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -35,12 +35,14 @@
*/
public class MockConnectionManager extends AbstractConnectionManager
{
+ /** Serial version UID */
+ private static final long serialVersionUID = 1L;
+
/**
* Creates a new mock connection manager.
*/
public MockConnectionManager()
{
-
}
/**
Deleted: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/ConnectionCounterTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/ConnectionCounterTestCase.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/ConnectionCounterTestCase.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -1,192 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.jca.test.core.connectionmanager.unit;
-
-import org.jboss.jca.core.connectionmanager.ConnectionCounter;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * <code>ConnectionCounter</code> unit tests.
- *
- * @author gurkanerdogdu
- * @version $Rev$ $Date$
- *
- */
-public class ConnectionCounterTestCase
-{
- /**
- * Test {@link ConnectionCounter#getGuaranteedCount()}.
- */
- @Test
- public void testGetGuaranteedCount()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0, counter.getCreatedCount());
- counter.inc();
- assertEquals(1, counter.getGuaranteedCount());
- counter.inc();
- counter.inc();
- assertEquals(3, counter.getGuaranteedCount());
- counter.dec();
- assertEquals(2, counter.getGuaranteedCount());
- }
-
- /**
- * Test {@link ConnectionCounter#getGuaranteedCount()}.
- */
- @Test
- public void testGetCount()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0, counter.getCreatedCount());
- counter.inc();
- assertEquals(1, counter.getCount());
- counter.inc();
- counter.inc();
- assertEquals(3, counter.getCount());
- counter.dec();
- assertEquals(2, counter.getCount());
-
- }
-
- /**
- * Test {@link ConnectionCounter#GetGuaranteedCount()}.
- */
- @Test
- public void testGetCreatedCount()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0, counter.getCreatedCount());
- counter.inc();
- assertEquals(1, counter.getCreatedCount());
- counter.inc();
- assertEquals(2, counter.getCreatedCount());
- }
-
- /**
- * Test {@link ConnectionCounter#GetGuaranteedCount()}.
- */
- @Test
- public void testGetDestroyedCount()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0, counter.getDestroyedCount());
- counter.inc();
- assertEquals(1, counter.getCreatedCount());
- counter.dec();
- assertEquals(1, counter.getDestroyedCount());
-
- }
-
- /**
- * Test {@link ConnectionCounter#GetGuaranteedCount()}.
- */
- @Test
- public void testInc()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0, counter.getCreatedCount());
-
- for (int i = 0; i < 5; i++)
- {
- counter.inc();
- }
-
- assertEquals(5, counter.getCreatedCount());
- }
-
- /**
- * Test {@link ConnectionCounter#GetGuaranteedCount()}.
- */
- @Test
- public void testUpdateBlockTime()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0L, counter.getTotalBlockTime());
- counter.updateBlockTime(1234567L);
- long lo = counter.getTotalBlockTime();
- assertEquals(1234567L, lo);
- }
-
- /**
- * Test {@link ConnectionCounter#GetGuaranteedCount()}.
- */
- @Test
- public void testGetTotalBlockTime()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0L, counter.getTotalBlockTime());
- counter.updateBlockTime(1L);
- counter.updateBlockTime(5L);
- assertEquals(6L, counter.getTotalBlockTime());
- }
-
- /**
- * Test {@link ConnectionCounter#GetGuaranteedCount()}.
- */
- @Test
- public void testGetTimedOut()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0L, counter.getTimedOutCount());
-
- counter.incTimedOutCount();
- counter.incTimedOutCount();
- assertEquals(2L, counter.getTimedOutCount());
- }
-
- /**
- * Test {@link ConnectionCounter#GetGuaranteedCount()}.
- */
- @Test
- public void testIncTimedOut()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0L, counter.getTimedOutCount());
-
- counter.incTimedOutCount();
- counter.incTimedOutCount();
- assertEquals(2L, counter.getTimedOutCount());
- }
-
- /**
- * Test {@link ConnectionCounter#GetGuaranteedCount()}.
- */
- @Test
- public void testGetMaxWaitTime()
- {
- ConnectionCounter counter = new ConnectionCounter();
- assertEquals(0L, counter.getMaxWaitTime());
- counter.updateBlockTime(10L);
- assertEquals(10L, counter.getMaxWaitTime());
- counter.updateBlockTime(20L);
- assertEquals(20L, counter.getMaxWaitTime());
- counter.updateBlockTime(10L);
- assertEquals(20L, counter.getMaxWaitTime());
- }
-
-
-}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/nontx/NonTxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/nontx/NonTxConnectionManagerTestCase.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/nontx/NonTxConnectionManagerTestCase.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -23,7 +23,6 @@
import org.jboss.jca.core.api.ConnectionManager;
-import org.jboss.jca.core.connectionmanager.ConnectionManagerImpl;
import org.jboss.jca.core.connectionmanager.notx.NoTxConnectionManager;
import org.jboss.jca.core.connectionmanager.pool.PoolParams;
import org.jboss.jca.core.connectionmanager.pool.strategy.OnePool;
@@ -58,7 +57,6 @@
@BeforeClass
public static void init()
{
- connectionManager = new ConnectionManagerImpl();
NoTxConnectionManager noTxCm = new NoTxConnectionManager();
mcf = new MockManagedConnectionFactory();
PoolParams poolParams = new PoolParams();
@@ -68,7 +66,7 @@
noTxCm.setPoolingStrategy(onePool);
- ((ConnectionManagerImpl)connectionManager).setRealConnectionManager(noTxCm);
+ connectionManager = noTxCm;
}
/**
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/tx/TxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/tx/TxConnectionManagerTestCase.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/tx/TxConnectionManagerTestCase.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -22,7 +22,6 @@
package org.jboss.jca.test.core.connectionmanager.unit.tx;
import org.jboss.jca.core.api.ConnectionManager;
-import org.jboss.jca.core.connectionmanager.ConnectionManagerImpl;
import org.jboss.jca.core.connectionmanager.pool.PoolParams;
import org.jboss.jca.core.connectionmanager.pool.strategy.OnePool;
import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
@@ -64,11 +63,9 @@
ConnectionManager connectionManager = embedded.lookup("ConnectionManagerTx", ConnectionManager.class);
assertNotNull(connectionManager);
- ConnectionManagerImpl impl = (ConnectionManagerImpl)connectionManager;
+ assertTrue(connectionManager instanceof TxConnectionManager);
- assertTrue(impl.getRealConnectionManager() instanceof TxConnectionManager);
-
- TxConnectionManager txConnectionManager = (TxConnectionManager)impl.getRealConnectionManager();
+ TxConnectionManager txConnectionManager = (TxConnectionManager)connectionManager;
txConnectionManager.setLocalTransactions(true);
assertNotNull(txConnectionManager.getCachedConnectionManager());
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/tx/XATxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/tx/XATxConnectionManagerTestCase.java 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/connectionmanager/unit/tx/XATxConnectionManagerTestCase.java 2009-11-20 18:13:26 UTC (rev 96649)
@@ -22,7 +22,6 @@
package org.jboss.jca.test.core.connectionmanager.unit.tx;
import org.jboss.jca.core.api.ConnectionManager;
-import org.jboss.jca.core.connectionmanager.ConnectionManagerImpl;
import org.jboss.jca.core.connectionmanager.pool.PoolParams;
import org.jboss.jca.core.connectionmanager.pool.strategy.OnePool;
import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
@@ -64,11 +63,9 @@
ConnectionManager connectionManager = embedded.lookup("ConnectionManagerTx", ConnectionManager.class);
assertNotNull(connectionManager);
- ConnectionManagerImpl impl = (ConnectionManagerImpl)connectionManager;
+ assertTrue(connectionManager instanceof TxConnectionManager);
- assertTrue(impl.getRealConnectionManager() instanceof TxConnectionManager);
-
- TxConnectionManager txConnectionManager = (TxConnectionManager)impl.getRealConnectionManager();
+ TxConnectionManager txConnectionManager = (TxConnectionManager)connectionManager;
txConnectionManager.setLocalTransactions(false);
TransactionManager transactionManager = txConnectionManager.getTransactionManager();
Modified: projects/jboss-jca/trunk/core/src/test/resources/connectionmanager-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/connectionmanager-jboss-beans.xml 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/core/src/test/resources/connectionmanager-jboss-beans.xml 2009-11-20 18:13:26 UTC (rev 96649)
@@ -5,20 +5,20 @@
-->
<deployment>
- <bean name="ConnectionManagerTx" interface="org.jboss.jca.core.api.ConnectionManager" class="org.jboss.jca.core.connectionmanager.ConnectionManagerImpl">
- <property name="realConnectionManager"><inject bean="RealConnectionManagerTx"/></property>
- </bean>
-
-
- <bean name="RealConnectionManagerTx" interface="org.jboss.jca.core.connectionmanager.AbstractConnectionManager" class="org.jboss.jca.core.connectionmanager.tx.TxConnectionManager">
+ <bean name="ConnectionManagerTx"
+ interface="org.jboss.jca.core.connectionmanager.AbstractConnectionManager"
+ class="org.jboss.jca.core.connectionmanager.tx.TxConnectionManager">
<property name="transactionManager"><inject bean="TransactionManager" property="TransactionManager"/></property>
<property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
</bean>
- <bean name="RealConnectionManagerNoTx" interface="org.jboss.jca.core.connectionmanager.AbstractConnectionManager" class="org.jboss.jca.core.connectionmanager.notx.NoTxConnectionManager">
+ <bean name="ConnectionManagerNoTx"
+ interface="org.jboss.jca.core.connectionmanager.AbstractConnectionManager"
+ class="org.jboss.jca.core.connectionmanager.notx.NoTxConnectionManager">
</bean>
- <bean name="CachedConnectionManager" class="org.jboss.jca.core.connectionmanager.CachedConnectionManager">
+ <bean name="CachedConnectionManager"
+ class="org.jboss.jca.core.connectionmanager.CachedConnectionManager">
</bean>
</deployment>
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/deployers/build.xml 2009-11-20 18:13:26 UTC (rev 96649)
@@ -341,7 +341,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/deployers"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="fungal.lib.path.id"
+ docletpathref="standalone.lib.path.id"
author="true"
version="true"
windowtitle="JBoss JCA Deployers"
@@ -349,7 +349,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.deployers.dir}/impl"
- classpathref="fungal.lib.path.id"
+ classpathref="standalone.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
Modified: projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml 2009-11-20 18:13:26 UTC (rev 96649)
@@ -29,14 +29,9 @@
<property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
</bean>
- <!-- Connection Manager -->
- <bean name="ConnectionManager" interface="org.jboss.jca.core.api.ConnectionManager" class="org.jboss.jca.core.connectionmanager.ConnectionManagerImpl">
- </bean>
-
<!-- RA deployer -->
<bean name="RADeployer" interface="org.jboss.jca.fungal.deployers.Deployer" class="org.jboss.jca.deployers.fungal.RADeployer">
<depends>BeanValidation</depends>
- <depends>ConnectionManager</depends>
<depends>WorkManager</depends>
</bean>
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml 2009-11-20 17:43:11 UTC (rev 96648)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml 2009-11-20 18:13:26 UTC (rev 96649)
@@ -29,14 +29,9 @@
<property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
</bean>
- <!-- Connection Manager -->
- <bean name="ConnectionManager" interface="org.jboss.jca.core.api.ConnectionManager" class="org.jboss.jca.core.connectionmanager.ConnectionManagerImpl">
- </bean>
-
<!-- RA deployer -->
<bean name="RADeployer" interface="org.jboss.jca.fungal.deployers.Deployer" class="org.jboss.jca.deployers.fungal.RADeployer">
<depends>BeanValidation</depends>
- <depends>ConnectionManager</depends>
<depends>WorkManager</depends>
</bean>
More information about the jboss-cvs-commits
mailing list