[jboss-cvs] JBossAS SVN: r111531 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core: connectionmanager/pool and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 7 00:30:18 EDT 2011
Author: jeff.zhang
Date: 2011-06-07 00:30:18 -0400 (Tue, 07 Jun 2011)
New Revision: 111531
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/mcp/ArrayBlockingQueueManagedConnectionPool.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/security/UsersRoles.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/LocalXAResourceImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/TransactionIntegrationImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/UserTransactionRegistryImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryRegistryImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceWrapperImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionIntegrationImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/noopts/XAResourceWrapperImpl.java
Log:
[JBJCA-592] transcation log
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 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -400,7 +400,7 @@
*/
@LogMessage(level = WARN)
@Message(id = 1001, value = "No users.properties were found")
- public void NoUsersPropertiesFound();
+ public void noUsersPropertiesFound();
/**
* Error while loading users.properties
@@ -409,4 +409,14 @@
@LogMessage(level = ERROR)
@Message(id = 1002, value = "Error while loading users.properties")
public void errorWhileLoadingUsersProperties(@Cause Throwable t);
+
+ // TRANSCATION (1100)
+
+ /**
+ * Prepare called on a local tx
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 1101, value = "Prepare called on a local tx. Use of local transactions on a jta " +
+ "transaction with more than one branch may result in inconsistent data in some cases of failure.")
+ public void prepareCalledOnLocaltx();
}
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 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -22,9 +22,9 @@
package org.jboss.jca.core.connectionmanager.pool;
+import org.jboss.jca.core.CoreLogger;
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;
@@ -50,8 +50,6 @@
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
-import org.jboss.logging.Logger;
-
/**
* Abstract pool implementation.
* <p>
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 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -53,8 +53,6 @@
import javax.resource.spi.ValidatingManagedConnectionFactory;
import javax.security.auth.Subject;
-import org.jboss.logging.Logger;
-
/**
* A managed connection pool implementation using ArrayBlockingQueue
*
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 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -50,7 +50,6 @@
import javax.resource.spi.ValidatingManagedConnectionFactory;
import javax.security.auth.Subject;
-import org.jboss.logging.Logger;
import org.jboss.util.UnreachableStatementException;
/**
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/security/UsersRoles.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/security/UsersRoles.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/security/UsersRoles.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -227,7 +227,7 @@
}
else
{
- log.NoUsersPropertiesFound();
+ log.noUsersPropertiesFound();
}
}
catch (IOException ioe)
@@ -310,7 +310,7 @@
}
else
{
- log.NoUsersPropertiesFound();
+ log.noUsersPropertiesFound();
}
}
catch (IOException ioe)
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/LocalXAResourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/LocalXAResourceImpl.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/LocalXAResourceImpl.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.core.tx.jbossts;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.ConnectionManager;
import org.jboss.jca.core.api.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.spi.transaction.local.LocalXAException;
@@ -42,8 +43,10 @@
public class LocalXAResourceImpl implements LocalXAResource, org.jboss.tm.LastResource
{
/** Log instance */
- private static Logger log = Logger.getLogger(LocalXAResourceImpl.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, LocalXAResourceImpl.class.getName());
+ private static boolean trace = log.isTraceEnabled();
+
/** Connection listener */
private ConnectionListener cl;
@@ -87,7 +90,8 @@
*/
public void start(Xid xid, int flags) throws XAException
{
- log.tracef("start(%s, %s)", xid, flags);
+ if (trace)
+ log.tracef("start(%s, %s)", xid, flags);
if (currentXid != null && flags == XAResource.TMNOFLAGS)
{
@@ -125,7 +129,8 @@
*/
public void end(Xid xid, int flags) throws XAException
{
- log.tracef("end(%s,%s)", xid, flags);
+ if (trace)
+ log.tracef("end(%s,%s)", xid, flags);
}
/**
@@ -184,8 +189,7 @@
{
if (!warned)
{
- log.warn("Prepare called on a local tx. Use of local transactions on a jta transaction with more " +
- "than one branch may result in inconsistent data in some cases of failure.");
+ log.prepareCalledOnLocaltx();
}
warned = true;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/TransactionIntegrationImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/TransactionIntegrationImpl.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/TransactionIntegrationImpl.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -36,7 +36,6 @@
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
-import org.jboss.logging.Logger;
import org.jboss.security.SubjectFactory;
/**
@@ -47,9 +46,6 @@
*/
public class TransactionIntegrationImpl implements TransactionIntegration
{
- /** The logger */
- private static Logger log = Logger.getLogger(TransactionIntegrationImpl.class);
-
/** The transaction manager */
private TransactionManager tm;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/UserTransactionRegistryImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/UserTransactionRegistryImpl.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/UserTransactionRegistryImpl.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -27,8 +27,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.logging.Logger;
-
/**
* UserTransactionRegistry implementation
*
@@ -36,9 +34,6 @@
*/
public class UserTransactionRegistryImpl implements org.jboss.jca.core.spi.transaction.usertx.UserTransactionRegistry
{
- /** The logger */
- private static Logger log = Logger.getLogger(UserTransactionRegistryImpl.class);
-
/** The delegator */
private org.jboss.tm.usertx.UserTransactionRegistry delegator;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.core.tx.jbossts;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.recovery.RecoveryPlugin;
import org.jboss.jca.core.spi.transaction.TransactionIntegration;
@@ -53,7 +54,7 @@
org.jboss.tm.XAResourceRecovery
{
/** Log instance */
- private static Logger log = Logger.getLogger(XAResourceRecoveryImpl.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, XAResourceRecoveryImpl.class.getName());
private final TransactionIntegration ti;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryRegistryImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryRegistryImpl.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryRegistryImpl.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -23,17 +23,12 @@
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
-import org.jboss.logging.Logger;
-
/**
* An XAResourceRecoveryRegistry implementation
*/
public class XAResourceRecoveryRegistryImpl
implements org.jboss.jca.core.spi.transaction.recovery.XAResourceRecoveryRegistry
{
- /** The logger */
- private static Logger log = Logger.getLogger(XAResourceRecoveryRegistryImpl.class);
-
/** Delegator */
private org.jboss.tm.XAResourceRecoveryRegistry delegator;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceWrapperImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceWrapperImpl.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceWrapperImpl.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.core.tx.jbossts;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.transaction.xa.XidWrapper;
import javax.transaction.xa.XAException;
@@ -39,7 +40,7 @@
org.jboss.tm.XAResourceWrapper
{
/** Log instance */
- private static Logger log = Logger.getLogger(XAResourceWrapperImpl.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, XAResourceWrapperImpl.class.getName());
/** The XA resource */
private XAResource xaResource;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionIntegrationImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionIntegrationImpl.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionIntegrationImpl.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -36,7 +36,6 @@
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
-import org.jboss.logging.Logger;
import org.jboss.security.SubjectFactory;
/**
@@ -47,9 +46,6 @@
*/
public class TransactionIntegrationImpl implements TransactionIntegration
{
- /** The logger */
- private static Logger log = Logger.getLogger(TransactionIntegrationImpl.class);
-
/** The transaction manager */
private TransactionManager tm;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/noopts/XAResourceWrapperImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/noopts/XAResourceWrapperImpl.java 2011-06-07 03:59:39 UTC (rev 111530)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/noopts/XAResourceWrapperImpl.java 2011-06-07 04:30:18 UTC (rev 111531)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.core.tx.noopts;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.transaction.xa.XAResourceWrapper;
import javax.transaction.xa.XAException;
@@ -37,7 +38,7 @@
public class XAResourceWrapperImpl implements XAResourceWrapper
{
/** Log instance */
- private static Logger log = Logger.getLogger(XAResourceWrapperImpl.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, XAResourceWrapperImpl.class.getName());
/** The XA resource */
private XAResource xaResource;
More information about the jboss-cvs-commits
mailing list