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 [2/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...
Copied: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JLoggerToolsLogger.java (from r767408, portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/CommonsLogToolsLogger.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JLoggerToolsLogger.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JLoggerToolsLogger.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/CommonsLogToolsLogger.java&r1=767408&r2=767444&rev=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/CommonsLogToolsLogger.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JLoggerToolsLogger.java Wed Apr 22 10:08:53 2009
@@ -16,21 +16,26 @@
*/
package org.apache.jetspeed.components.util;
-import org.apache.commons.logging.Log;
+import java.text.MessageFormat;
+
+import org.slf4j.helpers.MessageFormatter;
+import org.slf4j.helpers.MarkerIgnoringBase;
import org.apache.jetspeed.tools.ToolsLogger;
/**
- * Commons Log wrapper of a ToolsLogger allowing plugging in other logging implementations
- * like Maven Log logger to be used as Commons Log logger
+ * SLF4J Logger wrapper of a ToolsLogger allowing plugging in other logging implementations
+ * like Maven Logger logger to be used as a SLF4J logger
*
* @version $Id$
*
*/
-public class CommonsLogToolsLogger implements Log
+public class Slf4JLoggerToolsLogger extends MarkerIgnoringBase
{
+ private static final long serialVersionUID = 3184831685009180480L;
+
ToolsLogger toolsLogger;
- public CommonsLogToolsLogger(ToolsLogger toolsLogger)
+ public Slf4JLoggerToolsLogger(ToolsLogger toolsLogger)
{
this.toolsLogger = toolsLogger;
}
@@ -178,4 +183,134 @@
{
toolsLogger.warn(message.toString(),t);
}
+
+ public void debug(String arg0)
+ {
+ toolsLogger.debug(arg0);
+ }
+
+ public void debug(String arg0, Object arg1)
+ {
+ toolsLogger.debug(MessageFormatter.format(arg0, arg1));
+ }
+
+ public void debug(String arg0, Object[] arg1)
+ {
+ toolsLogger.debug(MessageFormatter.format(arg0, arg1));
+ }
+
+ public void debug(String arg0, Throwable arg1)
+ {
+ toolsLogger.debug(arg0, arg1);
+ }
+
+ public void debug(String arg0, Object arg1, Object arg2)
+ {
+ toolsLogger.debug(MessageFormatter.format(arg0, arg1, arg2));
+ }
+
+ public void error(String arg0)
+ {
+ toolsLogger.error(arg0);
+ }
+
+ public void error(String arg0, Object arg1)
+ {
+ toolsLogger.error(MessageFormatter.format(arg0, arg1));
+ }
+
+ public void error(String arg0, Object[] arg1)
+ {
+ toolsLogger.error(MessageFormatter.format(arg0, arg1));
+ }
+
+ public void error(String arg0, Throwable arg1)
+ {
+ toolsLogger.error(arg0, arg1);
+ }
+
+ public void error(String arg0, Object arg1, Object arg2)
+ {
+ toolsLogger.error(MessageFormatter.format(arg0, arg1, arg2));
+ }
+
+ public String getName()
+ {
+ return toolsLogger.toString();
+ }
+
+ public void info(String arg0)
+ {
+ toolsLogger.info(arg0);
+ }
+
+ public void info(String arg0, Object arg1)
+ {
+ toolsLogger.info(MessageFormatter.format(arg0, arg1));
+ }
+
+ public void info(String arg0, Object[] arg1)
+ {
+ toolsLogger.info(MessageFormatter.format(arg0, arg1));
+ }
+
+ public void info(String arg0, Throwable arg1)
+ {
+ toolsLogger.info(arg0, arg1);
+ }
+
+ public void info(String arg0, Object arg1, Object arg2)
+ {
+ toolsLogger.info(MessageFormatter.format(arg0, arg1, arg2));
+ }
+
+ public void trace(String arg0)
+ {
+ toolsLogger.debug(arg0);
+ }
+
+ public void trace(String arg0, Object arg1)
+ {
+ toolsLogger.debug(MessageFormat.format(arg0, arg1));
+ }
+
+ public void trace(String arg0, Object[] arg1)
+ {
+ toolsLogger.debug(MessageFormat.format(arg0, arg1));
+ }
+
+ public void trace(String arg0, Throwable arg1)
+ {
+ toolsLogger.debug(arg0, arg1);
+ }
+
+ public void trace(String arg0, Object arg1, Object arg2)
+ {
+ toolsLogger.debug(MessageFormat.format(arg0, arg1, arg2));
+ }
+
+ public void warn(String arg0)
+ {
+ toolsLogger.warn(arg0);
+ }
+
+ public void warn(String arg0, Object arg1)
+ {
+ toolsLogger.warn(MessageFormatter.format(arg0, arg1));
+ }
+
+ public void warn(String arg0, Object[] arg1)
+ {
+ toolsLogger.warn(MessageFormatter.format(arg0, arg1));
+ }
+
+ public void warn(String arg0, Throwable arg1)
+ {
+ toolsLogger.warn(arg0, arg1);
+ }
+
+ public void warn(String arg0, Object arg1, Object arg2)
+ {
+ toolsLogger.warn(MessageFormatter.format(arg0, arg1));
+ }
}
Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JLoggerToolsLogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JLoggerToolsLogger.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JLoggerToolsLogger.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JToolsLogger.java (from r767408, portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/CommonsToolsLogger.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JToolsLogger.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JToolsLogger.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/CommonsToolsLogger.java&r1=767408&r2=767444&rev=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/CommonsToolsLogger.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JToolsLogger.java Wed Apr 22 10:08:53 2009
@@ -17,20 +17,20 @@
package org.apache.jetspeed.components.util;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.jetspeed.tools.ToolsLogger;
/**
- * ToolsLogger wrapper of a Commons Log
+ * ToolsLogger wrapper of a SLF4J Logger
*
* @version $Id$
*
*/
-public class CommonsToolsLogger implements ToolsLogger
+public class Slf4JToolsLogger implements ToolsLogger
{
- private Log log;
+ private Logger log;
- public CommonsToolsLogger(Log log)
+ public Slf4JToolsLogger(Logger log)
{
this.log = log;
}
@@ -40,7 +40,7 @@
*/
public void debug(CharSequence content)
{
- log.debug(content);
+ log.debug(content.toString());
}
/* (non-Javadoc)
@@ -48,7 +48,7 @@
*/
public void debug(CharSequence content, Throwable error)
{
- log.debug(content, error);
+ log.debug(content.toString(), error);
}
/* (non-Javadoc)
@@ -56,7 +56,7 @@
*/
public void debug(Throwable error)
{
- log.debug(error);
+ log.debug(error.getMessage(),error);
}
/* (non-Javadoc)
@@ -64,7 +64,7 @@
*/
public void error(CharSequence content)
{
- log.error(content);
+ log.error(content.toString());
}
/* (non-Javadoc)
@@ -72,7 +72,7 @@
*/
public void error(CharSequence content, Throwable error)
{
- log.error(content,error);
+ log.error(content.toString(),error);
}
/* (non-Javadoc)
@@ -80,7 +80,7 @@
*/
public void error(Throwable error)
{
- log.error(error);
+ log.error(error.getMessage(),error);
}
/* (non-Javadoc)
@@ -88,7 +88,7 @@
*/
public void info(CharSequence content)
{
- log.info(content);
+ log.info(content.toString());
}
/* (non-Javadoc)
@@ -96,7 +96,7 @@
*/
public void info(CharSequence content, Throwable error)
{
- log.info(content,error);
+ log.info(content.toString(),error);
}
/* (non-Javadoc)
@@ -104,7 +104,7 @@
*/
public void info(Throwable error)
{
- log.info(error);
+ log.info(error.getMessage(),error);
}
/* (non-Javadoc)
@@ -120,7 +120,7 @@
*/
public boolean isErrorEnabled()
{
- return log.isErrorEnabled() || log.isFatalEnabled();
+ return log.isErrorEnabled();
}
/* (non-Javadoc)
@@ -144,7 +144,7 @@
*/
public void warn(CharSequence content)
{
- log.warn(content);
+ log.warn(content.toString());
}
/* (non-Javadoc)
@@ -152,7 +152,7 @@
*/
public void warn(CharSequence content, Throwable error)
{
- log.warn(content,error);
+ log.warn(content.toString(),error);
}
/* (non-Javadoc)
@@ -160,7 +160,6 @@
*/
public void warn(Throwable error)
{
- log.warn(error);
+ log.warn(error.getMessage(),error);
}
-
}
Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JToolsLogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JToolsLogger.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/util/Slf4JToolsLogger.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java Wed Apr 22 10:08:53 2009
@@ -34,8 +34,8 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.oro.text.GlobCompiler;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.PatternCompiler;
@@ -47,7 +47,7 @@
@SuppressWarnings("deprecation")
public class ResourceLocatingServletContext extends BaseMockServletContext
{
- protected final static Log log = LogFactory.getLog(ResourceLocatingServletContext.class);
+ protected final static Logger log = LoggerFactory.getLogger(ResourceLocatingServletContext.class);
private final File rootPath;
private final Map pathOverrides = new HashMap();
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/db/serializer/JetspeedSerializerApplicationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/db/serializer/JetspeedSerializerApplicationImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/db/serializer/JetspeedSerializerApplicationImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/db/serializer/JetspeedSerializerApplicationImpl.java Wed Apr 22 10:08:53 2009
@@ -23,11 +23,11 @@
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;
import org.apache.jetspeed.components.JetspeedBeanDefinitionFilter;
import org.apache.jetspeed.components.SpringComponentManager;
-import org.apache.jetspeed.components.util.CommonsLogToolsLogger;
+import org.apache.jetspeed.components.util.Slf4JLoggerToolsLogger;
import org.apache.jetspeed.serializer.JetspeedSerializer;
import org.apache.jetspeed.serializer.JetspeedSerializerApplication;
import org.apache.jetspeed.serializer.SerializerException;
@@ -41,7 +41,7 @@
*/
public class JetspeedSerializerApplicationImpl implements JetspeedSerializerApplication
{
- private static final Log logger = LogFactory.getLog(JetspeedSerializerApplicationImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(JetspeedSerializerApplicationImpl.class);
public static void main(String[] args) throws Exception
{
@@ -144,11 +144,11 @@
public void importFiles(ToolsLogger logger, String applicationRootPath, String categories, String filterPropertiesFileName, Properties initProperties, String[] seedFiles) throws SerializerException
{
- importFiles(new CommonsLogToolsLogger(logger), applicationRootPath, categories, filterPropertiesFileName, initProperties, seedFiles);
+ importFiles(new Slf4JLoggerToolsLogger(logger), applicationRootPath, categories, filterPropertiesFileName, initProperties, seedFiles);
}
- public void importFiles(Log logger, String applicationRootPath, String categories, String filterPropertiesFileName, Properties initProperties, String[] seedFiles) throws SerializerException
+ public void importFiles(Logger logger, String applicationRootPath, String categories, String filterPropertiesFileName, Properties initProperties, String[] seedFiles) throws SerializerException
{
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
SpringComponentManager scm = null;
@@ -193,7 +193,7 @@
catch (Exception e)
{
e.printStackTrace();
- logger.error(e);
+ logger.error(e.getMessage(),e);
if (e instanceof SerializerException)
{
throw (SerializerException)e;
@@ -212,10 +212,10 @@
public void export(ToolsLogger logger, String applicationRootPath, String categories, String filterPropertiesFileName, Properties initProperties, String exportFile, String exportName) throws SerializerException
{
- export(new CommonsLogToolsLogger(logger), applicationRootPath, categories, filterPropertiesFileName, initProperties, exportFile, exportName);
+ export(new Slf4JLoggerToolsLogger(logger), applicationRootPath, categories, filterPropertiesFileName, initProperties, exportFile, exportName);
}
- public void export(Log logger, String applicationRootPath, String categories, String filterPropertiesFileName, Properties initProperties, String exportFile, String exportName) throws SerializerException
+ public void export(Logger logger, String applicationRootPath, String categories, String filterPropertiesFileName, Properties initProperties, String exportFile, String exportName) throws SerializerException
{
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
SpringComponentManager scm = null;
@@ -265,7 +265,7 @@
{
throw (SerializerException)e;
}
- logger.error(e);
+ logger.error(e.getMessage(),e);
throw new SerializerException(SerializerException.EXPORT_ERROR.create(e.getMessage()));
}
finally
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java Wed Apr 22 10:08:53 2009
@@ -22,10 +22,10 @@
import java.net.URLClassLoader;
import java.util.Properties;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.components.JetspeedBeanDefinitionFilter;
import org.apache.jetspeed.components.SpringComponentManager;
-import org.apache.jetspeed.components.util.CommonsToolsLogger;
+import org.apache.jetspeed.components.util.Slf4JToolsLogger;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.page.JetspeedPageSerializerApplication;
import org.apache.jetspeed.page.PageSerializer;
@@ -40,7 +40,7 @@
*/
public class JetspeedPageSerializerApplicationImpl implements JetspeedPageSerializerApplication
{
- private static final ToolsLogger logger = new CommonsToolsLogger(LogFactory.getLog(JetspeedPageSerializerApplicationImpl.class));
+ private static final ToolsLogger logger = new Slf4JToolsLogger(LoggerFactory.getLogger(JetspeedPageSerializerApplicationImpl.class));
public static void main(String[] args) throws Exception
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/test/java/org/apache/jetspeed/tools/db/serializer/TestJetspeedSerializerApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/test/java/org/apache/jetspeed/tools/db/serializer/TestJetspeedSerializerApplication.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/test/java/org/apache/jetspeed/tools/db/serializer/TestJetspeedSerializerApplication.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/test/java/org/apache/jetspeed/tools/db/serializer/TestJetspeedSerializerApplication.java Wed Apr 22 10:08:53 2009
@@ -17,8 +17,8 @@
package org.apache.jetspeed.tools.db.serializer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.test.JetspeedTestCase;
/**
@@ -27,7 +27,7 @@
*/
public class TestJetspeedSerializerApplication extends JetspeedTestCase
{
- private static Log logger = LogFactory.getLog(TestJetspeedSerializerApplication.class);
+ private static Logger logger = LoggerFactory.getLogger(TestJetspeedSerializerApplication.class);
public void testSerializer() throws Exception
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/test/java/org/apache/jetspeed/tools/page/serializer/TestJetspeedPageSerializerApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/test/java/org/apache/jetspeed/tools/page/serializer/TestJetspeedPageSerializerApplication.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/test/java/org/apache/jetspeed/tools/page/serializer/TestJetspeedPageSerializerApplication.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/src/test/java/org/apache/jetspeed/tools/page/serializer/TestJetspeedPageSerializerApplication.java Wed Apr 22 10:08:53 2009
@@ -20,8 +20,8 @@
import java.io.File;
import java.util.Properties;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.components.util.CommonsToolsLogger;
+import org.slf4j.LoggerFactory;
+import org.apache.jetspeed.components.util.Slf4JToolsLogger;
import org.apache.jetspeed.page.JetspeedPageSerializerApplication;
import org.apache.jetspeed.test.JetspeedTestCase;
import org.apache.jetspeed.tools.ToolsLogger;
@@ -32,7 +32,7 @@
*/
public class TestJetspeedPageSerializerApplication extends JetspeedTestCase
{
- private static ToolsLogger logger = new CommonsToolsLogger(LogFactory.getLog(TestJetspeedPageSerializerApplication.class));
+ private static ToolsLogger logger = new Slf4JToolsLogger(LoggerFactory.getLogger(TestJetspeedPageSerializerApplication.class));
public void testSerializer() throws Exception
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml Wed Apr 22 10:08:53 2009
@@ -46,8 +46,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/src/main/java/org/apache/jetspeed/cache/file/FileCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/src/main/java/org/apache/jetspeed/cache/file/FileCache.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/src/main/java/org/apache/jetspeed/cache/file/FileCache.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/src/main/java/org/apache/jetspeed/cache/file/FileCache.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,8 @@
import java.io.File;
import java.io.FileNotFoundException;
-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.cache.JetspeedCacheEventListener;
@@ -48,7 +48,7 @@
private JetspeedCache cache = null;
private Map<FileCacheEventListener,JetspeedCacheEventListener> listeners = new Hashtable<FileCacheEventListener,JetspeedCacheEventListener>();
- private final static Log log = LogFactory.getLog(FileCache.class);
+ private final static Logger log = LoggerFactory.getLogger(FileCache.class);
/**
* Set cache
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml Wed Apr 22 10:08:53 2009
@@ -50,12 +50,8 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/src/main/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/src/main/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/src/main/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/src/main/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-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.url.BasePortalURL;
import org.apache.jetspeed.headerresource.HeaderResource;
@@ -43,7 +43,7 @@
*/
public class HeaderResourceImpl implements HeaderResource
{
- protected final static Log log = LogFactory.getLog( HeaderResourceImpl.class );
+ protected final static Logger log = LoggerFactory.getLogger( HeaderResourceImpl.class );
protected final static String EOL = "\r\n"; // html eol
protected final static String UNNAMED_CONTENT_HEADER_NAME = "org.apache.jetspeed.headerresource.unnamed";
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml Wed Apr 22 10:08:53 2009
@@ -46,8 +46,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/src/main/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/src/main/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/src/main/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/src/main/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Simple implementation of the IdGeneratorService.
@@ -30,7 +30,7 @@
*/
public class JetspeedIdGenerator implements IdGenerator
{
- private final static Log log = LogFactory.getLog(JetspeedIdGenerator.class);
+ private final static Logger log = LoggerFactory.getLogger(JetspeedIdGenerator.class);
// default configuration values
private final static long DEFAULT_CONFIG_COUNTER_START = 0x10000;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml Wed Apr 22 10:08:53 2009
@@ -54,8 +54,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java Wed Apr 22 10:08:53 2009
@@ -33,8 +33,8 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
@@ -75,7 +75,7 @@
/** Commons logging */
- protected final static Log log = LogFactory.getLog(LayoutPortlet.class);
+ protected final static Logger log = LoggerFactory.getLogger(LayoutPortlet.class);
protected PortletRegistry registry;
protected PageManager pageManager;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java Wed Apr 22 10:08:53 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.jetspeed.CommonPortletServices;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.cache.JetspeedContentCache;
@@ -55,7 +55,7 @@
public class MultiColumnPortlet extends LayoutPortlet
{
/** Commons logging */
- protected final static Log log = LogFactory.getLog(MultiColumnPortlet.class);
+ protected final static Logger log = LoggerFactory.getLogger(MultiColumnPortlet.class);
protected final static String PARAM_NUM_COLUMN = "columns";
protected final static int DEFAULT_NUM_COLUMN = 2;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml Wed Apr 22 10:08:53 2009
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,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;
/**
* Jetspeed's default implementation of a template locator.
@@ -36,7 +36,7 @@
*/
public class JetspeedTemplateLocator implements TemplateLocator
{
- private final static Log log = LogFactory.getLog(JetspeedTemplateLocator.class);
+ private final static Logger log = LoggerFactory.getLogger(JetspeedTemplateLocator.class);
private static final String PATH_SEPARATOR = "/";
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml Wed Apr 22 10:08:53 2009
@@ -85,8 +85,8 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,8 @@
import java.util.List;
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.JetspeedActions;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.folder.Folder;
@@ -70,7 +70,7 @@
private FolderHandler folderHandler;
private int reservedType = RESERVED_FOLDER_NONE;
- private static final Log log = LogFactory.getLog(FolderImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(FolderImpl.class);
private static PermissionFactory pf;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
import java.util.ListIterator;
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.aggregator.PortletContent;
import org.apache.jetspeed.decoration.Decoration;
import org.apache.jetspeed.om.common.SecurityConstraint;
@@ -39,7 +39,7 @@
private StringBuffer overridenContent;
private PortletContent portletContent;
private List contentFragments;
- private static final Log log = LogFactory.getLog(ContentFragmentImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(ContentFragmentImpl.class);
private final Map cachedFragments;
private Decoration decoration;
private boolean instantlyRendered;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java Wed Apr 22 10:08:53 2009
@@ -27,8 +27,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.JetspeedActions;
import org.apache.jetspeed.om.common.SecuredResource;
import org.apache.jetspeed.om.common.SecurityConstraint;
@@ -53,7 +53,7 @@
*/
public abstract class AbstractBaseElement implements java.io.Serializable, SecuredResource
{
- private final static Log log = LogFactory.getLog(AbstractBaseElement.class);
+ private final static Logger log = LoggerFactory.getLogger(AbstractBaseElement.class);
private String id = null;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.om.page.SecurityConstraintImpl;
@@ -41,7 +41,7 @@
*/
public class SecurityConstraintsImpl implements SecurityConstraints
{
- private final static Log log = LogFactory.getLog(SecurityConstraintsImpl.class);
+ private final static Logger log = LoggerFactory.getLogger(SecurityConstraintsImpl.class);
private String owner;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.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.om.common.SecurityConstraint;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.folder.Folder;
@@ -55,7 +55,7 @@
public abstract class AbstractPageManager
implements PageManager
{
- private final static Log log = LogFactory.getLog(AbstractPageManager.class);
+ private final static Logger log = LoggerFactory.getLogger(AbstractPageManager.class);
private final static String FOLDER_NODE_TYPE = "folder";
private final static String PAGE_NODE_TYPE = "page";
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.folder.FolderNotFoundException;
@@ -43,7 +43,7 @@
*/
public class PageManagerUtils
{
- protected static Log log = LogFactory.getLog(PageManagerUtils.class);
+ protected static Logger log = LoggerFactory.getLogger(PageManagerUtils.class);
/**
* Creates a user's home page from the roles of the current user.
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java Wed Apr 22 10:08:53 2009
@@ -30,8 +30,8 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-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.file.FileCache;
import org.apache.jetspeed.cache.file.FileCacheEntry;
@@ -83,7 +83,7 @@
*/
public class CastorFileSystemDocumentHandler implements org.apache.jetspeed.page.document.DocumentHandler, FileCacheEventListener
{
- private final static Log log = LogFactory.getLog(CastorFileSystemDocumentHandler.class);
+ private final static Logger log = LoggerFactory.getLogger(CastorFileSystemDocumentHandler.class);
private final static String PSML_DOCUMENT_ENCODING = "UTF-8";
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,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.cache.file.FileCache;
import org.apache.jetspeed.cache.file.FileCacheEntry;
import org.apache.jetspeed.cache.file.FileCacheEventListener;
@@ -67,7 +67,7 @@
private DocumentHandler metadataDocHandler;
private DocumentHandlerFactory handlerFactory;
- private final static Log log = LogFactory.getLog(FileSystemFolderHandler.class);
+ private final static Logger log = LoggerFactory.getLogger(FileSystemFolderHandler.class);
protected static final FilenameFilter FOLDER_FILTER = new FilenameFilter()
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,8 @@
import java.util.Collection;
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.ojb.broker.util.collections.RemovalAwareCollection;
import org.apache.ojb.broker.util.collections.RemovalAwareList;
@@ -33,7 +33,7 @@
*/
public class DatabasePageManagerUtils
{
- protected static Log log = LogFactory.getLog(DatabasePageManagerUtils.class);
+ protected static Logger log = LoggerFactory.getLogger(DatabasePageManagerUtils.class);
/**
* OJB 1.0.3 requires collections to be removal aware.
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java Wed Apr 22 10:08:53 2009
@@ -22,8 +22,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.JetspeedActions;
import org.apache.jetspeed.cache.file.FileCache;
import org.apache.jetspeed.cache.file.FileCacheEntry;
@@ -80,7 +80,7 @@
*/
public class CastorXmlPageManager extends AbstractPageManager implements PageManager, FileCacheEventListener
{
- private final static Log log = LogFactory.getLog(CastorXmlPageManager.class);
+ private final static Logger log = LoggerFactory.getLogger(CastorXmlPageManager.class);
private static Map modelClasses = new HashMap();
static
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java Wed Apr 22 10:08:53 2009
@@ -21,8 +21,8 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.administration.PortalConfigurationConstants;
import org.apache.jetspeed.components.util.ConfigurationProperties;
import org.apache.jetspeed.exception.JetspeedException;
@@ -47,7 +47,7 @@
*/
public class JetspeedUserTemplateSerializer extends AbstractJetspeedComponentSerializer
{
- private final static Log log = LogFactory.getLog(JetspeedUserTemplateSerializer.class);
+ private final static Logger log = LoggerFactory.getLogger(JetspeedUserTemplateSerializer.class);
private PageManager pageManager;
private UserManager userManager;
private String adminUserName = null;
@@ -65,7 +65,7 @@
* @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processExport(org.apache.jetspeed.serializer.objects.JSSnapshot,
* java.util.Map, org.apache.commons.logging.Log)
*/
- protected void processExport(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+ protected void processExport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
{
if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_TEMPLATES))
{
@@ -79,7 +79,7 @@
* @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processImport(org.apache.jetspeed.serializer.objects.JSSnapshot,
* java.util.Map, org.apache.commons.logging.Log)
*/
- protected void processImport(JSSnapshot snapshot, Map settings, Log log) throws SerializerException
+ protected void processImport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
{
if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_TEMPLATES))
{
@@ -127,7 +127,7 @@
}
}
- protected void deleteData(Map settings, Log log) throws SerializerException
+ protected void deleteData(Map settings, Logger log) throws SerializerException
{
if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_TEMPLATES))
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/util/interceptors/MethodReplayInterceptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/util/interceptors/MethodReplayInterceptor.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/util/interceptors/MethodReplayInterceptor.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/util/interceptors/MethodReplayInterceptor.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Generic aspect that will attempt to replay a method invocation if one of a
@@ -30,8 +30,8 @@
public class MethodReplayInterceptor implements MethodInterceptor
{
- /** Log reference */
- private Log log = LogFactory.getLog(MethodReplayInterceptor.class);
+ /** Logger reference */
+ private Logger log = LoggerFactory.getLogger(MethodReplayInterceptor.class);
/** Serialization version identifier */
private static final long serialVersionUID = -1316279974504594833L;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/DatabasePageManagerServer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/DatabasePageManagerServer.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/DatabasePageManagerServer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/DatabasePageManagerServer.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,8 @@
import org.apache.commons.jexl.JexlHelper;
import org.apache.commons.jexl.Script;
import org.apache.commons.jexl.ScriptFactory;
-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.JetspeedBeanDefinitionFilter;
import org.apache.jetspeed.components.SpringComponentManager;
import org.apache.jetspeed.components.jndi.JetspeedTestJNDIComponent;
@@ -39,7 +39,7 @@
*/
public class DatabasePageManagerServer
{
- protected static Log log = LogFactory.getLog(DatabasePageManagerServer.class);
+ protected static Logger log = LoggerFactory.getLogger(DatabasePageManagerServer.class);
// Constants
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java Wed Apr 22 10:08:53 2009
@@ -33,8 +33,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-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.impl.EhCacheConfigResource;
/**
@@ -45,7 +45,7 @@
*/
public class TestDatabasePageManagerCache extends TestCase
{
- protected static Log log = LogFactory.getLog(TestDatabasePageManagerCache.class);
+ protected static Logger log = LoggerFactory.getLogger(TestDatabasePageManagerCache.class);
// Members
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml Wed Apr 22 10:08:53 2009
@@ -51,8 +51,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java Wed Apr 22 10:08:53 2009
@@ -31,8 +31,8 @@
import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionEvent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.PageManager;
@@ -77,7 +77,7 @@
/**
* log - logging instance
*/
- private final static Log log = LogFactory.getLog(PortalSiteSessionContextImpl.class);
+ private final static Logger log = LoggerFactory.getLogger(PortalSiteSessionContextImpl.class);
/**
* pageManager - PageManager component
@@ -787,7 +787,7 @@
debug.append("null");
}
debug.append(")");
- log.debug(debug);
+ log.debug(debug.toString());
}
// return valid
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Wed Apr 22 10:08:53 2009
@@ -91,14 +91,6 @@
<artifactId>portals-bridges-velocity</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -111,10 +103,6 @@
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -163,6 +151,14 @@
<artifactId>commonj-twm</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
@@ -206,11 +202,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-webapp-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>
@@ -245,11 +236,6 @@
</dependency>
<!-- defining optional dependencies which are included transitively so their exclusions (defined in the root pom) are honored -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java Wed Apr 22 10:08:53 2009
@@ -30,8 +30,8 @@
import javax.portlet.PortletResponse;
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.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.exception.JetspeedException;
@@ -72,7 +72,7 @@
public class PortalAdministrationImpl implements PortalAdministration
{
- private final static Log log = LogFactory.getLog(PortalAdministrationImpl.class);
+ private final static Logger log = LoggerFactory.getLogger(PortalAdministrationImpl.class);
/** administration services */
protected Configuration config;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java Wed Apr 22 10:08:53 2009
@@ -20,8 +20,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.PageAggregator;
import org.apache.jetspeed.aggregator.PortletAccessDeniedException;
@@ -46,7 +46,7 @@
*/
public class AsyncPageAggregatorImpl extends BaseAggregatorImpl implements PageAggregator
{
- protected final static Log log = LogFactory.getLog(AsyncPageAggregatorImpl.class);
+ protected final static Logger log = LoggerFactory.getLogger(AsyncPageAggregatorImpl.class);
public AsyncPageAggregatorImpl(PortletRenderer renderer)
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/BaseAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/BaseAggregatorImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/BaseAggregatorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/BaseAggregatorImpl.java Wed Apr 22 10:08:53 2009
@@ -18,8 +18,8 @@
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.aggregator.PortletRenderer;
@@ -37,7 +37,7 @@
*/
public abstract class BaseAggregatorImpl
{
- private final static Log log = LogFactory.getLog(BaseAggregatorImpl.class);
+ private final static Logger log = LoggerFactory.getLogger(BaseAggregatorImpl.class);
protected PortletRenderer renderer;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/CommonjWorkerMonitorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/CommonjWorkerMonitorImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/CommonjWorkerMonitorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/CommonjWorkerMonitorImpl.java Wed Apr 22 10:08:53 2009
@@ -26,8 +26,8 @@
import java.util.Map;
import java.util.HashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.aggregator.RenderingJob;
import org.apache.jetspeed.aggregator.Worker;
import org.apache.jetspeed.aggregator.WorkerMonitor;
@@ -85,7 +85,7 @@
}
/** Commons logging */
- protected final static Log log = LogFactory.getLog(CommonjWorkerMonitorImpl.class);
+ protected final static Logger log = LoggerFactory.getLogger(CommonjWorkerMonitorImpl.class);
/** Renering Job Timeout monitor */
protected CommonjWorkerRenderingJobTimeoutMonitor jobMonitor = null;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java Wed Apr 22 10:08:53 2009
@@ -24,8 +24,9 @@
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.PortalReservedParameters;
import org.apache.jetspeed.aggregator.PageAggregator;
import org.apache.jetspeed.container.url.BasePortalURL;
@@ -49,7 +50,7 @@
*/
public class HeaderAggregatorImpl implements PageAggregator
{
- protected final static Log log = LogFactory.getLog( HeaderAggregatorImpl.class );
+ protected final static Logger log = LoggerFactory.getLogger( HeaderAggregatorImpl.class );
protected final static String EOL = "\r\n"; // html eol
private PortletFactory factory;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java Wed Apr 22 10:08:53 2009
@@ -20,8 +20,8 @@
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import org.apache.pluto.container.util.PrintWriterServletOutputStream;
@@ -32,7 +32,7 @@
private boolean usingStream;
/** Commons logging */
- protected final static Log log = LogFactory.getLog(HttpBufferedResponse.class);
+ protected final static Logger log = LoggerFactory.getLogger(HttpBufferedResponse.class);
private ServletOutputStream wrappedStream;
private PrintWriter writer;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.PortletAccessDeniedException;
@@ -61,7 +61,7 @@
*/
public class PortletRendererImpl implements PortletRenderer
{
- protected final static Log log = LogFactory.getLog(PortletRendererImpl.class);
+ protected final static Logger log = LoggerFactory.getLogger(PortletRendererImpl.class);
protected WorkerMonitor workMonitor;
protected PortletContainer container;
@@ -168,7 +168,7 @@
catch (Exception e)
{
fragment.overrideRenderedContent(e.getLocalizedMessage());
- log.error(e);
+ log.error(e.getMessage(),e);
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.aggregator.PortletTrackingManager;
@@ -52,7 +52,7 @@
public class RenderingJobImpl implements RenderingJob
{
/** Commons logging */
- protected final static Log log = LogFactory.getLog(RenderingJobImpl.class);
+ protected final static Logger log = LoggerFactory.getLogger(RenderingJobImpl.class);
/** WorkerMonitor used to flush the queue */
protected PortletWindow window = null;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.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.aggregator.RenderingJob;
import org.apache.jetspeed.aggregator.Worker;
import org.apache.jetspeed.aggregator.WorkerMonitor;
@@ -41,7 +41,7 @@
public class WorkerImpl extends Thread implements Worker
{
/** Commons logging */
- protected final static Log log = LogFactory.getLog(WorkerImpl.class);
+ protected final static Logger log = LoggerFactory.getLogger(WorkerImpl.class);
/** Running status of this worker */
private boolean running = true;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java Wed Apr 22 10:08:53 2009
@@ -25,8 +25,8 @@
import java.util.LinkedList;
import java.util.Collections;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.aggregator.RenderingJob;
import org.apache.jetspeed.aggregator.WorkerMonitor;
import org.apache.jetspeed.aggregator.PortletContent;
@@ -60,7 +60,7 @@
}
/** Commons logging */
- protected final static Log log = LogFactory.getLog(WorkerMonitorImpl.class);
+ protected final static Logger log = LoggerFactory.getLogger(WorkerMonitorImpl.class);
/** Static counters for identifying workers */
protected static long sCount = 0;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java Wed Apr 22 10:08:53 2009
@@ -29,8 +29,8 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.layout.impl.Constants;
import org.apache.jetspeed.request.RequestContext;
import org.apache.velocity.VelocityContext;
@@ -64,7 +64,7 @@
protected static final String URL_PARAMETER_NAME = "action";
/** Logger */
- protected Log log = LogFactory.getLog(AjaxRequestServiceImpl.class);
+ protected Logger log = LoggerFactory.getLogger(AjaxRequestServiceImpl.class);
// Objects that are available to execution. These objects must
// implement either the Action interface or the Builder interface
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java Wed Apr 22 10:08:53 2009
@@ -19,8 +19,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.capabilities.Capabilities;
import org.apache.jetspeed.capabilities.CapabilityMap;
@@ -40,7 +40,7 @@
public class CapabilityCustomizerValveImpl extends AbstractValve
{
- private static final Log log = LogFactory.getLog(CapabilityCustomizerValveImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(CapabilityCustomizerValveImpl.class);
private Capabilities capabilities;
private Map clientToMediaTypeMap;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java Wed Apr 22 10:08:53 2009
@@ -17,8 +17,8 @@
package org.apache.jetspeed.capabilities.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.capabilities.Capabilities;
import org.apache.jetspeed.capabilities.CapabilityMap;
import org.apache.jetspeed.capabilities.MediaType;
@@ -37,7 +37,7 @@
*/
public class CapabilityValveImpl implements CapabilityValve
{
- private static final Log log = LogFactory.getLog(CapabilityValveImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(CapabilityValveImpl.class);
String resourceDefault; // the default name for a resource
private Capabilities capabilities;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/cluster/NodeManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/cluster/NodeManagerImpl.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/cluster/NodeManagerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/cluster/NodeManagerImpl.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
import java.io.ObjectOutputStream;
import java.util.HashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -37,7 +37,7 @@
*/
public class NodeManagerImpl implements NodeManager,BeanFactoryAware
{
- protected final static Log log = LogFactory.getLog(NodeManagerImpl.class);
+ protected final static Logger log = LoggerFactory.getLogger(NodeManagerImpl.class);
/**
* added support for bean factory to create profile rules
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java Wed Apr 22 10:08:53 2009
@@ -23,8 +23,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.container.ContainerServices;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
@@ -39,7 +39,7 @@
public class JetspeedPortletContainerWrapper implements PortletContainerWrapper
{
private boolean initialized = false;
- private static final Log log = LogFactory.getLog(JetspeedPortletContainerWrapper.class);
+ private static final Logger log = LoggerFactory.getLogger(JetspeedPortletContainerWrapper.class);
private final PortletContainer pluto;
private final String containerId;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java?rev=767444&r1=767443&r2=767444&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java Wed Apr 22 10:08:53 2009
@@ -16,8 +16,8 @@
*/
package org.apache.jetspeed.container;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -36,7 +36,7 @@
*/
public class PageHistoryValve extends AbstractValve
{
- protected final Log log = LogFactory.getLog(getClass());
+ protected final Logger log = LoggerFactory.getLogger(getClass());
// SessionFullExtendedNavigationalState object needs this.
public static final String REQUEST_CLEAR_PORTLETS_MODE_AND_WINDOWSTATE_KEY = "clearPortletsModeAndWindowState";
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org