You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2009/04/21 21:26:03 UTC
svn commit: r767264 [1/2] - in /portals/pluto/trunk: ./ pluto-container/
pluto-container/src/main/java/org/apache/pluto/container/impl/
pluto-container/src/main/java/org/apache/pluto/container/util/
pluto-portal-driver-impl/ pluto-portal-driver-impl/sr...
Author: ate
Date: Tue Apr 21 19:26:01 2009
New Revision: 767264
URL: http://svn.apache.org/viewvc?rev=767264&view=rev
Log:
PLUTO-553: commons-logging unsuited for cross-context webapplication invocation usage - migrating to slf4j
See: https://issues.apache.org/jira/browse/PLUTO-553
Modified:
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerServiceImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletWindowStateAnchorTag.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-site/src/main/appended-resources/supplemental-models.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestUtils.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/AbstractReflectivePortletTest.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRenderParameterTest.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRequestTest.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceCommonTest.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceInActionTest.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/RenderResponseNoContentTypeTest.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SessionTimeoutTest.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/filter/BaseFilter.java
portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AbstractArchiveAssembler.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/ByteArrayAssemblySink.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/EarAssembler.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/FileAssemblySink.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/JarStreamingAssembly.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java
portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ArchiveBasedAssemblyTest.java
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Tue Apr 21 19:26:01 2009
@@ -45,20 +45,10 @@
<!-- Other Support Libraries =========================================== -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Specification Libraries =========================================== -->
@@ -80,12 +70,6 @@
<artifactId>jaxb-api</artifactId>
<version>${jaxb.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -96,15 +80,15 @@
</dependency>
<dependency>
<groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax.api.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>${stax.impl.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- CCPP Libraries -->
@@ -117,6 +101,12 @@
<!-- Testing Libraries ================================================= -->
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java Tue Apr 21 19:26:01 2009
@@ -16,8 +16,8 @@
*/
package org.apache.pluto.container.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.ContainerServices;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
@@ -34,7 +34,7 @@
public class PortletContainerFactory {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletContainerFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletContainerFactory.class);
/** Singleton instance of the <code>PortletContainerFactory</code>. */
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java Tue Apr 21 19:26:01 2009
@@ -33,8 +33,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.pluto.container.ContainerServices;
import org.apache.pluto.container.FilterManager;
import org.apache.pluto.container.PortletActionResponseContext;
@@ -62,7 +62,7 @@
{
/** Internal logger. */
- private static final Log LOG = LogFactory.getLog(PortletContainerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletContainerImpl.class);
// Private Member Variables ------------------------------------------------
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java Tue Apr 21 19:26:01 2009
@@ -29,8 +29,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.pluto.container.ContainerInfo;
import org.apache.pluto.container.RequestDispatcherPathInfoProvider;
import org.apache.pluto.container.impl.PortletRequestDispatcherImpl;
@@ -47,7 +47,7 @@
/**
* Logger.
*/
- private static final Log LOG = LogFactory.getLog(PortletContextImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletContextImpl.class);
// Private Member Variables ------------------------------------------------
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java Tue Apr 21 19:26:01 2009
@@ -29,8 +29,8 @@
import javax.portlet.ReadOnlyException;
import javax.portlet.ValidatorException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.PortletPreference;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
@@ -49,7 +49,7 @@
public class PortletPreferencesImpl implements PortletPreferences {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletPreferencesImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletPreferencesImpl.class);
private static final StringManager EXCEPTIONS = StringManager.getManager(
PortletPreferencesImpl.class.getPackage().getName());
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java Tue Apr 21 19:26:01 2009
@@ -35,8 +35,8 @@
import javax.servlet.http.HttpServletResponseWrapper;
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.pluto.container.PortletInvokerService;
import org.apache.pluto.container.PortletRequestContext;
import org.apache.pluto.container.RequestDispatcherPathInfo;
@@ -50,7 +50,7 @@
public class PortletRequestDispatcherImpl implements PortletRequestDispatcher, RequestDispatcher
{
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletRequestDispatcherImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletRequestDispatcherImpl.class);
// Private Member Variables ------------------------------------------------
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java Tue Apr 21 19:26:01 2009
@@ -40,8 +40,8 @@
import javax.servlet.http.HttpServletRequest;
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.pluto.container.ContainerServices;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletEntity;
@@ -66,7 +66,7 @@
{
public static final String ACCEPT_LANGUAGE = "Accept-Language";
- private static final Log LOG = LogFactory.getLog(PortletRequestImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletRequestImpl.class);
private static final StringManager EXCEPTIONS =
StringManager.getManager(PortletRequestImpl.class.getPackage().getName());
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java Tue Apr 21 19:26:01 2009
@@ -28,8 +28,8 @@
import javax.portlet.PortletSessionUtil;
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.pluto.container.PortletWindow;
import org.apache.pluto.container.util.ArgumentUtility;
@@ -40,7 +40,7 @@
public class PortletSessionImpl implements PortletSession {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletSessionImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletSessionImpl.class);
/** The default scope (<code>PORTLET_SCOPE</code>) for storing objects. */
protected static final int DEFAULT_SCOPE = PortletSession.PORTLET_SCOPE;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java Tue Apr 21 19:26:01 2009
@@ -16,8 +16,8 @@
*/
package org.apache.pluto.container.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Static class that provides utility static methods for argument validation.
@@ -26,7 +26,7 @@
public class ArgumentUtility {
/** Logger. */
- public static final Log LOG = LogFactory.getLog(ArgumentUtility.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ArgumentUtility.class);
// Static Utility Methods --------------------------------------------------
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java Tue Apr 21 19:26:01 2009
@@ -25,12 +25,12 @@
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ClasspathScanner {
- private static final Log LOG = LogFactory.getLog(ClasspathScanner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClasspathScanner.class);
/**
* Retrieve a lit of all urls matching the specified
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java Tue Apr 21 19:26:01 2009
@@ -22,8 +22,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An internationalization / localization helper class which reduces the bother
@@ -43,7 +43,7 @@
*/
public class StringManager {
- private static final Log LOG = LogFactory.getLog(StringManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StringManager.class);
/**
* The ResourceBundle for this StringManager.
Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Tue Apr 21 19:26:01 2009
@@ -59,13 +59,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commons-logging.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${commons-digester.version}</version>
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java Tue Apr 21 19:26:01 2009
@@ -31,8 +31,8 @@
import javax.servlet.http.HttpServletResponse;
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.pluto.container.EventCoordinationService;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
@@ -56,7 +56,7 @@
public class EventCoordinationServiceImpl implements EventCoordinationService
{
/** Logger. */
- private static final Log LOG = LogFactory.getLog(EventCoordinationServiceImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EventCoordinationServiceImpl.class);
private static final long WAITING_CYCLE = 100;
@@ -122,7 +122,7 @@
try {
Thread.sleep(WAITING_CYCLE);
} catch (InterruptedException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
}
}
waitForEventExecution(threadGroup);
@@ -191,7 +191,7 @@
}
}
} catch (PortletContainerException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
}
}
@@ -254,7 +254,7 @@
try {
portletWindowThread.join();
} catch (InterruptedException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
}
portletWindowThreads.remove(portletWindowThread);
portletWindowThread = new PortletWindowThread(threadGroup, config.getId(),
@@ -278,7 +278,7 @@
}
Thread.sleep(WAITING_CYCLE);
} catch (InterruptedException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
}
}
}
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java Tue Apr 21 19:26:01 2009
@@ -29,8 +29,8 @@
import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.EventProvider;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.PortletWindow;
@@ -46,7 +46,7 @@
public class EventProviderImpl implements EventProvider
{
/** Logger. */
- private static final Log LOG = LogFactory.getLog(EventProviderImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EventProviderImpl.class);
private PortletWindow portletWindow;
private PortletRegistryService portletRegistry;
@@ -101,7 +101,7 @@
}
catch (FactoryConfigurationError e)
{
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
}
}
return null;
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerServiceImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerServiceImpl.java Tue Apr 21 19:26:01 2009
@@ -21,8 +21,8 @@
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.pluto.container.PortletURLListenerService;
import org.apache.pluto.container.om.portlet.Listener;
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
@@ -30,7 +30,7 @@
public class PortletURLListenerServiceImpl implements PortletURLListenerService
{
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletURLListenerServiceImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletURLListenerServiceImpl.class);
public List<PortletURLGenerationListener> getPortletURLGenerationListeners(PortletApplicationDefinition app)
{
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java Tue Apr 21 19:26:01 2009
@@ -36,8 +36,8 @@
import javax.xml.stream.XMLStreamException;
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.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.PortletWindow;
@@ -48,7 +48,7 @@
public class PortletWindowThread extends Thread {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletWindowThread.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletWindowThread.class);
private PortletContainer container;
@@ -132,11 +132,11 @@
container.doEvent(portletWindow, request, response, event);
// }
} catch (PortletException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
} catch (IOException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
} catch (PortletContainerException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
}
}
}
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java Tue Apr 21 19:26:01 2009
@@ -21,8 +21,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.pluto.driver.config.DriverConfigurationException;
import org.apache.pluto.driver.services.portal.PropertyConfigService;
@@ -36,8 +36,8 @@
public class PropertyConfigServiceImpl implements
PropertyConfigService {
- private static final Log LOG =
- LogFactory.getLog(PropertyConfigServiceImpl.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(PropertyConfigServiceImpl.class);
private ResourceConfig config;
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java Tue Apr 21 19:26:01 2009
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.driver.services.portal.RenderConfig;
/**
@@ -33,8 +33,8 @@
public class ResourceConfig {
/** Internal Logger. */
- private static final Log LOG =
- LogFactory.getLog(ResourceConfig.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ResourceConfig.class);
/** The name of the portal. */
private String portalName;
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java Tue Apr 21 19:26:01 2009
@@ -20,8 +20,8 @@
import java.io.InputStream;
import org.apache.commons.digester.Digester;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.RenderConfig;
import org.xml.sax.SAXException;
@@ -32,7 +32,7 @@
*/
public class ResourceConfigReader {
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
ResourceConfigReader.class
);
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java Tue Apr 21 19:26:01 2009
@@ -24,8 +24,8 @@
import javax.portlet.PortletMode;
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.pluto.container.PortletContainerException;
import org.apache.pluto.container.driver.PlutoServices;
import org.apache.pluto.container.driver.PortletContextService;
@@ -53,7 +53,7 @@
public class SupportedModesServiceImpl implements SupportedModesService
{
/** Logger */
- private static final Log LOG = LogFactory.getLog(SupportedModesServiceImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SupportedModesServiceImpl.class);
/** PortletMode objects supported by the portal */
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java Tue Apr 21 19:26:01 2009
@@ -24,8 +24,8 @@
import javax.portlet.WindowState;
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.pluto.container.PortletContainerException;
import org.apache.pluto.container.driver.PlutoServices;
import org.apache.pluto.container.driver.PortletRegistryService;
@@ -41,7 +41,7 @@
{
/** Logger **/
- private static final Log LOG = LogFactory.getLog(SupportedWindowStateServiceImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SupportedWindowStateServiceImpl.class);
/**
* Servlet context used to get a handle on the portlet container
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java Tue Apr 21 19:26:01 2009
@@ -27,8 +27,8 @@
import javax.portlet.WindowState;
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.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.url.PortalURLParameter;
import org.apache.pluto.driver.url.PortalURLParser;
@@ -40,7 +40,7 @@
public class PortalURLParserImpl implements PortalURLParser {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortalURLParserImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortalURLParserImpl.class);
/** The singleton parser instance. */
private static final PortalURLParser PARSER = new PortalURLParserImpl();
@@ -424,7 +424,7 @@
if (currentValue != null)
currentValue = URLEncoder.encode(values[i], "UTF-8");
} catch (UnsupportedEncodingException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
}
buffer.append(currentValue != null ? currentValue : "");
if (i + 1 < values.length) {
@@ -501,7 +501,7 @@
try {
paramValues[i] = URLDecoder.decode(paramValues[i], "UTF-8");
} catch (UnsupportedEncodingException e) {
- LOG.warn(e);
+ LOG.warn(e.getMessage(),e);
}
}
// Construct portal URL parameter and return.
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/RelativePortalURLImpl.java Tue Apr 21 19:26:01 2009
@@ -26,8 +26,8 @@
import javax.portlet.WindowState;
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.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.services.portal.PageConfig;
@@ -41,7 +41,7 @@
*/
public class RelativePortalURLImpl implements PortalURL {
- private static final Log LOG = LogFactory.getLog(RelativePortalURLImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RelativePortalURLImpl.class);
private String urlBase;
private String servletPath;
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Tue Apr 21 19:26:01 2009
@@ -58,18 +58,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${commons-digester.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>${portlet-api.version}</version>
@@ -150,6 +138,12 @@
<!-- Testing Libraries ================================================= -->
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java Tue Apr 21 19:26:01 2009
@@ -16,8 +16,8 @@
*/
package org.apache.pluto.driver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.driver.core.PortalRequestContext;
@@ -50,7 +50,7 @@
/**
* Internal Logger.
*/
- private static final Log LOG = LogFactory.getLog(PortalDriverFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortalDriverFilter.class);
/**
* The Portal Driver sServlet Context
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Tue Apr 21 19:26:01 2009
@@ -26,8 +26,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.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.driver.core.PortalRequestContext;
@@ -46,7 +46,7 @@
public class PortalDriverServlet extends HttpServlet {
/** Internal Logger. */
- private static final Log LOG = LogFactory.getLog(PortalDriverServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortalDriverServlet.class);
/** The Portal Driver sServlet Context */
private ServletContext servletContext = null;
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java Tue Apr 21 19:26:01 2009
@@ -20,8 +20,8 @@
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.driver.PortalDriverServices;
@@ -54,7 +54,7 @@
/**
* Internal logger.
*/
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
PortalStartupListener.class);
/**
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java Tue Apr 21 19:26:01 2009
@@ -24,8 +24,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.pluto.container.PortletContainer;
import org.apache.pluto.driver.config.AdminConfiguration;
import org.apache.pluto.driver.services.portal.PageConfig;
@@ -39,7 +39,7 @@
public class TCKDriverServlet extends PortalDriverServlet {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(TCKDriverServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TCKDriverServlet.class);
private int pageCounter = 0;
@@ -143,4 +143,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java Tue Apr 21 19:26:01 2009
@@ -21,8 +21,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Central location for Configuration info.
@@ -31,8 +31,8 @@
*/
public class Configuration {
- private static final Log LOG =
- LogFactory.getLog(Configuration.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(Configuration.class);
public static final ResourceBundle BUNDLE =
ResourceBundle.getBundle("org.apache.pluto.driver.container.pluto-configuration");
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java Tue Apr 21 19:26:01 2009
@@ -21,13 +21,13 @@
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DefaultApplicationIdResolver implements ApplicationIdResolver {
- private static final Log LOG = LogFactory.getLog(DefaultApplicationIdResolver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultApplicationIdResolver.class);
private static final String WEB_XML = "/WEB-INF/web.xml";
private static final String JNDI_PREFIX = "jndi:/";
@@ -63,4 +63,4 @@
public int getAuthority() {
return DEFAULT;
}
-}
\ No newline at end of file
+}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java Tue Apr 21 19:26:01 2009
@@ -34,8 +34,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.pluto.container.FilterManager;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.PortletInvokerService;
@@ -55,7 +55,7 @@
/**
* Logger.
*/
- private static final Log LOG = LogFactory.getLog(DefaultPortletInvokerService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultPortletInvokerService.class);
/**
* Exception Messages.
@@ -279,4 +279,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java Tue Apr 21 19:26:01 2009
@@ -24,8 +24,8 @@
import javax.portlet.PreferencesValidator;
import javax.portlet.ValidatorException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.PortletPreference;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.PortletPreferencesService;
@@ -48,7 +48,7 @@
implements PortletPreferencesService {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
DefaultPortletPreferencesService.class);
@@ -257,4 +257,4 @@
return validator;
}
-}
\ No newline at end of file
+}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java Tue Apr 21 19:26:01 2009
@@ -21,15 +21,15 @@
import javax.portlet.PortletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.driver.DriverPortletConfig;
import org.apache.pluto.container.impl.AbstractPortletConfigImpl;
import org.apache.pluto.container.om.portlet.PortletDefinition;
public class DriverPortletConfigImpl extends AbstractPortletConfigImpl implements DriverPortletConfig {
- private static final Log LOG = LogFactory.getLog(DriverPortletConfigImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DriverPortletConfigImpl.class);
protected ResourceBundleFactory bundles;
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java Tue Apr 21 19:26:01 2009
@@ -28,8 +28,8 @@
import javax.servlet.ServletConfig;
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.pluto.container.PortletContainerException;
import org.apache.pluto.container.PortletWindow;
import org.apache.pluto.container.driver.DriverPortletConfig;
@@ -52,9 +52,9 @@
public class PortletContextManager implements PortletRegistryService, PortletContextService {
/**
- * Log Instance
+ * Logger Instance
*/
- private static final Log LOG = LogFactory.getLog(PortletContextManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletContextManager.class);
/**
* The PortletContext cache map: key is servlet context, and value is the
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java Tue Apr 21 19:26:01 2009
@@ -22,8 +22,8 @@
import java.util.MissingResourceException;
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.pluto.container.om.portlet.PortletDefinition;
import org.apache.pluto.container.om.portlet.PortletInfo;
import org.apache.pluto.container.util.StringManager;
@@ -35,8 +35,8 @@
*/
class ResourceBundleFactory {
- private static final Log LOG =
- LogFactory.getLog(ResourceBundleFactory.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ResourceBundleFactory.class);
private static final StringManager EXCEPTIONS =
StringManager.getManager(ResourceBundleFactory.class.getPackage().getName());
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java Tue Apr 21 19:26:01 2009
@@ -20,8 +20,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.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.url.PortalURL;
@@ -39,7 +39,7 @@
public class PortalRequestContext {
/** Internal Logger. */
- private static final Log LOG = LogFactory.getLog(PortalRequestContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortalRequestContext.class);
/**
* The attribute key to bind the portal environment instance to servlet
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java Tue Apr 21 19:26:01 2009
@@ -19,8 +19,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.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.PortletEntity;
@@ -36,7 +36,7 @@
public class PortletWindowImpl implements PortletWindow {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletWindowImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletWindowImpl.class);
// Private Member Variables ------------------------------------------------
@@ -103,4 +103,4 @@
public PortletEntity getPortletEntity() {
return entity;
}
-}
\ No newline at end of file
+}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java Tue Apr 21 19:26:01 2009
@@ -21,15 +21,15 @@
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.pluto.container.PortletWindow;
import org.apache.pluto.container.ResourceURLProvider;
public class ResourceURLProviderImpl implements ResourceURLProvider {
- private static final Log LOG =
- LogFactory.getLog(ResourceURLProviderImpl.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ResourceURLProviderImpl.class);
private String stringUrl = "";
private String base = "";
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java Tue Apr 21 19:26:01 2009
@@ -29,8 +29,8 @@
import javax.portlet.RenderResponse;
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.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.PortalDriverServlet;
import org.apache.pluto.driver.config.DriverConfiguration;
@@ -41,7 +41,7 @@
public class PageAdminPortlet extends GenericPlutoPortlet {
- private static final Log LOG = LogFactory.getLog(PageAdminPortlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PageAdminPortlet.class);
private static final String JSP_DIR = "/WEB-INF/fragments/admin/page/";
private static final String VIEW_PAGE = JSP_DIR + "view.jsp";
private static final String EDIT_PAGE = JSP_DIR + "edit.jsp";
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java Tue Apr 21 19:26:01 2009
@@ -22,14 +22,14 @@
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;
/**
*/
public class RenderConfig {
- private static final Log LOG =
- LogFactory.getLog(RenderConfig.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(RenderConfig.class);
private Map pages;
private String defaultPageId;
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java Tue Apr 21 19:26:01 2009
@@ -26,8 +26,8 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.core.PortalRequestContext;
@@ -45,7 +45,7 @@
public class PortletModeAnchorTag extends BodyTagSupport {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletModeAnchorTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletModeAnchorTag.class);
// Private Member Variables ------------------------------------------------
@@ -171,4 +171,4 @@
}
-}
\ No newline at end of file
+}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java Tue Apr 21 19:26:01 2009
@@ -32,8 +32,8 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.PortletWindow;
@@ -58,7 +58,7 @@
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletModeDropDownTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletModeDropDownTag.class);
// Private Member Variables ------------------------------------------------
@@ -250,4 +250,4 @@
return decorationName;
}
-}
\ No newline at end of file
+}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java Tue Apr 21 19:26:01 2009
@@ -26,8 +26,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletWindow;
import org.apache.pluto.driver.AttributeKeys;
@@ -48,7 +48,7 @@
public class PortletTag extends BodyTagSupport {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletTag.class);
/** Status constant for failed rendering. */
public static final int FAILED = 0;
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletWindowStateAnchorTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletWindowStateAnchorTag.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletWindowStateAnchorTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletWindowStateAnchorTag.java Tue Apr 21 19:26:01 2009
@@ -26,8 +26,8 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.core.PortalRequestContext;
@@ -44,7 +44,7 @@
public class PortletWindowStateAnchorTag extends BodyTagSupport {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletWindowStateAnchorTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletWindowStateAnchorTag.class);
// Private Member Variables ------------------------------------------------
@@ -180,4 +180,4 @@
}
-}
\ No newline at end of file
+}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java Tue Apr 21 19:26:01 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;
/**
* A class encapsulating access to portlet mode and windowstate tooltips.
@@ -34,7 +34,7 @@
class ToolTips
{
private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("ToolTips");
- private static final Log LOG = LogFactory.getLog(ToolTips.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ToolTips.class);
static final ToolTips MAXIMIZE = new ToolTips(BUNDLE.getString("tooltip.windowstate.maximized"));
static final ToolTips MINIMIZE = new ToolTips(BUNDLE.getString("tooltip.windowstate.minimized"));
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Tue Apr 21 19:26:01 2009
@@ -35,9 +35,9 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
@@ -70,18 +70,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
</exclusions>
</dependency>
Modified: portals/pluto/trunk/pluto-site/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/main/appended-resources/supplemental-models.xml?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-site/src/main/appended-resources/supplemental-models.xml (original)
+++ portals/pluto/trunk/pluto-site/src/main/appended-resources/supplemental-models.xml Tue Apr 21 19:26:01 2009
@@ -55,42 +55,6 @@
</supplement>
<supplement>
<project>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- <name>Apache Avalon Framework</name>
- <url>http://avalon.apache.org/</url>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <name>Apache Commons Logging</name>
- <url>http://jakarta.apache.org/commons/logging/</url>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <name>Apache Commons Logging API</name>
- <url>http://jakarta.apache.org/commons/logging/</url>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<name>Apache Commons Beanutils</name>
@@ -147,30 +111,6 @@
</supplement>
<supplement>
<project>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <name>Apache Avalon Logkit</name>
- <url>http://avalon.apache.org/</url>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- <name>The Castor Project</name>
- <url>http://www.castor.org/</url>
- <organization>
- <name>The Codehaus</name>
- <url>http://www.codehaus.org/</url>
- </organization>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<name>Apache log4j Project</name>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Tue Apr 21 19:26:01 2009
@@ -61,28 +61,18 @@
<artifactId>commons-digester</artifactId>
<version>${commons-digester.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commons-logging.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java Tue Apr 21 19:26:01 2009
@@ -40,8 +40,8 @@
import javax.portlet.ResourceResponse;
import javax.portlet.StateAwareResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Pluto testsuite's test portlet.
@@ -53,7 +53,7 @@
public class TestPortlet extends GenericPortlet {
/** Internal logger. */
- private static final Log LOG = LogFactory.getLog(TestPortlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestPortlet.class);
// Private Member Variables ------------------------------------------------
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestUtils.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestUtils.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestUtils.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestUtils.java Tue Apr 21 19:26:01 2009
@@ -16,8 +16,8 @@
*/
package org.apache.pluto.testsuite;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Static class that provides utility methods for Pluto testsuite.
@@ -26,7 +26,7 @@
public class TestUtils {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(TestUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestUtils.class);
// Private Constructor -----------------------------------------------------
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/AbstractReflectivePortletTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/AbstractReflectivePortletTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/AbstractReflectivePortletTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/AbstractReflectivePortletTest.java Tue Apr 21 19:26:01 2009
@@ -32,8 +32,8 @@
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.pluto.testsuite.PortletTest;
import org.apache.pluto.testsuite.TestConfig;
import org.apache.pluto.testsuite.TestResult;
@@ -46,7 +46,7 @@
public abstract class AbstractReflectivePortletTest implements PortletTest {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
AbstractReflectivePortletTest.class);
private Map<String, String> initParameters;
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRenderParameterTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRenderParameterTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRenderParameterTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRenderParameterTest.java Tue Apr 21 19:26:01 2009
@@ -32,8 +32,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.pluto.testsuite.TestResult;
import org.apache.pluto.testsuite.TestUtils;
@@ -46,7 +46,7 @@
extends AbstractReflectivePortletTest {
/** Internal logger. */
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
DispatcherRenderParameterTest.class);
// Static Final Constants --------------------------------------------------
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRequestTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRequestTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRequestTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRequestTest.java Tue Apr 21 19:26:01 2009
@@ -30,15 +30,15 @@
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.pluto.testsuite.TestResult;
import org.apache.pluto.testsuite.TestUtils;
public class DispatcherRequestTest extends AbstractReflectivePortletTest {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(DispatcherRequestTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DispatcherRequestTest.class);
/** The path to the companion servlet. */
private static final String SERVLET_PATH = "/test/DispatcherRequestTest_Servlet";
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceCommonTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceCommonTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceCommonTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceCommonTest.java Tue Apr 21 19:26:01 2009
@@ -23,8 +23,8 @@
import javax.portlet.PortletRequest;
import javax.portlet.ReadOnlyException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.testsuite.TestResult;
import org.apache.pluto.testsuite.TestUtils;
@@ -34,7 +34,7 @@
public class PreferenceCommonTest extends AbstractReflectivePortletTest {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PreferenceCommonTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PreferenceCommonTest.class);
protected static final String BOGUS_KEY = "org.apache.pluto.testsuite.BOGUS_KEY";