[jboss-cvs] JBossAS SVN: r111513 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core: workmanager and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2011-06-02 21:59:50 -0400 (Thu, 02 Jun 2011)
New Revision: 111513

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/workmanager/WorkManagerImpl.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkWrapper.java
Log:
[JBJCA-592] Work 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-02 19:31:45 UTC (rev 111512)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java	2011-06-03 01:59:50 UTC (rev 111513)
@@ -75,4 +75,22 @@
    @Message(id = 103, value = "Could not find a close method on alleged connection object (%s). " +
             "Please close your own connections.")
    public void closingConnectionNoClose(String clz);
+   
+   
+   // WORK MANAGER (200)
+
+   /**
+    * SecurityContext setup failed
+    * @param t The exception
+    */
+   @LogMessage(level = ERROR)
+   @Message(id = 201, value = "SecurityContext setup failed: %s")
+   public void securityContextSetupFailed(@Cause Throwable t);
+   
+   /**
+    * SecurityContext setup failed since CallbackSecurity was null
+    */
+   @LogMessage(level = ERROR)
+   @Message(id = 202, value = "SecurityContext setup failed since CallbackSecurity was null")
+   public void securityContextSetupFailedCallbackSecurityNull();
 }

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	2011-06-02 19:31:45 UTC (rev 111512)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java	2011-06-03 01:59:50 UTC (rev 111513)
@@ -22,6 +22,7 @@
 
 package org.jboss.jca.core.workmanager;
 
+import org.jboss.jca.core.CoreLogger;
 import org.jboss.jca.core.api.workmanager.WorkManager;
 import org.jboss.jca.core.spi.security.Callback;
 import org.jboss.jca.core.spi.transaction.xa.XATerminator;
@@ -62,7 +63,7 @@
 public class WorkManagerImpl implements WorkManager
 {
    /** The logger */
-   private static Logger log = Logger.getLogger(WorkManagerImpl.class);
+   private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, WorkManagerImpl.class.getName());
    
    /** Whether trace is enabled */
    private static boolean trace = log.isTraceEnabled();

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkWrapper.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkWrapper.java	2011-06-02 19:31:45 UTC (rev 111512)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkWrapper.java	2011-06-03 01:59:50 UTC (rev 111513)
@@ -22,6 +22,8 @@
 
 package org.jboss.jca.core.workmanager;
 
+import org.jboss.jca.core.CoreLogger;
+
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -64,7 +66,8 @@
 public class WorkWrapper implements Runnable
 {
    /** The log */
-   private static Logger log = Logger.getLogger(WorkWrapper.class);
+   private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, 
+      WorkWrapper.class.getName());
 
    /** Whether we are tracing */
    private static boolean trace = log.isTraceEnabled();
@@ -317,14 +320,14 @@
          }
          catch (Throwable t)
          {
-            log.error("SecurityContext setup failed: " + t.getMessage(), t);
+            log.securityContextSetupFailed(t);
             fireWorkContextSetupFailed(ctx);
             throw new WorkException("SecurityContext setup failed: " + t.getMessage(), t);
          }
       }
       else if (securityContext != null && workManager.getCallbackSecurity() == null)
       {
-         log.error("SecurityContext setup failed since CallbackSecurity was null");
+         log.securityContextSetupFailedCallbackSecurityNull();
          fireWorkContextSetupFailed(ctx);
          throw new WorkException("SecurityContext setup failed since CallbackSecurity was null");
       }