From 136bd8f6ca0d49971424073299e747fcccd5841b Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Sun, 27 Sep 2009 18:41:02 +0000
Subject: [PATCH] Remove references to commons-logging

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@819369 13f79535-47bb-0310-9956-ffa450edef68
---
 plugins/embeddedjsp/pom.xml                   | 24 ++++++++++---------
 .../java/org/apache/struts2/jasper/JspC.java  |  5 ----
 .../struts2/jasper/runtime/HttpJspBase.java   |  4 +++-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index e56fc42ee..c316e1a4c 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -21,7 +21,8 @@
  * under the License.
  */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.struts</groupId>
@@ -33,13 +34,14 @@
     <artifactId>struts2-embeddedjsp-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Embedded JSP Plugin</name>
-    
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/</developerConnection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/
+        </developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/embeddedjsp/</url>
     </scm>
-    
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -52,12 +54,6 @@
             <artifactId>spring-test</artifactId>
             <version>2.5.6</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -82,7 +78,7 @@
             <artifactId>request</artifactId>
             <version>1.0.1</version>
             <scope>test</scope>
-        </dependency>     
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
@@ -100,6 +96,12 @@
             <artifactId>commons-el</artifactId>
             <version>1.0</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>taglibs</groupId>
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
index 66c99a6e9..b37f92385 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
@@ -20,7 +20,6 @@ package org.apache.struts2.jasper;
 import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.jasper.compiler.Compiler;
 import org.apache.struts2.jasper.compiler.*;
 import org.apache.struts2.jasper.servlet.JspCServletContext;
@@ -927,10 +926,6 @@ public class JspC implements Options {
                 rootCause.printStackTrace();
             }
             throw je;
-        } finally {
-            if (loader != null) {
-                LogFactory.release(loader);
-            }
         }
     }
 
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
index 95444dc14..ecb9e3640 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
@@ -28,6 +28,8 @@ import javax.servlet.jsp.HttpJspPage;
 import javax.servlet.jsp.JspFactory;
 import java.io.IOException;
 
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
 /**
  * This is the super class of all JSP-generated servlets.
  *
@@ -59,7 +61,7 @@ public abstract class HttpJspBase
                     factory.getClass().getClassLoader().loadClass(basePackage +
                             "servlet.JspServletWrapper");
                 } catch (ClassNotFoundException ex) {
-                    org.apache.commons.logging.LogFactory.getLog(HttpJspBase.class)
+                    LoggerFactory.getLogger(HttpJspBase.class)
                             .error("Jasper JspRuntimeContext preload of class failed: " +
                                     ex.getMessage(), ex);
                 }