Author: musachy
Date: Sun Sep 27 18:41:02 2009
New Revision: 819369
URL: http://svn.apache.org/viewvc?rev=819369&view=rev
Log:
Remove references to commons-logging
Modified:
struts/struts2/trunk/plugins/embeddedjsp/pom.xml
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
Modified: struts/struts2/trunk/plugins/embeddedjsp/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/pom.xml?rev=819369&r1=819368&r2=819369&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/embeddedjsp/pom.xml (original)
+++ struts/struts2/trunk/plugins/embeddedjsp/pom.xml Sun Sep 27 18:41:02 2009
@@ -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>
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java?rev=819369&r1=819368&r2=819369&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
(original)
+++
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
Sun Sep 27 18:41:02 2009
@@ -20,7 +20,6 @@
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 @@
rootCause.printStackTrace();
}
throw je;
- } finally {
- if (loader != null) {
- LogFactory.release(loader);
- }
}
}
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java?rev=819369&r1=819368&r2=819369&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
(original)
+++
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
Sun Sep 27 18:41:02 2009
@@ -28,6 +28,8 @@
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 @@
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);
}
