You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/09/11 19:49:48 UTC
svn commit: r813952 - /tomcat/trunk/extras.xml
Author: markt
Date: Fri Sep 11 17:49:48 2009
New Revision: 813952
URL: http://svn.apache.org/viewvc?rev=813952&view=rev
Log:
Create a single embedded logging jar for log4j that just replaces the juli logging jar
Modified:
tomcat/trunk/extras.xml
Modified: tomcat/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=813952&r1=813951&r2=813952&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Fri Sep 11 17:49:48 2009
@@ -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. -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org