portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r767444 [4/5] - in /portals/jetspeed-2: applications/j2-admin/trunk/ applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/rpad/ applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/rpad/portlet/ applicati...
Date Wed, 22 Apr 2009 10:09:01 GMT
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/impl/LoginJSPViewValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/impl/LoginJSPViewValve.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/impl/LoginJSPViewValve.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/impl/LoginJSPViewValve.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.pipeline.PipelineException;
 import org.apache.jetspeed.pipeline.valve.AbstractValve;
 import org.apache.jetspeed.pipeline.valve.LoginViewValve;
@@ -38,7 +38,7 @@
  */
 public class LoginJSPViewValve extends AbstractValve implements LoginViewValve
 {
-    private static final Log log = LogFactory.getLog(LoginJSPViewValve.class);
+    private static final Logger log = LoggerFactory.getLogger(LoginJSPViewValve.class);
 
     private static final String DEFAULT_TEMPLATE_PATH = "/WEB-INF/templates/login";
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.healthcheck.validators.HealthCheckValidator;
 import org.apache.jetspeed.healthcheck.validators.HealthCheckValidatorResult;
 import org.apache.jetspeed.pipeline.PipelineException;
@@ -41,7 +41,7 @@
 public class HealthCheckValve extends AbstractValve
 {
     static final String LINE_SEPARATOR = System.getProperty("line.separator");
-    private static final Log log = LogFactory.getLog(HealthCheckValve.class);
+    private static final Logger log = LoggerFactory.getLogger(HealthCheckValve.class);
     public static boolean isInfoEnabled = log.isInfoEnabled();
     public static boolean isDebugEnabled = log.isDebugEnabled();
     /**

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.cache.ContentCacheKey;
 import org.apache.jetspeed.cache.JetspeedContentCache;
@@ -59,7 +59,7 @@
 public class ActionValveImpl extends AbstractValve implements ActionValve
 {
 
-    private static final Log log = LogFactory.getLog(ActionValveImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(ActionValveImpl.class);
     private PortletContainer container;
     private boolean patchResponseCommitted = false;
     private JetspeedContentCache portletContentCache;
@@ -112,7 +112,7 @@
         }
         catch (PortletContainerException e)
         {
-            log.fatal("Unable to retrieve portlet container!", e);
+            log.error("Unable to retrieve portlet container!", e);
             throw new PipelineException("Unable to retrieve portlet container!", e);
         }
         catch (PortletException e)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,8 @@
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.pipeline.PipelineException;
 import org.apache.jetspeed.pipeline.valve.AbstractValve;
 import org.apache.jetspeed.pipeline.valve.CleanupValve;
@@ -50,7 +50,7 @@
 
     public static final String RENDER_STACK_ATTR = "org.apache.jetspeed.renderStack";
 
-    private static final Log log = LogFactory.getLog(CleanupValveImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(CleanupValveImpl.class);
 
     
     public CleanupValveImpl()

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/DebugValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/DebugValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/DebugValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/DebugValveImpl.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.pipeline.PipelineException;
 import org.apache.jetspeed.pipeline.valve.AbstractValve;
 import org.apache.jetspeed.pipeline.valve.ValveContext;
@@ -36,7 +36,7 @@
  */
 public class DebugValveImpl extends AbstractValve 
 {
-    private static final Log log = LogFactory.getLog(DebugValveImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(DebugValveImpl.class);
 
     public DebugValveImpl()
     {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/VerySimpleLayoutValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/VerySimpleLayoutValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/VerySimpleLayoutValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/VerySimpleLayoutValveImpl.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,8 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.pipeline.PipelineException;
 import org.apache.jetspeed.pipeline.valve.AbstractValve;
 import org.apache.jetspeed.pipeline.valve.LayoutValve;
@@ -47,7 +47,7 @@
  */
 public class VerySimpleLayoutValveImpl extends AbstractValve implements LayoutValve
 {
-    private static final Log log = LogFactory.getLog(VerySimpleLayoutValveImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(VerySimpleLayoutValveImpl.class);
 
     /**
      * @see org.apache.jetspeed.pipeline.valve.Valve#invoke(org.apache.jetspeed.request.RequestContext, org.apache.jetspeed.pipeline.valve.ValveContext)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/CreatePageValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/CreatePageValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/CreatePageValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/CreatePageValveImpl.java Wed Apr 22 10:08:53 2009
@@ -16,8 +16,8 @@
  */
 package org.apache.jetspeed.profiler.impl;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
 import org.apache.jetspeed.pipeline.PipelineException;
 import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -33,7 +33,7 @@
  */
 public class CreatePageValveImpl extends AbstractValve implements Valve
 {
-    protected Log log = LogFactory.getLog(CreatePageValveImpl.class);
+    protected Logger log = LoggerFactory.getLogger(CreatePageValveImpl.class);
     
     private PortletActionSecurityBehavior securityBehavior;
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java Wed Apr 22 10:08:53 2009
@@ -26,8 +26,8 @@
 import org.apache.jetspeed.profiler.impl.ProfilerValveImpl;
 import org.apache.jetspeed.request.RequestContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * CreateUserTemplatePagesValveImpl
@@ -40,7 +40,7 @@
  */
 public class CreateUserTemplatePagesValveImpl extends ProfilerValveImpl
 {
-    private static final Log log = LogFactory.getLog(CreateUserTemplatePagesValveImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(CreateUserTemplatePagesValveImpl.class);
 
     public static final String USER_TEMPLATE_FOLDER_REQUEST_ATTR_KEY = "org.apache.jetspeed.profiler.UserTemplateFolder";
     

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,8 @@
 import javax.security.auth.Subject;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.decoration.PageActionAccess;
 import org.apache.jetspeed.om.page.ContentPageImpl;
@@ -53,7 +53,7 @@
  */
 public class ProfilerValveImpl extends AbstractValve implements PageProfilerValve
 {
-    protected Log log = LogFactory.getLog(ProfilerValveImpl.class);   
+    protected Logger log = LoggerFactory.getLogger(ProfilerValveImpl.class);   
 
     /**
      * PORTAL_SITE_REQUEST_CONTEXT_ATTR_KEY - session portal site context attribute key

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java Wed Apr 22 10:08:53 2009
@@ -29,8 +29,8 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.Jetspeed;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.aggregator.impl.PortletAggregatorFragmentImpl;
@@ -67,7 +67,7 @@
  */
 public class JetspeedRequestContext implements RequestContext
 {
-    protected final static Log log = LogFactory.getLog(JetspeedRequestContext.class);
+    protected final static Logger log = LoggerFactory.getLogger(JetspeedRequestContext.class);
     
     private static final String ACTION_ERROR_ATTR = "org.apache.jetspeed.action.error:";
     private static final String INSTANT_WINDOWS_SESSION_KEY = "org.apache.jetspeed.instant.windows";

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.userinfo.UserInfoManager;
 
@@ -40,7 +40,7 @@
     private Map<String, Object> requestContextObjects;
     private ThreadLocal<RequestContext> tlRequestContext = new ThreadLocal<RequestContext>();
     
-    private final static Log log = LogFactory.getLog(JetspeedRequestContextComponent.class);
+    private final static Logger log = LoggerFactory.getLogger(JetspeedRequestContextComponent.class);
 
 
     public JetspeedRequestContextComponent(PortletRegistry registry, UserInfoManager userInfoMgr, Map<String, Object> requestContextObjects)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/resource/ResourceValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/resource/ResourceValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/resource/ResourceValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/resource/ResourceValveImpl.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.pipeline.PipelineException;
@@ -45,7 +45,7 @@
 public class ResourceValveImpl extends AbstractValve
 {
 
-    private static final Log log = LogFactory.getLog(ResourceValveImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(ResourceValveImpl.class);
     private PortletContainer container;
 
     public ResourceValveImpl(PortletContainer container)
@@ -79,7 +79,7 @@
             }
             catch (PortletContainerException e)
             {
-                log.fatal("Unable to retrieve portlet container!", e);
+                log.error("Unable to retrieve portlet container!", e);
                 throw new PipelineException("Unable to retrieve portlet container!", e);
             }
             catch (PortletException e)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java Wed Apr 22 10:08:53 2009
@@ -20,8 +20,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.Jetspeed;
 import org.apache.jetspeed.login.LoginConstants;
 import org.apache.jetspeed.pipeline.PipelineException;
@@ -43,7 +43,7 @@
  */
 public class LoginValidationValveImpl extends AbstractValve implements org.apache.jetspeed.pipeline.valve.LoginValidationValve
 {
-    private static final Log log = LogFactory.getLog(LoginValidationValveImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(LoginValidationValveImpl.class);
     
     private int maxNumberOfAuthenticationFailures;
     private List sessionAttributes; 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.pipeline.PipelineException;
 import org.apache.jetspeed.pipeline.valve.AbstractValve;
 import org.apache.jetspeed.pipeline.valve.PageProfilerValve;
@@ -41,7 +41,7 @@
  */
 public class PasswordCredentialValveImpl extends AbstractValve implements org.apache.jetspeed.pipeline.valve.PasswordCredentialValve
 {
-    private static final Log log = LogFactory.getLog(PasswordCredentialValveImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(PasswordCredentialValveImpl.class);
     
     private static final String CHECKED_KEY = PasswordCredentialValveImpl.class.getName() + ".checked";
     //private PageManager pageManager;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java Wed Apr 22 10:08:53 2009
@@ -20,8 +20,8 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.administration.PortalAuthenticationConfiguration;
 import org.apache.jetspeed.pipeline.valve.SecurityValve;
 import org.apache.jetspeed.profiler.Profiler;
@@ -44,7 +44,7 @@
  */
 public class SecurityValveImpl extends AbstractSecurityValve implements SecurityValve
 {
-    private static Log log = LogFactory.getLog(SecurityValveImpl.class);
+    private static Logger log = LoggerFactory.getLogger(SecurityValveImpl.class);
     
     private UserManager userMgr;
     private PortalStatistics statistics;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.cluster.NodeManager;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.components.portletregistry.RegistryException;
@@ -51,7 +51,7 @@
 {
     private static int DEFAULT_DESCRIPTOR_CHANGE_MONITOR_INTERVAL = 10*1000; // 10 seconds
     private static int DEFAULT_MAX_RETRIED_STARTS = 10; // 10 times retry PA
-    private static final Log    log = LogFactory.getLog("deployment");
+    private static final Logger    log = LoggerFactory.getLogger("deployment");
 
     protected PortletFactory        portletFactory;
     protected PortletRegistry       registry;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.components.portletregistry.RegistryException;
 import org.apache.jetspeed.descriptor.JetspeedDescriptorService;
@@ -56,7 +56,7 @@
 
 public class VersionedPortletApplicationManager extends PortletApplicationManager
 {
-    private static final Log    log = LogFactory.getLog("deployment");
+    private static final Logger    log = LoggerFactory.getLogger("deployment");
         
     public VersionedPortletApplicationManager(PortletFactory portletFactory, PortletRegistry registry, 
             PermissionManager permissionManager, SearchEngine searchEngine,  RoleManager roleManager,

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java Wed Apr 22 10:08:53 2009
@@ -30,8 +30,8 @@
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -45,7 +45,7 @@
 public class TomcatManager implements ApplicationServerManager
 {
     private static final String DEFAULT_MANAGER_APP_PATH = "/manager";
-    protected static final Log log = LogFactory.getLog("deployment");
+    protected static final Logger log = LoggerFactory.getLogger("deployment");
 
     private String hostUrl;
     private int hostPort;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
 
 import javax.portlet.PortletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.om.portlet.UserAttribute;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
 import org.apache.jetspeed.om.portlet.impl.UserAttributeRefImpl;
@@ -42,7 +42,7 @@
 public abstract class AbstractUserInfoManagerImpl
 {
     /** Logger */
-    private static final Log log = LogFactory.getLog(UserInfoManagerImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(UserInfoManagerImpl.class);
     
     /**
      * <p>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
 import javax.portlet.PortletRequest;
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.request.RequestContext;
@@ -47,8 +47,7 @@
 {
 
     /** Logger */
-    private static final Log log = LogFactory
-            .getLog(MultiSourceUserInfoManagerImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(MultiSourceUserInfoManagerImpl.class);
 
     private List sources;
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java Wed Apr 22 10:08:53 2009
@@ -26,8 +26,8 @@
 import javax.portlet.PortletRequest;
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
@@ -51,7 +51,7 @@
 {
 
     /** Logger */
-    private static final Log log = LogFactory.getLog(UserInfoManagerImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(UserInfoManagerImpl.class);
 
     // TODO Same caching issue as usual. We should look into JCS. That wil do
     // for now.

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.SecurityException;
@@ -45,7 +45,7 @@
 {
 
     /** Logger */
-    private static final Log log = LogFactory.getLog(UserManagerUserAttributeSourceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(UserManagerUserAttributeSourceImpl.class);
 
     /** The user manager */
     private UserManager userManager;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java Wed Apr 22 10:08:53 2009
@@ -31,8 +31,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.descriptor.JetspeedDescriptorService;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
@@ -65,7 +65,7 @@
     public static final String WEB_XML_PATH = "WEB-INF/web.xml";
     public static final String EXTENDED_PORTLET_XML_PATH = "WEB-INF/jetspeed-portlet.xml";
 
-    protected static final Log log = LogFactory.getLog("deployment");
+    protected static final Logger log = LoggerFactory.getLogger("deployment");
 
     protected String paName;
     protected String webAppContextRoot;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java Wed Apr 22 10:08:53 2009
@@ -23,15 +23,15 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.aggregator.PortletRenderer;
 import org.apache.jetspeed.layout.JetspeedPowerTool;
 import org.apache.jetspeed.request.RequestContext;
 
 public class JetspeedPowerToolFactory implements org.apache.jetspeed.layout.JetspeedPowerToolFactory
 {
-    protected static final Log log = LogFactory.getLog(JetspeedPowerToolFactory.class);
+    protected static final Logger log = LoggerFactory.getLogger(JetspeedPowerToolFactory.class);
     
     private Class jptClass;
     private Constructor constructor;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java Wed Apr 22 10:08:53 2009
@@ -35,8 +35,8 @@
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.Jetspeed;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.aggregator.PortletRenderer;
@@ -103,7 +103,7 @@
 
     protected Writer templateWriter;
 
-    protected static final Log log = LogFactory.getLog(JetspeedPowerToolImpl.class);
+    protected static final Logger log = LoggerFactory.getLogger(JetspeedPowerToolImpl.class);
 
     protected CapabilityMap capabilityMap;
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java Wed Apr 22 10:08:53 2009
@@ -36,8 +36,8 @@
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.Jetspeed;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.capabilities.CapabilityMap;
@@ -69,7 +69,7 @@
 public class JetspeedVelocityViewServlet extends BridgesVelocityViewServlet
 {
     /** logging */
-    private static final Log log = LogFactory.getLog(JetspeedVelocityViewServlet.class);
+    private static final Logger log = LoggerFactory.getLogger(JetspeedVelocityViewServlet.class);
 
     /** default cache size */
     private static final long DEFAULT_CACHE_SIZE = 50;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml Wed Apr 22 10:08:53 2009
@@ -51,8 +51,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.pluto</groupId>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java Wed Apr 22 10:08:53 2009
@@ -33,8 +33,8 @@
 import javax.portlet.filter.PortletFilter;
 import javax.servlet.ServletContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.PortalContext;
 import org.apache.jetspeed.container.ContainerInfo;
 import org.apache.jetspeed.container.JetspeedPortletConfig;
@@ -61,7 +61,7 @@
  */
 public class JetspeedPortletFactory implements PortletFactory
 {
-    private static final Log log = LogFactory.getLog(JetspeedPortletFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(JetspeedPortletFactory.class);
     
     private Map<String, Map<String, PortletInstance>> portletCache;
     private Map<String, Map<String, PreferencesValidator>> validatorCache;
@@ -273,7 +273,7 @@
         }
         catch (Exception e)
         {
-            log.error(e);
+            log.error(e.getMessage(),e);
         }
         
         return validator;
@@ -313,7 +313,7 @@
         }
         catch (Exception e)
         {
-            log.error(e);
+            log.error(e.getMessage(),e);
         }
         return bundle;
     }
@@ -369,7 +369,7 @@
         }
         catch (Exception e)
         {
-            log.error(e);
+            log.error(e.getMessage(),e);
         }
         return bundle;
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java Wed Apr 22 10:08:53 2009
@@ -26,8 +26,8 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.components.dao.InitablePersistenceBrokerDaoSupport;
 import org.apache.jetspeed.profiler.ProfileLocator;
 import org.apache.jetspeed.profiler.Profiler;
@@ -61,7 +61,7 @@
     public final static String DEFAULT_RULE = "j1";
     
     /** Commons logging */
-    protected final static Log log = LogFactory.getLog(JetspeedProfilerImpl.class);
+    protected final static Logger log = LoggerFactory.getLogger(JetspeedProfilerImpl.class);
 
     /**
      * This is the principal that is used if there are no principal to rule associations for the current principal

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PrincipalCriterionResolver.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PrincipalCriterionResolver.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PrincipalCriterionResolver.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PrincipalCriterionResolver.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.profiler.rules.FallbackCriterionResolver;
 import org.apache.jetspeed.profiler.rules.RuleCriterion;
 import org.apache.jetspeed.request.RequestContext;
@@ -40,7 +40,7 @@
         FallbackCriterionResolver
 {
     private static final long serialVersionUID = 1L;
-    protected final static Log log = LogFactory.getLog(PrincipalCriterionResolver.class);
+    protected final static Logger log = LoggerFactory.getLogger(PrincipalCriterionResolver.class);
     
     /* (non-Javadoc)
      * @see org.apache.jetspeed.profiler.rules.RuleCriterionResolver#resolve(org.apache.jetspeed.request.RequestContext, org.apache.jetspeed.profiler.rules.RuleCriterion)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/RoleComboCriterionResolver.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/RoleComboCriterionResolver.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/RoleComboCriterionResolver.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/RoleComboCriterionResolver.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.profiler.rules.FallbackCriterionResolver;
 import org.apache.jetspeed.profiler.rules.RuleCriterion;
 import org.apache.jetspeed.request.RequestContext;
@@ -38,7 +38,7 @@
     implements FallbackCriterionResolver
 {
     private static final long serialVersionUID = 1L;
-    protected final static Log log = LogFactory.getLog(RoleComboCriterionResolver.class);
+    protected final static Logger log = LoggerFactory.getLogger(RoleComboCriterionResolver.class);
     
     public String resolve(RequestContext context, RuleCriterion criterion)
     {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.profiler.ProfileLocator;
 import org.apache.jetspeed.profiler.Profiler;
 import org.apache.jetspeed.profiler.rules.FallbackCriterionResolver;
@@ -40,7 +40,7 @@
     extends AbstractProfilingRule
     implements ProfilingRule
 {
-    protected final static Log log = LogFactory.getLog(RoleFallbackProfilingRule.class);
+    protected final static Logger log = LoggerFactory.getLogger(RoleFallbackProfilingRule.class);
     private final static long serialVersionUID = 1L;
     
     public RoleFallbackProfilingRule()

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
 
 import java.util.Iterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.profiler.ProfileLocator;
 import org.apache.jetspeed.profiler.Profiler;
 import org.apache.jetspeed.profiler.rules.ProfileResolvers;
@@ -39,7 +39,7 @@
     extends AbstractProfilingRule
     implements ProfilingRule
 {
-    protected final static Log log = LogFactory.getLog(StandardProfilingRule.class);            
+    protected final static Logger log = LoggerFactory.getLogger(StandardProfilingRule.class);            
     private static final long serialVersionUID = 1;    
             
     public StandardProfilingRule()

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java Wed Apr 22 10:08:53 2009
@@ -20,8 +20,8 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.profiler.rules.RuleCriterion;
 import org.apache.jetspeed.profiler.rules.RuleCriterionResolver;
 import org.apache.jetspeed.request.RequestContext;
@@ -42,7 +42,7 @@
     extends StandardResolver
     implements RuleCriterionResolver
 {
-    protected final static Log log = LogFactory.getLog(UserCriterionResolver.class);
+    protected final static Logger log = LoggerFactory.getLogger(UserCriterionResolver.class);
     
     /* (non-Javadoc)
      * @see org.apache.jetspeed.profiler.rules.RuleCriterionResolver#resolve(org.apache.jetspeed.request.RequestContext, org.apache.jetspeed.profiler.rules.RuleCriterion)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java Wed Apr 22 10:08:53 2009
@@ -22,7 +22,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 import org.apache.jetspeed.profiler.Profiler;
 import org.apache.jetspeed.profiler.ProfilerException;
 import org.apache.jetspeed.profiler.rules.PrincipalRule;
@@ -62,7 +62,7 @@
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processExport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processExport(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    protected void processExport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_PROFILER))
         {
@@ -72,7 +72,7 @@
         }
     }
 
-    protected void deleteData(Map settings, Log log) throws SerializerException
+    protected void deleteData(Map settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_PROFILER))
         {
@@ -109,7 +109,7 @@
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processImport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processImport(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    protected void processImport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_PROFILER))
         {
@@ -119,7 +119,7 @@
         }
     }
 
-    private void recreateProfilingRules(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    private void recreateProfilingRules(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         log.debug("recreateProfilingRules - processing");
         JSProfilingRules rules = snapshot.getRules();
@@ -166,7 +166,7 @@
      * 
      * @throws SerializerException
      */
-    private void recreateUserPrincipalRules(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    private void recreateUserPrincipalRules(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         log.debug("recreateUserPrincipalRules - started");
 
@@ -301,7 +301,7 @@
      * 
      * @throws SerializerException
      */
-    private void exportProfilingRules(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    private void exportProfilingRules(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         HashMap rulesMap = new HashMap();
         Class standardRuleClass = null;
@@ -352,7 +352,7 @@
             snapshot.setDefaultRule(defaultRule.getId());
     }
 
-    private void exportUserPrincipalRules(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    private void exportUserPrincipalRules(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         // get Rules for each user
         

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml Wed Apr 22 10:08:53 2009
@@ -57,12 +57,22 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-orm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-ojb</artifactId>
     </dependency>
+    <!--  for spring-ojb we require JCL -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
     <dependency>
       <groupId>ojb</groupId>
       <artifactId>db-ojb</artifactId>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java Wed Apr 22 10:08:53 2009
@@ -29,8 +29,8 @@
 import org.apache.commons.dbcp.DriverManagerConnectionFactory;
 import org.apache.commons.dbcp.PoolableConnectionFactory;
 import org.apache.commons.dbcp.PoolingDataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.impl.GenericObjectPool;
 
@@ -49,7 +49,7 @@
 public class DBCPDatasourceComponent implements DatasourceComponent
 {
 
-    private static final Log log = LogFactory.getLog(DBCPDatasourceComponent.class);
+    private static final Logger log = LoggerFactory.getLogger(DBCPDatasourceComponent.class);
 
     protected PoolingDataSource dataSource;
     //protected DataSource dataSource;
@@ -214,7 +214,7 @@
             ise.initCause(e);
             try
             {
-                log.error(ise);
+                log.error("Unable to sfaely shutdown the DBCPConnection pool", ise);
             }
             catch (Exception e1)
             {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
 
 /**
@@ -36,7 +36,7 @@
  */
 public class SchemaAwareDataSourceProxy extends TransactionAwareDataSourceProxy
 {
-    private static final Log log = LogFactory.getLog(SchemaAwareDataSourceProxy.class);
+    private static final Logger log = LoggerFactory.getLogger(SchemaAwareDataSourceProxy.class);
 
     private String schemaSql = null;
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java Wed Apr 22 10:08:53 2009
@@ -34,8 +34,8 @@
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.jndi.JndiObjectFactoryBean;
 
@@ -46,8 +46,8 @@
 */
 public class DebuggingDataSourceJndiObjectFactoryBean extends JndiObjectFactoryBean implements DisposableBean
 {
-   private static final Log statisticsLog = LogFactory.getLog("org.apache.jetspeed.ds.statistics");
-   private static final Log openConnectionsLog = LogFactory.getLog("org.apache.jetspeed.ds.connections");
+   private static final Logger statisticsLog = LoggerFactory.getLogger("org.apache.jetspeed.ds.statistics");
+   private static final Logger openConnectionsLog = LoggerFactory.getLogger("org.apache.jetspeed.ds.connections");
 
    private Object mutex = new Object();
    private DataSourceWrapper cachedWrapper;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/TyrexJNDIComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/TyrexJNDIComponent.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/TyrexJNDIComponent.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/TyrexJNDIComponent.java Wed Apr 22 10:08:53 2009
@@ -27,8 +27,8 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import tyrex.naming.MemoryContext;
 import tyrex.tm.RuntimeContext;
@@ -47,7 +47,7 @@
 public class TyrexJNDIComponent implements JNDIComponent
 {
 
-    private static final Log log = LogFactory.getLog(TyrexJNDIComponent.class);
+    private static final Logger log = LoggerFactory.getLogger(TyrexJNDIComponent.class);
 
     private MemoryContext rootJNDIContext;
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java Wed Apr 22 10:08:53 2009
@@ -28,8 +28,8 @@
 import javax.sql.DataSource;
 
 import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ojb.broker.PBKey;
 import org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl;
 import org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl;
@@ -84,7 +84,7 @@
     extends BasicDataSource
     implements BeanNameAware, InitializingBean
 {
-    private static final Log log = LogFactory.getLog(ConnectionRepositoryEntry.class);
+    private static final Logger log = LoggerFactory.getLogger(ConnectionRepositoryEntry.class);
     
     // general properties
     private String jcdAlias = null;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/rdbms/ojb/DatabasePlatformConfigurator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/rdbms/ojb/DatabasePlatformConfigurator.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/rdbms/ojb/DatabasePlatformConfigurator.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/rdbms/ojb/DatabasePlatformConfigurator.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
 
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ojb.broker.PBKey;
 import org.apache.ojb.broker.accesslayer.LookupException;
 import org.apache.ojb.broker.metadata.ConnectionRepository;
@@ -43,7 +43,7 @@
  */
 public class DatabasePlatformConfigurator
 {
-    private static final Log log = LogFactory.getLog(DatabasePlatformConfigurator.class);
+    private static final Logger log = LoggerFactory.getLogger(DatabasePlatformConfigurator.class);
     
     private DataSource ds;
     private String jcdAlias;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java Wed Apr 22 10:08:53 2009
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
 import org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
@@ -77,7 +77,7 @@
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processExport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processExport(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    protected void processExport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_ENTITIES))
         {
@@ -92,7 +92,7 @@
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processImport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processImport(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    protected void processImport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_ENTITIES))
         {
@@ -101,7 +101,7 @@
         }
     }
 
-    protected void deleteData(Map settings, Log log) throws SerializerException
+    protected void deleteData(Map settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_ENTITIES))
         {
@@ -131,7 +131,7 @@
         }
     }
 
-    private void importEntities(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    private void importEntities(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         JSApplications applications = snapshot.getApplications();
 
@@ -152,7 +152,7 @@
         }
     }
 
-    void importPA(JSApplication app, PortletApplication pa, Map settings, Log log) throws SerializerException
+    void importPA(JSApplication app, PortletApplication pa, Map settings, Logger log) throws SerializerException
     {
 
         System.out.println("--processed PA " + pa.getName());
@@ -173,7 +173,7 @@
         }
     }
 
-    private void importPD(JSPortlet portlet, PortletDefinition pd, Map settings, Log log) throws SerializerException
+    private void importPD(JSPortlet portlet, PortletDefinition pd, Map settings, Logger log) throws SerializerException
     {
 
         JSEntities entities = portlet.getEntities();
@@ -191,7 +191,7 @@
                 }
                 catch (Exception e)
                 {
-                    log.error(e);
+                    log.error(e.getMessage(),e);
                 }
             }
             // check preferences
@@ -200,7 +200,7 @@
         }
     }
 
-    private void importEntityPref(JSEntity entity, PortletEntity portletEntity, Map settings, Log log)
+    private void importEntityPref(JSEntity entity, PortletEntity portletEntity, Map settings, Logger log)
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES))
         {
@@ -254,7 +254,7 @@
         }
     }
 
-    private void exportEntities(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+    private void exportEntities(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
     {
         Collection col = registry.getPortletApplications();
         if ((col == null) || (col.size() == 0))
@@ -290,7 +290,7 @@
         }
     }
 
-    private JSApplication exportPA(PortletApplication pa, Map settings, Log log) throws SerializerException
+    private JSApplication exportPA(PortletApplication pa, Map settings, Logger log) throws SerializerException
     {
         JSApplication jsApplication = null;
         /**
@@ -336,7 +336,7 @@
         return jsApplication;
     }
 
-    private JSPortlet exportPD(PortletDefinition pd, Map settings, Log log) throws SerializerException
+    private JSPortlet exportPD(PortletDefinition pd, Map settings, Logger log) throws SerializerException
     {
         JSPortlet jsPortlet = null;
         
@@ -375,7 +375,7 @@
         return jsPortlet;
     }
 
-    JSEntity exportEntityPref(PortletEntity entity, Map settings, Log log)
+    JSEntity exportEntityPref(PortletEntity entity, Map settings, Logger log)
     {        
         JSEntity jsEntity = null;
 /* TODO 2.2

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
 import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
 
@@ -41,7 +41,7 @@
     private static final String DELIM = ",";
     private static final String QUOTE = "\"";
     
-    private static final Log log = LogFactory.getLog(CSVtoCollectionFieldConversion.class);
+    private static final Logger log = LoggerFactory.getLogger(CSVtoCollectionFieldConversion.class);
     
     /**
      * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java Wed Apr 22 10:08:53 2009
@@ -16,8 +16,8 @@
  */
 package org.apache.jetspeed.util.ojb;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utility class that allows convenient access to commons=logging for OJB 
@@ -30,8 +30,8 @@
 public abstract class FieldConversionLog
 {
     /**
-     * There is only default ("package") access to this Log only as
+     * There is only default ("package") access to this Logger only as
      * all OJB FieldConversions should be located here.
      */
-    static final Log LOG = LogFactory.getLog("org.apache.jetspeed.util.ojb");
+    static final Logger LOG = LoggerFactory.getLogger("org.apache.jetspeed.util.ojb");
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml Wed Apr 22 10:08:53 2009
@@ -62,6 +62,10 @@
             <groupId>lucene</groupId>
             <artifactId>lucene-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         
         <!-- Test Dependencies -->
         <dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java Wed Apr 22 10:08:53 2009
@@ -29,8 +29,8 @@
 
 import org.apache.commons.collections.MultiHashMap;
 import org.apache.commons.collections.MultiMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.search.BaseParsedObject;
 import org.apache.jetspeed.search.HandlerFactory;
 import org.apache.jetspeed.search.ObjectHandler;
@@ -57,7 +57,7 @@
  */
 public class SearchEngineImpl implements SearchEngine
 {
-    protected final static Log log = LogFactory.getLog(SearchEngineImpl.class);
+    protected final static Logger log = LoggerFactory.getLogger(SearchEngineImpl.class);
     private File rootIndexDir = null;
     private String analyzerClassName = null;
     private boolean optimizeAfterUpdate = true;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml Wed Apr 22 10:08:53 2009
@@ -62,9 +62,9 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
-        <dependency>        
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>        
             <groupId>commons-lang</groupId>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseAuthenticationProvider.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseAuthenticationProvider.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseAuthenticationProvider.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
 
 import java.net.URL;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.jetspeed.components.util.system.SystemResourceUtil;
 import org.apache.jetspeed.components.util.system.ClassLoaderSystemResourceUtilImpl;
@@ -35,7 +35,7 @@
 {
 
     /** The logger. */
-    private static final Log log = LogFactory.getLog(BaseAuthenticationProvider.class);
+    private static final Logger log = LoggerFactory.getLogger(BaseAuthenticationProvider.class);
 
     /** The provider name. */
     private String providerName;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java Wed Apr 22 10:08:53 2009
@@ -28,8 +28,8 @@
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.security.AuthenticatedUser;
 import org.apache.jetspeed.security.LoginModuleProxy;
 import org.apache.jetspeed.security.Role;
@@ -55,7 +55,7 @@
  */
 public class DefaultLoginModule implements LoginModule
 {
-    private static final Log log = LogFactory.getLog(DefaultLoginModule.class);
+    private static final Logger log = LoggerFactory.getLogger(DefaultLoginModule.class);
     
     /** <p>LoginModule debug mode is turned off by default.</p> */
     protected boolean debug;
@@ -192,7 +192,7 @@
             }
             catch (Exception ex)
             {
-                log.error(ex);
+                log.error(ex.getMessage(), ex);
                 throw new LoginException(ex.getMessage());
             }
         }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.security.Group;
 import org.apache.jetspeed.security.GroupManager;
 import org.apache.jetspeed.security.JetspeedPrincipal;
@@ -52,7 +52,7 @@
 {
 
     /** The logger. */
-    private static final Log log = LogFactory.getLog(GroupManagerImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(GroupManagerImpl.class);
 
     private JetspeedPrincipalType userType;
     private JetspeedPrincipalType roleType;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java Wed Apr 22 10:08:53 2009
@@ -27,8 +27,8 @@
 import java.util.Enumeration;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.security.PermissionManager;
 import org.apache.jetspeed.security.SecurityPolicies;
 
@@ -50,7 +50,7 @@
  */
 public class RdbmsPolicy extends Policy
 {
-    private static final Log log = LogFactory.getLog(RdbmsPolicy.class);
+    private static final Logger log = LoggerFactory.getLogger(RdbmsPolicy.class);
 
     /**
      * <p>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.security.Group;
 import org.apache.jetspeed.security.GroupManager;
 import org.apache.jetspeed.security.JetspeedPrincipal;
@@ -55,7 +55,7 @@
 public class RoleManagerImpl extends BaseJetspeedPrincipalManager implements RoleManager
 {
     /** The logger. */
-    private static final Log log = LogFactory.getLog(RoleManagerImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(RoleManagerImpl.class);
     
     private JetspeedPrincipalType userType;
     private JetspeedPrincipalType groupType;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.security.AuthenticatedUser;
 import org.apache.jetspeed.security.AuthenticatedUserImpl;
 import org.apache.jetspeed.security.GroupManager;
@@ -58,7 +58,7 @@
  */
 public class UserManagerImpl extends BaseJetspeedPrincipalManager implements UserManager, UserSubjectPrincipalsProvider
 {
-	private static final Log log = LogFactory.getLog(UserManagerImpl.class);
+	private static final Logger log = LoggerFactory.getLogger(UserManagerImpl.class);
 
 	private String anonymousUser = "guest";
 	private JetspeedPrincipalType roleType;



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message