Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

309765 renamed JSP logging 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1552 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-04-22 22:16:21 +00:00
parent 463b275cb7
commit 338143d02f
6 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-aggregate/jetty-all-server/pom.xml
View File

@ -21,7 +21,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includes>META-INF/**,org/eclipse/**,com/sun/org/apache/commons/logging/impl/JettyLog.class</includes>
<includes>META-INF/**,org/eclipse/**</includes>
<excludes>**/MANIFEST.MF,javax/**</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>

2
jetty-aggregate/jetty-all/pom.xml
View File

@ -21,7 +21,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includes>META-INF/**,org/eclipse/**,com/sun/org/apache/commons/logging/impl/JettyLog.class</includes>
<includes>META-INF/**,org/eclipse/**</includes>
<excludes>**/MANIFEST.MF,javax/**</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>

2
jetty-aggregate/jetty-webapp/pom.xml
View File

@ -21,7 +21,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includes>META-INF/**,org/eclipse/**,com/sun/org/apache/commons/logging/impl/JettyLog.class</includes>
<includes>META-INF/**,org/eclipse/**</includes>
<excludes>**/MANIFEST.MF,javax/**</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>

19
jetty-jsp-2.1/pom.xml
View File

@ -14,25 +14,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Import-Package>!com.sun.appserv.*,!com.sun.common.util.*,!com.sun.el.*,!com.sun.enterprise.web.*,!com.sun.org.apache.commons.*,!org.apache.jasper.*,*</Import-Package>
<Fragment-Host>org.mortbay.jetty.jsp-2.1-glassfish</Fragment-Host>
</instructions>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!--
Required for OSGI

17
jetty-jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java → jetty-jsp-2.1/src/main/java/org/eclipse/jetty/jsp/JettyLog.java
View File

@ -11,9 +11,10 @@
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
package com.sun.org.apache.commons.logging.impl;
package org.eclipse.jetty.jsp;
import com.sun.org.apache.commons.logging.Log;
import com.sun.org.apache.commons.logging.LogFactory;
/**
* Log
@ -23,9 +24,23 @@ import com.sun.org.apache.commons.logging.Log;
**/
public class JettyLog implements Log
{
private static boolean __initialized=false;
private String _name;
private org.eclipse.jetty.util.log.Logger _logger;
public static void init()
{
synchronized (JettyLog.class)
{
if (!__initialized)
{
__initialized=true;
LogFactory.setLogImplClassName(JettyLog.class.getName());
}
}
}
/**
*
*/

16
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlProcessor.java
View File

@ -14,6 +14,7 @@
package org.eclipse.jetty.webapp;
import java.io.File;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.EventListener;
@ -654,6 +655,21 @@ public class WebXmlProcessor
_hasJSP = false;
_jspServletClass = servlet_class = "org.eclipse.jetty.servlet.NoJspServlet";
}
// set the JSP log
try
{
Class<?> logFactory = Loader.loadClass(this.getClass(),"org.eclipse.jetty.jsp.JettyLog");
Method init = logFactory.getMethod("init");
Log.debug("Init JSP loggging "+init);
init.invoke(null);
}
catch (Exception e)
{
Log.warn(e.toString());
Log.ignore(e);
}
if (holder.getInitParameter("scratchdir") == null)
{
File tmp = _context.getTempDirectory();