Author: vkumar
Date: Sun May 3 15:34:43 2009
New Revision: 771067
URL: http://svn.apache.org/viewvc?rev=771067&view=rev
Log:
Migrating to slf4j in apa-gems
See: http://issues.apache.org/jira/browse/JS2-97
Modified:
portals/applications/gems/trunk/pom.xml
portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/BrowserPortlet.java
portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/DatabaseBrowserIterator.java
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/SWFHeader.java
Modified: portals/applications/gems/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/pom.xml?rev=771067&r1=771066&r2=771067&view=diff
==============================================================================
--- portals/applications/gems/trunk/pom.xml (original)
+++ portals/applications/gems/trunk/pom.xml Sun May 3 15:34:43 2009
@@ -38,13 +38,14 @@
<description>Reusable Portlets (Gems) for your Portlet
Applications.</description>
<properties>
+ <javax.servlet.version>2.4</javax.servlet.version>
<portlet-api.version>2.0</portlet-api.version>
<velocity.version>1.5</velocity.version>
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
<commons-dbcp.version>1.2.2</commons-dbcp.version>
<commons-httpclient.version>3.0.1</commons-httpclient.version>
<commons-lang.version>2.1</commons-lang.version>
- <commons-logging.version>1.1</commons-logging.version>
+ <slf4j.version>1.5.6</slf4j.version>
<spring.version>2.5.6</spring.version>
</properties>
@@ -60,6 +61,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ </dependency>
+ <dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
@@ -68,6 +74,12 @@
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-velocity</artifactId>
<version>${org.apache.portals.bridges.velocity.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -75,11 +87,21 @@
<version>${commons-lang.version}</version>
</dependency>
<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>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${commons-httpclient.version}</version>
@@ -88,11 +110,23 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/BrowserPortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/BrowserPortlet.java?rev=771067&r1=771066&r2=771067&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/BrowserPortlet.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/BrowserPortlet.java
Sun May 3 15:34:43 2009
@@ -34,11 +34,11 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
import org.apache.portals.messaging.PortletMessaging;
import org.apache.velocity.context.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* AbstractBrowserPortlet
@@ -98,7 +98,7 @@
/**
* Static initialization of the logger for this class
*/
- protected Log log = LogFactory.getLog(BrowserPortlet.class);
+ protected Logger log = LoggerFactory.getLogger(BrowserPortlet.class);
public void init(PortletConfig config) throws PortletException
{
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/DatabaseBrowserIterator.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/DatabaseBrowserIterator.java?rev=771067&r1=771066&r2=771067&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/DatabaseBrowserIterator.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/applications/gems/browser/DatabaseBrowserIterator.java
Sun May 3 15:34:43 2009
@@ -20,8 +20,8 @@
import java.util.Collections;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A class for iterating over the window. The window constitutes the selection
@@ -37,7 +37,7 @@
/**
* Static initialization of the logger for this class
*/
- transient protected Log log =
LogFactory.getLog(DatabaseBrowserIterator.class);
+ transient protected Logger log =
LoggerFactory.getLogger(DatabaseBrowserIterator.class);
private static final String VELOCITY_NULL_ENTRY = "-";
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java?rev=771067&r1=771066&r2=771067&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
Sun May 3 15:34:43 2009
@@ -26,8 +26,8 @@
import javax.portlet.RenderResponse;
import org.apache.commons.lang.ObjectUtils;
-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.web.portlet.DispatcherPortlet;
@@ -44,7 +44,7 @@
/*
* Class specific logger.
*/
- private final static Log log =
LogFactory.getLog(DojoSpringMVCPortlet.class);
+ private final static Logger log =
LoggerFactory.getLogger(DojoSpringMVCPortlet.class);
protected static final String CRLF = "\r\n";
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java?rev=771067&r1=771066&r2=771067&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java
Sun May 3 15:34:43 2009
@@ -33,14 +33,14 @@
import javax.portlet.RenderResponse;
import javax.portlet.WindowState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
import org.apache.portals.gems.util.JSONUtils;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FlashPortlet extends GenericVelocityPortlet
{
@@ -92,7 +92,7 @@
public static final String IS_DESKTOP = "IS_DESKTOP";
- protected Log log = LogFactory.getLog( FlashPortlet.class );
+ protected Logger log = LoggerFactory.getLogger( FlashPortlet.class );
protected String viewPage = null;
protected String editPage = null;
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/SWFHeader.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/SWFHeader.java?rev=771067&r1=771066&r2=771067&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/SWFHeader.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/SWFHeader.java
Sun May 3 15:34:43 2009
@@ -10,11 +10,15 @@
*/
package org.apache.portals.gems.flash;
-import java.io.*;
-import java.util.zip.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -23,7 +27,7 @@
*/
public class SWFHeader
{
- protected Log log = LogFactory.getLog( SWFHeader.class );
+ protected Logger log = LoggerFactory.getLogger( SWFHeader.class );
public static final String COMPRESSED = "compressed";
public static final String UNCOMPRESSED = "uncompressed";
