[jboss-cvs] JBossAS SVN: r111529 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core: connectionmanager/pool and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 6 23:29:38 EDT 2011
Author: jeff.zhang
Date: 2011-06-06 23:29:38 -0400 (Mon, 06 Jun 2011)
New Revision: 111529
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.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/api/Pool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/idle/IdleRemover.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/PoolFiller.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.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/ReauthPool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/validator/ConnectionValidator.java
Log:
[JBJCA-592] pool logging
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -245,4 +245,125 @@
@LogMessage(level = WARN)
@Message(id = 503, value = "Transaction %s error in after completion %s")
public void transactionErrorInAfterCompletion(Object transaction, Object synch, @Cause Throwable t);
+
+
+ // POOL MANAGER (600)
+
+ /**
+ * ConnectionValidator has been interrupted
+ */
+ @LogMessage(level = INFO)
+ @Message(id = 601, value = "run: ConnectionValidator has been interrupted, returning")
+ public void returningConnectionValidatorInterrupted();
+
+ /**
+ * ConnectionValidator ignored unexpected runtime exception
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 602, value = "run: ConnectionValidator ignored unexpected runtime exception")
+ public void connectionValidatorIgnoredUnexpectedRuntimeException(@Cause Throwable t);
+
+ /**
+ * ConnectionValidator ignored unexpected error
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 603, value = "run: ConnectionValidator ignored unexpected error")
+ public void connectionValidatorIgnoredUnexpectedError(@Cause Throwable t);
+
+ /**
+ * Throwable while attempting to get a new connection
+ * @param cl The ConnectionListener
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 604, value = "Throwable while attempting to get a new connection: %s")
+ public void throwableWhileAttemptingGetNewGonnection(Object cl, @Cause Throwable t);
+
+ /**
+ * Destroying connection that could not be successfully matched
+ * @param cl The ConnectionListener
+ * @param mcf managed connection factory
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 605, value = "Destroying connection that could not be successfully matched %s for: %s")
+ public void destroyingConnectionNotSuccessfullyMatched(Object cl, Object mcf);
+
+ /**
+ * Throwable while trying to match ManagedConnection, destroying connection
+ * @param cl The ConnectionListener
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 606, value = "Throwable while trying to match ManagedConnection, destroying connection: %s")
+ public void throwableWhileTryingMatchManagedConnection(Object cl, @Cause Throwable t);
+
+ /**
+ * ResourceException cleaning up ManagedConnection
+ * @param cl The ConnectionListener
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 607, value = "ResourceException cleaning up ManagedConnection: %s")
+ public void resourceExceptionCleaningUpManagedConnection(Object cl, @Cause Throwable t);
+
+ /**
+ * Destroying returned connection, maximum pool size exceeded
+ * @param cl The ConnectionListener
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 608, value = "Destroying returned connection, maximum pool size exceeded %s")
+ public void destroyingReturnedConnectionMaximumPoolSizeExceeded(Object cl);
+
+ /**
+ * Attempt to return connection twice
+ * @param cl The ConnectionListener
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 609, value = "Attempt to return connection twice (ignored): %s")
+ public void attemptReturnConnectionTwice(Object cl, @Cause Throwable t);
+
+ /**
+ * Unable to fill pool
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 610, value = "Unable to fill pool")
+ public void unableFillPool(@Cause Throwable t);
+
+ /**
+ * Background validation was specified with a non compliant ManagedConnectionFactory interface
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 611, value = "Warning: Background validation was specified with a non compliant " +
+ "ManagedConnectionFactory interface.")
+ public void backgroundValidationNonCompliantManagedConnectionFactory();
+
+ /**
+ * Destroying connection that could not be successfully matched
+ * @param cl The ConnectionListener
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 612, value = "Destroying connection that could not be successfully matched: %s")
+ public void destroyingConnectionNotSuccessfullyMatched(Object cl);
+
+ /**
+ * Throwable while trying to match ManagedConnection, destroying connection
+ * @param cl The ConnectionListener
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 613, value = "Throwable while trying to match ManagedConnection, destroying connection: %s")
+ public void throwableWhileTryingMatchManagedConnectionThenDestroyingConnection(Object cl, @Cause Throwable t);
+
+ /**
+ * Exception during createSubject()
+ * @param description throwable description
+ * @param t The exception
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 614, value = "Exception during createSubject() %s")
+ public void exceptionDuringCreateSubject(String description, @Cause Throwable t);
}
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 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -24,6 +24,7 @@
import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.api.connectionmanager.pool.PoolStatistics;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
@@ -65,7 +66,7 @@
public abstract class AbstractPool implements Pool
{
/** The logger */
- protected final Logger log;
+ protected final CoreLogger log;
/** Is trace enabled */
private boolean trace;
@@ -386,7 +387,8 @@
// Get connection from the managed connection pool
cl = mcp.getConnection(subject, cri);
- log.tracef("Got connection from pool: %s", cl);
+ if (trace)
+ log.tracef("Got connection from pool: %s", cl);
return cl;
}
@@ -404,7 +406,8 @@
//Getting connection from pool
cl = mcp.getConnection(subject, cri);
- log.tracef("Got connection from pool (retried): %s", cl);
+ if (trace)
+ log.tracef("Got connection from pool (retried): %s", cl);
return cl;
}
@@ -444,7 +447,8 @@
ConnectionListener cl = (ConnectionListener)tsr.getResource(mcp);
if (cl != null)
{
- log.tracef("Previous connection tracked by transaction=%s tx=%s", cl, trackByTransaction);
+ if (trace)
+ log.tracef("Previous connection tracked by transaction=%s tx=%s", cl, trackByTransaction);
return cl;
}
@@ -478,7 +482,8 @@
// Instead we do a double check after we got the transaction to see
// whether another thread beat us to the punch.
ConnectionListener cl = mcp.getConnection(subject, cri);
- log.tracef("Got connection from pool tracked by transaction=%s tx=%s", cl, trackByTransaction);
+ if (trace)
+ log.tracef("Got connection from pool tracked by transaction=%s tx=%s", cl, trackByTransaction);
TransactionSynchronizationRegistry tsr = getTransactionSynchronizationRegistry();
Lock lock = getLock();
@@ -500,7 +505,8 @@
{
mcp.returnConnection(cl, false);
- log.tracef("Another thread already got a connection tracked by transaction=%s tx=%s",
+ if (trace)
+ log.tracef("Another thread already got a connection tracked by transaction=%s tx=%s",
other, trackByTransaction);
cl = other;
@@ -510,7 +516,8 @@
cl.setTrackByTx(true);
tsr.putResource(mcp, cl);
- log.tracef("Using connection from pool tracked by transaction=%s tx=%s", cl, trackByTransaction);
+ if (trace)
+ log.tracef("Using connection from pool tracked by transaction=%s tx=%s", cl, trackByTransaction);
return cl;
}
@@ -540,7 +547,8 @@
//Return connection to the pool
mcp.returnConnection(cl, kill);
- log.tracef("Returning connection to pool %s", cl);
+ if (trace)
+ log.tracef("Returning connection to pool %s", cl);
}
/**
@@ -636,5 +644,5 @@
* Get the logger
* @return The value
*/
- public abstract Logger getLogger();
+ public abstract CoreLogger getLogger();
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/Pool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/Pool.java 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/Pool.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.core.connectionmanager.pool.api;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPool;
@@ -31,8 +32,6 @@
import javax.security.auth.Subject;
import javax.transaction.Transaction;
-import org.jboss.logging.Logger;
-
/**
* A pool.
*
@@ -99,5 +98,5 @@
* Get the logger
* @return The value
*/
- public Logger getLogger();
+ public CoreLogger getLogger();
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/idle/IdleRemover.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/idle/IdleRemover.java 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/idle/IdleRemover.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -22,6 +22,8 @@
package org.jboss.jca.core.connectionmanager.pool.idle;
+import org.jboss.jca.core.CoreLogger;
+
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -42,7 +44,7 @@
public class IdleRemover
{
/**Logger instance*/
- private static Logger logger = Logger.getLogger(IdleRemover.class);
+ private static CoreLogger logger = Logger.getMessageLogger(CoreLogger.class, IdleRemover.class.getName());
/**Validator thread name*/
private static final String VALIDATOR_THREAD_NAME = "JBossConnectionValidator";
@@ -230,17 +232,17 @@
}
catch (InterruptedException e)
{
- logger.info("run: ConnectionValidator has been interrupted, returning");
+ logger.returningConnectionValidatorInterrupted();
return;
}
catch (RuntimeException e)
{
- logger.warn("run: ConnectionValidator ignored unexpected runtime exception", e);
+ logger.connectionValidatorIgnoredUnexpectedRuntimeException(e);
}
catch (Exception e)
{
- logger.warn("run: ConnectionValidator ignored unexpected error", e);
+ logger.connectionValidatorIgnoredUnexpectedError(e);
}
finally
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -23,6 +23,7 @@
package org.jboss.jca.core.connectionmanager.pool.mcp;
import org.jboss.jca.common.JBossResourceException;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
@@ -62,7 +63,7 @@
public class ArrayBlockingQueueManagedConnectionPool implements ManagedConnectionPool
{
/** The log */
- private Logger log;
+ private CoreLogger log;
/** Whether trace is enabled */
private boolean trace;
@@ -258,7 +259,7 @@
}
catch (Throwable t)
{
- log.warn("Throwable while attempting to get a new connection: " + cl, t);
+ log.throwableWhileAttemptingGetNewGonnection(cl, t);
JBossResourceException.rethrowAsResourceException("Unexpected throwable while trying " +
"to create a connection: " + cl, t);
@@ -305,7 +306,7 @@
}
catch (Throwable t)
{
- log.warn("Throwable while attempting to get a new connection: " + cl, t);
+ log.throwableWhileAttemptingGetNewGonnection(cl, t);
JBossResourceException.rethrowAsResourceException("Unexpected throwable while trying to " +
"create a connection: " + cl, t);
@@ -354,7 +355,7 @@
// connection died while being checked. We need to
// distinguish these cases, but for now we always
// destroy the connection.
- log.warn("Destroying connection that could not be successfully matched: " + cl + " for: " + mcf);
+ log.destroyingConnectionNotSuccessfullyMatched(cl, mcf);
checkedOut.remove(cl);
@@ -363,7 +364,7 @@
}
catch (Throwable t)
{
- log.warn("Throwable while trying to match ManagedConnection, destroying connection: " + cl, t);
+ log.throwableWhileTryingMatchManagedConnection(cl, t);
checkedOut.remove(cl);
@@ -406,7 +407,7 @@
}
catch (ResourceException re)
{
- log.warn("ResourceException cleaning up ManagedConnection: " + cl, re);
+ log.resourceExceptionCleaningUpManagedConnection(cl, re);
kill = true;
}
@@ -419,7 +420,7 @@
// This is really an error
if (!kill && cls.size() >= poolConfiguration.getMaxSize())
{
- log.warn("Destroying returned connection, maximum pool size exceeded " + cl);
+ log.destroyingReturnedConnectionMaximumPoolSizeExceeded(cl);
kill = true;
}
@@ -451,7 +452,7 @@
}
else
{
- log.warn("Attempt to return connection twice (ignored): " + cl, new Throwable("STACKTRACE"));
+ log.attemptReturnConnectionTwice(cl, new Throwable("STACKTRACE"));
}
}
@@ -637,7 +638,7 @@
}
catch (ResourceException re)
{
- log.warn("Unable to fill pool ", re);
+ log.unableFillPool(re);
destroy = true;
}
finally
@@ -777,8 +778,7 @@
}
else
{
- log.warn("Warning: Background validation was specified with a non compliant " +
- "ManagedConnectionFactory interface.");
+ log.backgroundValidationNonCompliantManagedConnectionFactory();
}
}
finally
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/PoolFiller.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/PoolFiller.java 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/PoolFiller.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -24,8 +24,6 @@
import java.util.LinkedList;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.jboss.logging.Logger;
-
/**
* PoolFiller
*
@@ -37,8 +35,6 @@
*/
class PoolFiller implements Runnable
{
- /** Log instance */
- private static Logger log = Logger.getLogger(PoolFiller.class);
/** Singleton instance */
private static final PoolFiller FILLER = new PoolFiller();
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -23,6 +23,7 @@
package org.jboss.jca.core.connectionmanager.pool.mcp;
import org.jboss.jca.common.JBossResourceException;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
@@ -64,7 +65,7 @@
public class SemaphoreArrayListManagedConnectionPool implements ManagedConnectionPool
{
/** The log */
- private Logger log;
+ private CoreLogger log;
/** Whether trace is enabled */
private boolean trace;
@@ -272,7 +273,7 @@
// connection died while being checked. We need to
// distinguish these cases, but for now we always
// destroy the connection.
- log.warn("Destroying connection that could not be successfully matched: " + cl);
+ log.destroyingConnectionNotSuccessfullyMatched(cl);
synchronized (cls)
{
@@ -284,7 +285,7 @@
}
catch (Throwable t)
{
- log.warn("Throwable while trying to match ManagedConnection, destroying connection: " + cl, t);
+ log.throwableWhileTryingMatchManagedConnectionThenDestroyingConnection(cl, t);
synchronized (cls)
{
@@ -299,7 +300,8 @@
// if we should continue attempting to acquire a connection
if (poolConfiguration.isUseFastFail())
{
- log.trace("Fast failing for connection attempt. No more attempts will be made to " +
+ if (trace)
+ log.trace("Fast failing for connection attempt. No more attempts will be made to " +
"acquire connection from pool and a new connection will be created immeadiately");
break;
}
@@ -329,7 +331,7 @@
}
catch (Throwable t)
{
- log.warn("Throwable while attempting to get a new connection: " + cl, t);
+ log.throwableWhileAttemptingGetNewGonnection(cl, t);
// Return permit and rethrow
synchronized (cls)
@@ -391,7 +393,7 @@
}
catch (ResourceException re)
{
- log.warn("ResourceException cleaning up ManagedConnection: " + cl, re);
+ log.resourceExceptionCleaningUpManagedConnection(cl, re);
kill = true;
}
@@ -406,7 +408,7 @@
// This is really an error
if (!kill && isSize(poolConfiguration.getMaxSize() + 1))
{
- log.warn("Destroying returned connection, maximum pool size exceeded " + cl);
+ log.destroyingReturnedConnectionMaximumPoolSizeExceeded(cl);
kill = true;
}
@@ -430,7 +432,7 @@
}
else
{
- log.warn("Attempt to return connection twice (ignored): " + cl, new Throwable("STACKTRACE"));
+ log.attemptReturnConnectionTwice(cl, new Throwable("STACKTRACE"));
}
}
@@ -649,7 +651,7 @@
}
catch (ResourceException re)
{
- log.warn("Unable to fill pool ", re);
+ log.unableFillPool(re);
return;
}
}
@@ -661,7 +663,8 @@
}
catch (InterruptedException ignored)
{
- log.trace("Interrupted while requesting permit in fillToMin");
+ if (trace)
+ log.trace("Interrupted while requesting permit in fillToMin");
}
}
}
@@ -808,8 +811,7 @@
}
else
{
- log.warn("Warning: background validation was specified with a non " +
- "compliant ManagedConnectionFactory interface.");
+ log.backgroundValidationNonCompliantManagedConnectionFactory();
}
}
finally
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 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.AbstractPrefillPool;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPool;
@@ -41,7 +42,7 @@
public class OnePool extends AbstractPrefillPool
{
/** The logger */
- private static Logger log = Logger.getLogger(OnePool.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, OnePool.class.getName());
/**
* Creates a new instance.
@@ -90,7 +91,7 @@
/**
* {@inheritDoc}
*/
- public Logger getLogger()
+ public CoreLogger getLogger()
{
return log;
}
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 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.AbstractPool;
@@ -41,7 +42,7 @@
public class PoolByCri extends AbstractPool
{
/** The logger */
- private static Logger log = Logger.getLogger(PoolByCri.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, PoolByCri.class.getName());
/**
* Creates a new instance.
@@ -75,7 +76,7 @@
/**
* {@inheritDoc}
*/
- public Logger getLogger()
+ public CoreLogger getLogger()
{
return log;
}
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 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.pool.AbstractPrefillPool;
@@ -51,7 +52,7 @@
public class PoolBySubject extends AbstractPrefillPool
{
/** The logger */
- private static Logger log = Logger.getLogger(PoolBySubject.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, PoolBySubject.class.getName());
/**
* Creates a new instance.
@@ -156,7 +157,7 @@
}
catch (Throwable t)
{
- log.error("Exception during createSubject()" + t.getMessage(), t);
+ log.exceptionDuringCreateSubject(t.getMessage(), t);
}
return null;
@@ -167,7 +168,7 @@
/**
* {@inheritDoc}
*/
- public Logger getLogger()
+ public CoreLogger getLogger()
{
return log;
}
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 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.AbstractPool;
@@ -42,7 +43,7 @@
public class PoolBySubjectAndCri extends AbstractPool
{
/** The logger */
- private static Logger log = Logger.getLogger(PoolBySubjectAndCri.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, PoolBySubjectAndCri.class.getName());
/**
* Creates a new instance.
@@ -76,7 +77,7 @@
/**
* {@inheritDoc}
*/
- public Logger getLogger()
+ public CoreLogger getLogger()
{
return log;
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/ReauthPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/ReauthPool.java 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/ReauthPool.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.AbstractPool;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPool;
@@ -46,7 +47,7 @@
public class ReauthPool extends AbstractPool
{
/** The logger */
- private static Logger log = Logger.getLogger(ReauthPool.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, ReauthPool.class.getName());
/**
* Creates a new instance.
@@ -94,7 +95,7 @@
/**
* {@inheritDoc}
*/
- public Logger getLogger()
+ public CoreLogger getLogger()
{
return log;
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/validator/ConnectionValidator.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/validator/ConnectionValidator.java 2011-06-07 02:00:22 UTC (rev 111528)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/validator/ConnectionValidator.java 2011-06-07 03:29:38 UTC (rev 111529)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.pool.validator;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPool;
import java.security.AccessController;
@@ -46,7 +47,7 @@
public class ConnectionValidator
{
/**Logger instance*/
- private static Logger logger = Logger.getLogger(ConnectionValidator.class);
+ private static CoreLogger logger = Logger.getMessageLogger(CoreLogger.class, ConnectionValidator.class.getName());
/**Validator thread name*/
private static final String VALIDATOR_THREAD_NAME = "JBossConnectionValidator";
@@ -278,17 +279,17 @@
}
catch (InterruptedException e)
{
- logger.info("run: ConnectionValidator has been interrupted, returning");
+ logger.returningConnectionValidatorInterrupted();
return;
}
catch (RuntimeException e)
{
- logger.warn("run: ConnectionValidator ignored unexpected runtime exception", e);
+ logger.connectionValidatorIgnoredUnexpectedRuntimeException(e);
}
catch (Exception e)
{
- logger.warn("run: ConnectionValidator ignored unexpected error", e);
+ logger.connectionValidatorIgnoredUnexpectedError(e);
}
finally
{
More information about the jboss-cvs-commits
mailing list