Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to commons-logging

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@819369 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Musachy Barroso
2009-09-27 18:41:02 +00:00
parent c182a130c5
commit 136bd8f6ca
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/embeddedjsp/pom.xml
+13 -11
View File
@@ -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>
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
-5
View File
@@ -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);
}
}
}
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
+3 -1
View File
@@ -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);
}