You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2009/04/22 12:09:01 UTC
svn commit: r767444 [3/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...
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java Wed Apr 22 10:08:53 2009
@@ -27,8 +27,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-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.container.FilterManager;
import org.apache.jetspeed.container.PortletWindow;
@@ -64,7 +64,7 @@
*/
public class ServletPortletInvoker implements JetspeedPortletInvoker
{
- private final static Log log = LogFactory.getLog(ServletPortletInvoker.class);
+ private final static Logger log = LoggerFactory.getLogger(ServletPortletInvoker.class);
protected PortletFactory portletFactory;
protected ServletContext jetspeedContext;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedFilterManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedFilterManager.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedFilterManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedFilterManager.java Wed Apr 22 10:08:53 2009
@@ -33,8 +33,8 @@
import javax.portlet.ResourceResponse;
import javax.portlet.ResourceServingPortlet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.container.FilterManager;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.factory.PortletFilterInstance;
@@ -44,7 +44,7 @@
public class JetspeedFilterManager implements FilterManager
{
- private static final Log log = LogFactory.getLog(JetspeedFilterManager.class);
+ private static final Logger log = LoggerFactory.getLogger(JetspeedFilterManager.class);
private PortletFactory portletFactory;
private JetspeedFilterChain filterchain;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPortletURLListenerService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPortletURLListenerService.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPortletURLListenerService.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPortletURLListenerService.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
import javax.portlet.PortletException;
import javax.portlet.PortletURLGenerationListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.pluto.container.PortletURLListenerService;
@@ -30,7 +30,7 @@
public class JetspeedPortletURLListenerService implements PortletURLListenerService
{
- private static final Log log = LogFactory.getLog(JetspeedPortletURLListenerService.class);
+ private static final Logger log = LoggerFactory.getLogger(JetspeedPortletURLListenerService.class);
protected PortletFactory portletFactory;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
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;
/**
* PortalSessionsManagerImpl
@@ -37,7 +37,7 @@
public class PortalSessionsManagerImpl implements PortalSessionsManager
{
- private static Log log = LogFactory.getLog(PortalSessionsManagerImpl.class);
+ private static Logger log = LoggerFactory.getLogger(PortalSessionsManagerImpl.class);
private static final class PortalSessionRegistry
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
import javax.portlet.WindowState;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.container.url.PortalURL;
@@ -41,7 +41,7 @@
public class JetspeedNavigationalStateCodec implements NavigationalStateCodec
{
/** Commons logging */
- protected final static Log log = LogFactory.getLog(JetspeedNavigationalStateCodec.class);
+ protected final static Logger log = LoggerFactory.getLogger(JetspeedNavigationalStateCodec.class);
protected static final char PARAMETER_SEPARATOR = '|';
protected static final char PARAMETER_ELEMENT_SEPARATOR = '=';
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
import javax.portlet.WindowState;
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.JetspeedActions;
import org.apache.jetspeed.cache.JetspeedContentCache;
import org.apache.jetspeed.container.state.NavigationalState;
@@ -43,7 +43,7 @@
*/
public class SessionNavigationalState extends AbstractNavigationalState
{
- protected final Log log = LogFactory.getLog(getClass());
+ protected final Logger log = LoggerFactory.getLogger(getClass());
private Map<String, PortletWindowBaseNavigationalState> currentPageWindowStates;
private boolean clearPortletsModeAndWindowStateEnabled = false;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/BaseDecoration.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/BaseDecoration.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/BaseDecoration.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/BaseDecoration.java Wed Apr 22 10:08:53 2009
@@ -28,8 +28,8 @@
import java.util.Properties;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.util.Path;
/**
@@ -47,7 +47,7 @@
*/
public class BaseDecoration implements Decoration, Serializable
{
- private static final Log log = LogFactory.getLog(BaseDecoration.class);
+ private static final Logger log = LoggerFactory.getLogger(BaseDecoration.class);
protected static final String NO_SUCH_RESOURCE = "no_such_resource";
protected transient Properties config;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java Wed Apr 22 10:08:53 2009
@@ -33,8 +33,8 @@
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.cache.CacheElement;
import org.apache.jetspeed.cache.JetspeedCache;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
@@ -56,7 +56,7 @@
*/
public class DecorationFactoryImpl implements DecorationFactory, ServletContextAware
{
- private static final Log log = LogFactory.getLog(DecorationFactoryImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(DecorationFactoryImpl.class);
private final Path decorationsPath;
private final Path portletDecorationsPath;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java Wed Apr 22 10:08:53 2009
@@ -26,8 +26,8 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.cache.CacheElement;
@@ -69,7 +69,7 @@
public static final String ACTION_IMAGE_EXTENSION_ATTR = "actionImageExtension";
public static final String IS_AJAX_DECORATION_REQUEST = "org.apache.jetspeed.decoration.ajax";
- protected final static Log log = LogFactory.getLog(DecorationValve.class);
+ protected final static Logger log = LoggerFactory.getLogger(DecorationValve.class);
private final DecorationFactory decorationFactory;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageActionAccess.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageActionAccess.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageActionAccess.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageActionAccess.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.om.page.Page;
@@ -35,7 +35,7 @@
*/
public class PageActionAccess implements PageEditAccess, Serializable
{
- protected static final Log log = LogFactory.getLog(PageActionAccess.class);
+ protected static final Logger log = LoggerFactory.getLogger(PageActionAccess.class);
private static final class ActionAccess implements Serializable
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java Wed Apr 22 10:08:53 2009
@@ -26,8 +26,8 @@
import java.util.List;
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.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
import org.apache.jetspeed.deployment.DeploymentException;
@@ -44,7 +44,7 @@
*/
public class DeployDecoratorEventListener implements DeploymentEventListener
{
- protected static final Log log = LogFactory.getLog("deployment");
+ protected static final Logger log = LoggerFactory.getLogger("deployment");
protected String deployToDir;
public DeployDecoratorEventListener(String deployToDir) throws FileNotFoundException
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,8 @@
import java.net.URLClassLoader;
import java.util.ArrayList;
-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.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
@@ -46,7 +46,7 @@
public class DeployPortletAppEventListener implements DeploymentEventListener
{
- protected static final Log log = LogFactory.getLog("deployment");
+ protected static final Logger log = LoggerFactory.getLogger("deployment");
private String webAppDir;
private int localPAPrefixLength;
private String localAppDir;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java Wed Apr 22 10:08:53 2009
@@ -27,8 +27,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.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
@@ -56,7 +56,7 @@
}
};
- protected Log log = LogFactory.getLog("deployment");
+ protected Logger log = LoggerFactory.getLogger("deployment");
protected FileSystemScanner scanner;
protected PortletRegistry registry;
protected Collection deploymentListeners;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.desktop.JetspeedDesktop;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -46,7 +46,7 @@
*/
public class DesktopEncoderRedirectValveImpl extends AbstractValve
{
- protected Log log = LogFactory.getLog(DesktopEncoderRedirectValveImpl.class);
+ protected Logger log = LoggerFactory.getLogger(DesktopEncoderRedirectValveImpl.class);
private String desktopPipelinePath = null;
private String desktopRenderPipelinePath = null;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
import javax.servlet.RequestDispatcher;
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.Jetspeed;
import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.JetspeedCache;
@@ -53,7 +53,7 @@
*/
public class JetspeedDesktopImpl implements JetspeedDesktop, ServletContextAware
{
- private static final Log log = LogFactory.getLog( JetspeedDesktopImpl.class );
+ private static final Logger log = LoggerFactory.getLogger( JetspeedDesktopImpl.class );
private final static String EOL = "\r\n"; // html eol
private final static String DOJO_CONFIG_LAYOUT_DECORATION_PATH_VAR_NAME = HeaderResource.HEADER_INTERNAL_DOJO_CONFIG_JETSPEED_VAR_NAME + ".layoutDecorationPath";
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
import javax.servlet.ServletConfig;
import org.apache.commons.configuration.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedPortalContext;
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.PortalReservedParameters;
@@ -62,7 +62,7 @@
private Map pipelineMapper ;
private PortalStatistics statistics;
- protected static final Log log = LogFactory.getLog(JetspeedEngine.class);
+ protected static final Logger log = LoggerFactory.getLogger(JetspeedEngine.class);
protected String defaultPipelineName;
public JetspeedEngine(Configuration configuration, String applicationRoot, ServletConfig config, ComponentManager componentManager )
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedServlet.java Wed Apr 22 10:08:53 2009
@@ -35,8 +35,8 @@
import org.apache.commons.configuration.ConfigurationUtils;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.lang.exception.ExceptionUtils;
-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.cache.UserContentCacheManager;
@@ -66,8 +66,8 @@
extends HttpServlet
implements JetspeedEngineConstants, HttpSessionListener
{
- private static Log log;
- private static Log console;
+ private static Logger log;
+ private static Logger console;
/**
* In certain situations the init() method is called more than once,
@@ -109,8 +109,8 @@
{
if ( log == null )
{
- log = LogFactory.getLog(JetspeedServlet.class);
- console = LogFactory.getLog(CONSOLE_LOGGER);
+ log = LoggerFactory.getLogger(JetspeedServlet.class);
+ console = LoggerFactory.getLogger(CONSOLE_LOGGER);
}
console.info(INIT_START_MSG);
@@ -200,8 +200,8 @@
// save the exception to complain loudly later :-)
final String msg = "Jetspeed: init() failed: ";
initFailure = e;
- log.fatal(msg, e);
- console.fatal(msg, e);
+ log.error(msg, e);
+ console.error(msg, e);
}
console.info(INIT_DONE_MSG);
@@ -291,7 +291,7 @@
catch (Throwable e)
{
final String msg = "Fatal error encountered while processing portal request: "+e.getMessage();
- log.fatal(msg, e);
+ log.error(msg, e);
req.getSession(true).setAttribute("org.apache.portals.jestspeed.diagnostics", e.getLocalizedMessage());
res.sendRedirect(req.getContextPath() + "/diagnostics");
}
@@ -330,7 +330,7 @@
}
catch (JetspeedException e)
{
- log.fatal("Jetspeed: shutdown() failed: ", e);
+ log.error("Jetspeed: shutdown() failed: ", e);
System.err.println(ExceptionUtils.getStackTrace(e));
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java Wed Apr 22 10:08:53 2009
@@ -35,8 +35,8 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.aggregator.PortletTrackingManager;
import org.apache.jetspeed.container.PortletWindow;
@@ -67,7 +67,7 @@
*/
public class EventCoordinationServiceImpl implements JetspeedEventCoordinationService
{
- private static Log log = LogFactory.getLog(EventProviderImpl.class);
+ private static Logger log = LoggerFactory.getLogger(EventProviderImpl.class);
private final PortalStatistics statistics;
private final PortletTrackingManager portletTracking;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/ProcessEventImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/ProcessEventImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/ProcessEventImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/ProcessEventImpl.java Wed Apr 22 10:08:53 2009
@@ -20,8 +20,8 @@
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.container.PortletWindow;
/**
@@ -36,7 +36,7 @@
private String className;
private JetspeedEventCoordinationService eventService;
private boolean processed = false;
- private static Log log = LogFactory.getLog(ProcessEventImpl.class);
+ private static Logger log = LoggerFactory.getLogger(ProcessEventImpl.class);
public ProcessEventImpl(PortletWindow window, QName qname, String className, java.io.Serializable value, JetspeedEventCoordinationService eventService)
@@ -70,7 +70,7 @@
}
catch (Exception e)
{
- log.error(e);
+ log.error(e.getMessage(),e);
}
finally
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,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.springframework.jdbc.support.JdbcUtils;
/**
@@ -37,7 +37,7 @@
*/
public class DatasourceAvailableHealthCheckValidator implements HealthCheckValidator
{
- private static final Log log = LogFactory.getLog(DatasourceAvailableHealthCheckValidator.class);
+ private static final Logger log = LoggerFactory.getLogger(DatasourceAvailableHealthCheckValidator.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/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,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.factory.PortletFactory;
import org.apache.jetspeed.om.portlet.PortletApplication;
@@ -33,7 +33,7 @@
*/
public class PortletApplicationAvailableHeathCheckValidator implements HealthCheckValidator
{
- private static final Log log = LogFactory.getLog(PortletApplicationAvailableHeathCheckValidator.class);
+ private static final Logger log = LoggerFactory.getLogger(PortletApplicationAvailableHeathCheckValidator.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/layout/impl/AddPortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/AddPortletAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/AddPortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/AddPortletAction.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -51,7 +51,7 @@
extends MovePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(AddPortletAction.class);
+ protected Logger log = LoggerFactory.getLogger(AddPortletAction.class);
protected GetPortletsAction getPortletsAction = null;
protected boolean allowDuplicatePortlets = true;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
@@ -36,7 +36,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(BaseSiteUpdateAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(BaseSiteUpdateAction.class);
public BaseGetResourceAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BasePortletAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BasePortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BasePortletAction.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -40,7 +40,7 @@
public abstract class BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(BasePortletAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(BasePortletAction.class);
protected String template = null;
protected PageManager pageManager = null;
protected String errorTemplate = null;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -44,7 +44,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(BaseSiteUpdateAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(BaseSiteUpdateAction.class);
public BaseSiteUpdateAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseUserAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseUserAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseUserAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseUserAction.java Wed Apr 22 10:08:53 2009
@@ -20,8 +20,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -41,7 +41,7 @@
public abstract class BaseUserAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(BaseUserAction.class);
+ protected Logger log = LoggerFactory.getLogger(BaseUserAction.class);
protected String template = null;
protected UserManager userManager = null;
protected String errorTemplate = null;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.ajax.AJAXException;
@@ -55,7 +55,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(ChangePortletAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(ChangePortletAction.class);
protected String action;
protected Map validWindowStates = new HashMap();
protected Map validPortletModes = new HashMap();
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
import java.util.Map;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -46,7 +46,7 @@
*/
public class ExportJetspeedSchema extends BaseGetResourceAction implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetFolderAction.class);
+ protected Logger log = LoggerFactory.getLogger(GetFolderAction.class);
protected PageManager castorPageManager;
protected JetspeedSerializer serializer;
protected String pageRoot;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportObject.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportObject.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportObject.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportObject.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -43,7 +43,7 @@
* @version $Id$
*/
public class ExportObject extends BaseGetResourceAction implements AjaxAction, AjaxBuilder, Constants {
- protected Log log = LogFactory.getLog(GetFolderAction.class);
+ protected Logger log = LoggerFactory.getLogger(GetFolderAction.class);
protected PageManager castorPageManager;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFolderAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFolderAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFolderAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFolderAction.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -41,7 +41,7 @@
extends BaseGetResourceAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetFolderAction.class);
+ protected Logger log = LoggerFactory.getLogger(GetFolderAction.class);
public GetFolderAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFolderListAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFolderListAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFolderListAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFolderListAction.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.Map;
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.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -42,7 +42,7 @@
extends BaseGetResourceAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetThemesAction.class);
+ protected Logger log = LoggerFactory.getLogger(GetThemesAction.class);
public GetFolderListAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -42,7 +42,7 @@
extends BaseGetResourceAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetThemesAction.class);
+ protected Logger log = LoggerFactory.getLogger(GetThemesAction.class);
public GetFoldersListAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetLinkAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetLinkAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetLinkAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetLinkAction.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -41,7 +41,7 @@
extends BaseGetResourceAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetLinkAction.class);
+ protected Logger log = LoggerFactory.getLogger(GetLinkAction.class);
public GetLinkAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetMenuAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetMenuAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetMenuAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetMenuAction.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -43,7 +43,7 @@
public class GetMenuAction extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(GetMenusAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(GetMenusAction.class);
public GetMenuAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetMenusAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetMenusAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetMenusAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetMenusAction.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
import java.util.Set;
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.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -46,7 +46,7 @@
public class GetMenusAction extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(GetMenusAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(GetMenusAction.class);
public GetMenusAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -54,7 +54,7 @@
extends BaseGetResourceAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog( GetPageAction.class );
+ protected Logger log = LoggerFactory.getLogger( GetPageAction.class );
private PortletRegistry registry;
private DecorationValve decorationValve;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPagesAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPagesAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPagesAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPagesAction.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -47,7 +47,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants, Comparator
{
- protected static final Log log = LogFactory.getLog(GetPortletsAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(GetPortletsAction.class);
public GetPagesAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.ArrayList;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -47,7 +47,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(GetPortletActionsAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(GetPortletActionsAction.class);
protected String action;
private DecorationValve decorationValve;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -55,7 +55,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants, Comparator
{
- protected static final Log log = LogFactory.getLog(GetPortletsAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(GetPortletsAction.class);
private PortletRegistry registry = null;
private SearchEngine searchEngine = null;
private SecurityAccessController securityAccessController;
@@ -105,7 +105,7 @@
}
catch (Exception e)
{
- // Log the exception
+ // Logger the exception
log.error("exception while getting portlet info", e);
// Return a failure indicator
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetThemesAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetThemesAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetThemesAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetThemesAction.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -41,7 +41,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(GetThemesAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(GetThemesAction.class);
protected DecorationFactory decorationFactory;
public GetThemesAction(String template,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,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.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -50,7 +50,7 @@
extends BaseUserAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetUserInformationAction.class);
+ protected Logger log = LoggerFactory.getLogger(GetUserInformationAction.class);
public GetUserInformationAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -63,7 +63,7 @@
extends BaseUserAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetUserListAction.class);
+ protected Logger log = LoggerFactory.getLogger(GetUserListAction.class);
private PortalStatistics pstats = null;
private PortalSessionsManager psm = null;
// By default the protection is set to all
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/MovePortletAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/MovePortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/MovePortletAction.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.Map;
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.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -56,7 +56,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(MovePortletAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(MovePortletAction.class);
protected static final String eol = System.getProperty( "line.separator" );
private PortletRegistry registry;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.List;
import java.util.ArrayList;
-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.layout.PortletPlacementException;
import org.apache.jetspeed.om.page.Fragment;
@@ -47,7 +47,7 @@
*/
public class NestedFragmentContext
{
- protected static final Log log = LogFactory.getLog( NestedFragmentContext.class );
+ protected static final Logger log = LoggerFactory.getLogger( NestedFragmentContext.class );
protected static final String eol = System.getProperty( "line.separator" );
private Fragment targetFragment;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.security.Principal;
-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.administration.PortalConfiguration;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
@@ -37,7 +37,7 @@
extends PortletActionSecurityPathBehavior
implements PortletActionSecurityBehavior
{
- protected Log log = LogFactory.getLog(PortletActionSecurityConstraintsBehavior.class);
+ protected Logger log = LoggerFactory.getLogger(PortletActionSecurityConstraintsBehavior.class);
protected String guest = "guest";
public PortletActionSecurityConstraintsBehavior(PageManager pageManager)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java Wed Apr 22 10:08:53 2009
@@ -16,8 +16,8 @@
*/
package org.apache.jetspeed.layout.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.JetspeedActions;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.om.folder.Folder;
@@ -35,7 +35,7 @@
*/
public class PortletActionSecurityPathBehavior implements PortletActionSecurityBehavior
{
- protected Log log = LogFactory.getLog(PortletActionSecurityPathBehavior.class);
+ protected Logger log = LoggerFactory.getLogger(PortletActionSecurityPathBehavior.class);
protected PageManager pageManager;
private boolean enableCreateUserPagesFromRolesOnEdit;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,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.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
@@ -44,7 +44,7 @@
extends PortletActionSecurityPathBehavior
implements PortletActionSecurityBehavior
{
- protected Log log = LogFactory.getLog(PortletActionSecurityPathMergeBehavior.class);
+ protected Logger log = LoggerFactory.getLogger(PortletActionSecurityPathMergeBehavior.class);
public PortletActionSecurityPathMergeBehavior( PageManager pageManager )
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
import java.util.ArrayList;
import java.util.Map;
-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.layout.Coordinate;
import org.apache.jetspeed.layout.PortletPlacementException;
@@ -65,7 +65,7 @@
*/
public class PortletPlacementContextImpl implements PortletPlacementContext
{
- private static Log log = LogFactory.getLog( PortletPlacementContextImpl.class );
+ private static Logger log = LoggerFactory.getLogger( PortletPlacementContextImpl.class );
protected static final String eol = System.getProperty( "line.separator" );
// Columns are reference by index, the rows are held
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -49,7 +49,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(RemovePortletAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(RemovePortletAction.class);
private PortletRegistry registry;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/RolesSecurityBehavior.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/RolesSecurityBehavior.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/RolesSecurityBehavior.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/RolesSecurityBehavior.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,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.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.request.RequestContext;
@@ -32,7 +32,7 @@
*/
public class RolesSecurityBehavior implements PortletActionSecurityBehavior
{
- protected Log log = LogFactory.getLog(PortletActionSecurityPathBehavior.class);
+ protected Logger log = LoggerFactory.getLogger(PortletActionSecurityPathBehavior.class);
protected List roles;
public RolesSecurityBehavior(List roles)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -57,7 +57,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(SecurityConstraintsAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(SecurityConstraintsAction.class);
public SecurityConstraintsAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
import java.util.Map;
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.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -55,7 +55,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected static final Log log = LogFactory.getLog(SecurityPermissionAction.class);
+ protected static final Logger log = LoggerFactory.getLogger(SecurityPermissionAction.class);
protected PermissionManager pm = null;
public SecurityPermissionAction(String template,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -52,7 +52,7 @@
extends BaseSiteUpdateAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(UpdateFolderAction.class);
+ protected Logger log = LoggerFactory.getLogger(UpdateFolderAction.class);
public UpdateFolderAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -52,7 +52,7 @@
extends BaseSiteUpdateAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(UpdateLinkAction.class);
+ protected Logger log = LoggerFactory.getLogger(UpdateLinkAction.class);
public UpdateLinkAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -60,7 +60,7 @@
extends BaseSiteUpdateAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(UpdatePageAction.class);
+ protected Logger log = LoggerFactory.getLogger(UpdatePageAction.class);
public UpdatePageAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,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.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.i18n.CurrentLocale;
@@ -47,7 +47,7 @@
*/
public class LocalizationValveImpl extends AbstractValve implements LocalizationValve
{
- private static final Log log = LogFactory.getLog(LocalizationValveImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(LocalizationValveImpl.class);
private Locale defaultLocale = null;
public LocalizationValveImpl() {}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/localization/impl/SimplifiedLocalizationValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/localization/impl/SimplifiedLocalizationValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/localization/impl/SimplifiedLocalizationValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/localization/impl/SimplifiedLocalizationValveImpl.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.Enumeration;
import java.util.Locale;
-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.i18n.CurrentLocale;
import org.apache.jetspeed.pipeline.PipelineException;
@@ -37,7 +37,7 @@
*/
public class SimplifiedLocalizationValveImpl extends AbstractValve implements LocalizationValve
{
- private static final Log log = LogFactory.getLog(LocalizationValveImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(LocalizationValveImpl.class);
private Locale defaultLocale = null;
public SimplifiedLocalizationValveImpl() {}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/LoginServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/LoginServlet.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/LoginServlet.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/LoginServlet.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,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.engine.Engine;
@@ -42,7 +42,7 @@
*/
public class LoginServlet extends HttpServlet
{
- private static final Log log = LogFactory.getLog(LoginServlet.class);
+ private static final Logger log = LoggerFactory.getLogger(LoginServlet.class);
public void doGet(HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org