svn commit: r771535 - in /portals/applications/gems/trunk: pom.xml src/main/java/org/apache/portals/gems/util/HttpBufferedResponse.java

[ate]

Author: ate
Date: Tue May  5 03:27:00 2009
New Revision: 771535

URL: http://svn.apache.org/viewvc?rev=771535&view=rev
Log:
JS2-972: commons-logging unsuited for cross-context webapplication invocation 
usage - migrating to slf4j
- cleaning out last commons-logging usage
- cleaning up dependencies

Modified:
    portals/applications/gems/trunk/pom.xml
    
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/util/HttpBufferedResponse.java

Modified: portals/applications/gems/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/portals/applications/gems/trunk/pom.xml?rev=771535&r1=771534&r2=771535&view=diff
==============================================================================
--- portals/applications/gems/trunk/pom.xml (original)
+++ portals/applications/gems/trunk/pom.xml Tue May  5 03:27:00 2009
@@ -41,8 +41,8 @@
     <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.common.version>1.0.4</org.apache.portals.bridges.common.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>
     <slf4j.version>1.5.6</slf4j.version>
@@ -73,6 +73,18 @@
     </dependency>
     <dependency>
       <groupId>org.apache.portals.bridges</groupId>
+      <artifactId>portals-bridges-common</artifactId>
+      <version>${org.apache.portals.bridges.common.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.bridges</groupId>
       <artifactId>portals-bridges-velocity</artifactId>
       <version>${org.apache.portals.bridges.velocity.version}</version>
        <exclusions>
@@ -93,19 +105,15 @@
       <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>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

Modified: 
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/util/HttpBufferedResponse.java
URL: 
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/util/HttpBufferedResponse.java?rev=771535&r1=771534&r2=771535&view=diff
==============================================================================
--- 
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/util/HttpBufferedResponse.java
 (original)
+++ 
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/util/HttpBufferedResponse.java
 Tue May  5 03:27:00 2009
@@ -20,8 +20,9 @@
 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;
 
@@ -30,8 +31,7 @@
     private boolean usingWriter;
     private boolean usingStream;
 
-    /** Commons logging */
-    protected final static Log log = 
LogFactory.getLog(HttpBufferedResponse.class);
+    protected Logger log = LoggerFactory.getLogger( HttpBufferedResponse.class 
);
 
     private ServletOutputStream wrappedStream;
     private PrintWriter writer;