Switch from Seam Logging to Slf4j

zanata · Nov 4, 2013 · 021f0f7 · 021f0f7
1 parent c613593
commit 021f0f7
Show file tree

Hide file tree

Showing 65 changed files with 297 additions and 448 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java b/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
@@ -30,8 +30,9 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import lombok.extern.slf4j.Slf4j;
+
 import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.In;
@@ -40,8 +41,6 @@
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.Startup;
 import org.jboss.seam.annotations.Synchronized;
-import org.jboss.seam.log.Log;
-import org.jboss.seam.log.Logging;
 import org.jboss.seam.web.ServletContexts;
 import org.zanata.config.DatabaseBackedConfig;
 import org.zanata.config.JndiBackedConfig;
@@ -60,10 +59,8 @@
 @Scope(ScopeType.APPLICATION)
 @Startup
 @Synchronized(timeout = ServerConstants.DEFAULT_TIMEOUT)
+@Slf4j
 public class ApplicationConfiguration implements Serializable {
-
-    private static final Log log = Logging
-            .getLog(ApplicationConfiguration.class);
     private static final long serialVersionUID = -4970657841198107092L;
 
     private static final String EMAIL_APPENDER_NAME =
@@ -153,7 +150,8 @@ private void validateConfiguration() {
      * Apply logging configuration.
      */
     public void applyLoggingConfiguration() {
-        final Logger rootLogger = Logger.getRootLogger();
+        // TODO is this still working with jboss logging?
+        final org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getRootLogger();
 
         if (isEmailLogAppenderEnabled()) {
             // NB: This appender uses Seam's email configuration (no need for

diff --git a/zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java b/zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java
@@ -5,15 +5,12 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import lombok.extern.slf4j.Slf4j;
+
 import org.h2.tools.TriggerAdapter;
-import org.jboss.seam.log.Log;
-import org.jboss.seam.log.Logging;
 
+@Slf4j
 public class H2DocumentHistoryTrigger extends TriggerAdapter {
-
-    private static final Log log = Logging
-            .getLog(H2DocumentHistoryTrigger.class);
-
     @Override
     public void fire(Connection conn, ResultSet oldRow, ResultSet newRow)
             throws SQLException {
@@ -25,7 +22,7 @@ public void fire(Connection conn, ResultSet oldRow, ResultSet newRow)
         if (oldRev != newRev) {
 
             log.debug(
-                    "revision incremented from {0} to {1}. Executing trigger..",
+                    "revision incremented from {} to {}. Executing trigger..",
                     oldRev, newRev);
 
             PreparedStatement prep =

diff --git a/zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java b/zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
@@ -27,10 +27,8 @@
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.log.Log;
 import org.zanata.dao.AccountDAO;
 import org.zanata.dao.PersonDAO;
 import org.zanata.model.HAccount;
@@ -50,9 +48,6 @@ public class AccountSearchAction implements Serializable {
     @In
     private PersonDAO personDAO;
 
-    @Logger
-    Log log;
-
     public void setMaintainer(String sr) {
         this.maintainer = sr;
     }

diff --git a/zanata-war/src/main/java/org/zanata/action/ActivateAction.java b/zanata-war/src/main/java/org/zanata/action/ActivateAction.java
@@ -28,11 +28,9 @@
 import org.jboss.seam.annotations.Begin;
 import org.jboss.seam.annotations.End;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.faces.FacesMessages;
-import org.jboss.seam.log.Log;
 import org.jboss.seam.security.RunAsOperation;
 import org.jboss.seam.security.management.IdentityManager;
 import org.zanata.dao.AccountActivationKeyDAO;
@@ -46,9 +44,6 @@ public class ActivateAction implements Serializable {
 
     private static final long serialVersionUID = -8079131168179421345L;
 
-    @Logger
-    Log log;
-
     @In
     private AccountActivationKeyDAO accountActivationKeyDAO;
 

diff --git a/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java b/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
@@ -24,10 +24,8 @@
 
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.log.Log;
 import org.zanata.dao.DocumentDAO;
 import org.zanata.dao.PersonDAO;
 import org.zanata.dao.ProjectDAO;
@@ -48,9 +46,6 @@ public class AdminStatsAction implements Serializable {
     */
     private static final long serialVersionUID = 1L;
 
-    @Logger
-    Log log;
-
     @In
     ProjectDAO projectDAO;
 

diff --git a/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java b/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
@@ -22,12 +22,12 @@
 
 import java.io.Serializable;
 
+import lombok.extern.slf4j.Slf4j;
+
 import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Observer;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.log.Log;
 import org.jboss.seam.security.Identity;
 import org.jboss.seam.security.management.JpaIdentityStore;
 import org.jboss.seam.security.permission.RuleBasedPermissionResolver;
@@ -36,19 +36,13 @@
 
 @Name("authenticationEvents")
 @Scope(ScopeType.STATELESS)
+@Slf4j
 public class AuthenticationEvents implements Serializable {
-
-    /**
-    *
-    */
     private static final long serialVersionUID = 1L;
 
-    @Logger
-    Log log;
-
     @Observer(JpaIdentityStore.EVENT_USER_AUTHENTICATED)
     public void loginSuccessful(HAccount account) {
-        log.info("Account {0} authenticated", account.getUsername());
+        log.info("Account {} authenticated", account.getUsername());
         injectAuthenticatedPersonIntoWorkingMemory(account);
     }
 
@@ -61,7 +55,7 @@ public void injectAuthenticatedPersonIntoWorkingMemory(HAccount account) {
 
     @Observer(JpaIdentityStore.EVENT_USER_CREATED)
     public void createSuccessful(HAccount account) {
-        log.info("Account {0} created", account.getUsername());
+        log.info("Account {} created", account.getUsername());
     }
 
     @Observer(Identity.EVENT_LOGIN_SUCCESSFUL)

diff --git a/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java b/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
@@ -8,20 +8,15 @@
 
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.log.Log;
 
 @Name("breadcrumbs")
 @AutoCreate
 @Scope(ScopeType.PAGE)
 public class Breadcrumbs implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Logger
-    Log log;
-
     private List<Breadcrumb> locations;
 
     public List<Breadcrumb> getLocations() {

diff --git a/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java b/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
@@ -26,27 +26,26 @@
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.extern.slf4j.Slf4j;
+
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.web.RequestParameter;
-import org.jboss.seam.log.Log;
 import org.zanata.model.HLocale;
 import org.zanata.service.ConfigurationService;
 
 @Name("configurationAction")
 @Scope(ScopeType.EVENT)
+@Slf4j
 public class ConfigurationAction implements Serializable {
     private static final long serialVersionUID = 1L;
     @RequestParameter
     private String iterationSlug;
     @RequestParameter
     private String projectSlug;
 
-    @Logger
-    private Log log;
     @In
     private ConfigurationService configurationServiceImpl;
 

diff --git a/zanata-war/src/main/java/org/zanata/action/DashboardAction.java b/zanata-war/src/main/java/org/zanata/action/DashboardAction.java
@@ -29,11 +29,9 @@
 
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.security.Restrict;
-import org.jboss.seam.log.Log;
 import org.jboss.seam.security.management.JpaIdentityStore;
 import org.zanata.annotation.CachedMethodResult;
 import org.zanata.common.EntityStatus;
@@ -53,9 +51,6 @@
 public class DashboardAction implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Logger
-    private Log log;
-
     @In
     private GravatarService gravatarServiceImpl;
 

diff --git a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
@@ -11,15 +11,15 @@
 import javax.faces.context.FacesContext;
 import javax.validation.ConstraintViolationException;
 
+import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang.StringUtils;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.international.StatusMessage.Severity;
-import org.jboss.seam.log.Log;
 import org.zanata.annotation.CachedMethods;
 import org.zanata.common.LocaleId;
 import org.zanata.dao.GlossaryDAO;
@@ -32,15 +32,10 @@
 @Name("glossaryAction")
 @Scope(ScopeType.PAGE)
 @CachedMethods
+@Slf4j
 public class GlossaryAction implements Serializable {
-    /**
-    *
-    */
     private static final long serialVersionUID = 1L;
 
-    @Logger
-    Log log;
-
     @In
     private GlossaryDAO glossaryDAO;
 

diff --git a/zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java b/zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java
@@ -26,10 +26,8 @@
 
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.log.Log;
 import org.jboss.seam.security.Identity;
 import org.jboss.seam.security.management.JpaIdentityStore;
 import org.zanata.annotation.CachedMethodResult;
@@ -49,8 +47,6 @@ public class IterationTranslationAction implements Serializable {
 
     @In
     LocaleService localeServiceImpl;
-    @Logger
-    Log log;
 
     @In
     Identity identity;

diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
@@ -26,18 +26,17 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.Transactional;
 import org.jboss.seam.annotations.security.Restrict;
 import org.jboss.seam.core.Events;
 import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.international.StatusMessage.Severity;
-import org.jboss.seam.log.Log;
 import org.jboss.seam.security.management.JpaIdentityStore;
 import org.zanata.common.LocaleId;
 import org.zanata.dao.LocaleDAO;
@@ -52,6 +51,7 @@
 
 @Name("languageTeamAction")
 @Scope(ScopeType.PAGE)
+@Slf4j
 public class LanguageTeamAction implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -73,9 +73,6 @@ public class LanguageTeamAction implements Serializable {
     @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER)
     private HAccount authenticatedAccount;
 
-    @Logger
-    private Log log;
-
     @Getter
     @Setter
     private String language;
@@ -144,11 +141,11 @@ public void joinTribe() {
                     this.language, authenticatedAccount.getPerson().getId(),
                     true, true, true);
             Events.instance().raiseEvent("personJoinedTribe");
-            log.info("{0} joined tribe {1}",
+            log.info("{} joined tribe {}",
                     authenticatedAccount.getUsername(), this.language);
             // FIXME use localizable string
             FacesMessages.instance().add(
-                    "You are now a member of the {0} language team",
+                    "You are now a member of the {} language team",
                     getLocale().retrieveNativeName());
         } catch (Exception e) {
             FacesMessages.instance().add(Severity.ERROR, e.getMessage());
@@ -165,7 +162,7 @@ public void leaveTribe() {
         languageTeamServiceImpl.leaveLanguageTeam(this.language,
                 authenticatedAccount.getPerson().getId());
         Events.instance().raiseEvent("personLeftTribe");
-        log.info("{0} left tribe {1}", authenticatedAccount.getUsername(),
+        log.info("{} left tribe {}", authenticatedAccount.getUsername(),
                 this.language);
         FacesMessages.instance().add("You have left the {0} language team",
                 getLocale().retrieveNativeName());