From 338143d02f705e3379b187e4632dae3979db5b8c Mon Sep 17 00:00:00 2001
From: Greg Wilkins <greg@webtide.com>
Date: Thu, 22 Apr 2010 22:16:21 +0000
Subject: [PATCH] 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
---
 jetty-aggregate/jetty-all-server/pom.xml      |  2 +-
 jetty-aggregate/jetty-all/pom.xml             |  2 +-
 jetty-aggregate/jetty-webapp/pom.xml          |  2 +-
 jetty-jsp-2.1/pom.xml                         | 19 -------------------
 .../eclipse/jetty/jsp}/JettyLog.java          | 17 ++++++++++++++++-
 .../eclipse/jetty/webapp/WebXmlProcessor.java | 16 ++++++++++++++++
 6 files changed, 35 insertions(+), 23 deletions(-)
 rename jetty-jsp-2.1/src/main/java/{com/sun/org/apache/commons/logging/impl => org/eclipse/jetty/jsp}/JettyLog.java (86%)

diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index ac52ebdc19b..b3da8a28561 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -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>
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 8e43ae0f95e..b4e2c740549 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -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>
diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml
index d30534a1de8..517ff7db469 100644
--- a/jetty-aggregate/jetty-webapp/pom.xml
+++ b/jetty-aggregate/jetty-webapp/pom.xml
@@ -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>
diff --git a/jetty-jsp-2.1/pom.xml b/jetty-jsp-2.1/pom.xml
index 040cdaca867..934c91d032e 100644
--- a/jetty-jsp-2.1/pom.xml
+++ b/jetty-jsp-2.1/pom.xml
@@ -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
diff --git a/jetty-jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java b/jetty-jsp-2.1/src/main/java/org/eclipse/jetty/jsp/JettyLog.java
similarity index 86%
rename from jetty-jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java
rename to jetty-jsp-2.1/src/main/java/org/eclipse/jetty/jsp/JettyLog.java
index b7b4d68995d..ba49dd26e3c 100644
--- a/jetty-jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java
+++ b/jetty-jsp-2.1/src/main/java/org/eclipse/jetty/jsp/JettyLog.java
@@ -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());
+            }
+        }
+    }
+    
     /**
      * 
      */
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlProcessor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlProcessor.java
index 67af3ecd9f1..6bd7b9e0740 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlProcessor.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlProcessor.java
@@ -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();