From 9e5b2953f98f60eb93d80fba5dbd96cb11a5798d Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 11 Sep 2009 17:49:48 +0000
Subject: [PATCH] Create a single embedded logging jar for log4j that just
 replaces the juli logging jar

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@813952 13f79535-47bb-0310-9956-ffa450edef68
---
 extras.xml | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/extras.xml b/extras.xml
index 588c0b0ed..8c3f66504 100644
--- a/extras.xml
+++ b/extras.xml
@@ -74,7 +74,9 @@
   <property name="catalina-ws.jar" value="${tomcat.extras}/catalina-ws.jar"/>
 
   <property name="catalina-jmx-remote.jar" value="${tomcat.extras}/catalina-jmx-remote.jar"/>
-	
+
+  <property name="tomcat-embed-log4j.jar" value="${tomcat.embed}/tomcat-embed-logging-log4j.jar"/>
+
   <!-- Classpath -->
   <path id="tomcat.classpath">
     <pathelement location="${tomcat.classes}"/>
@@ -82,6 +84,7 @@
 
   <target name="prepare">
     <mkdir dir="${tomcat.extras}"/>
+    <mkdir dir="${tomcat.embed}"/>
   </target>
 
   <target name="clean" description="Delete the default output folders">
@@ -257,6 +260,34 @@
   	      description="Build all extras packages">
   </target>
 
+  <target name="embed" depends="extras"
+  	      description="Embedded packaging for those extras that can use it">
+
+    <jar jarfile="${tomcat-embed-log4j.jar}"
+         manifest="${tomcat.tmp}/default.manifest" >
+      <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
+        <include name="org/apache/juli/logging/*.class" /> 
+        <include name="org/apache/juli/logging/impl/*.class" /> 
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+      <fileset dir="${tomcat.classes}">
+        <include name="org/apache/juli/*" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+      <zipfileset file="res/META-INF/default.notice"
+        fullpath="META-INF/NOTICE" />
+      <zipfileset file="res/META-INF/default.license"
+        fullpath="META-INF/LICENSE" />
+    </jar>
+    <checksum file="${tomcat-embed-log4j.jar}"
+              forceOverwrite="yes" fileext=".md5" />
+
+  </target>
+
   <!-- Download and dependency building -->
   <target name="proxyflags">
     <!-- check proxy parameters. -->
-- 
2.11.0