Author: kkolinko
Date: Wed Nov 4 15:55:02 2015
New Revision: 1712571
URL: http://svn.apache.org/viewvc?rev=1712571&view=rev
Log:
Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar.
Reported by Benjamin Gandon on the dev list
Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui
It it true that 6.0.44/extras/tomcat-juli-adapters.jar did not include
LogFactoryImpl.class,
but it erroneously included its inner classes - LogFactoryImpl$1, *$2, *$3.
I am aligning <fileset> patterns with Tomcat 7. (Actually Tomcat 7 ones are
used both for .jar and -src.jar, thus they end with * instead of explicit
*.class)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712571&r1=1712570&r2=1712571&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 4 15:55:02 2015
@@ -28,14 +28,7 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar.
- Reported by Benjamin Gandon on the dev list
- Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui
- https://svn.apache.org/r1707054
- - to be applied to extras.xml line 220
- +1: kkolinko, markt
- -1:
-
+None. Tomcat 6 is Commit-Than-Review since 2015-11-02.
PATCHES/ISSUES THAT ARE STALLED:
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1712571&r1=1712570&r2=1712571&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Nov 4 15:55:02 2015
@@ -215,9 +215,9 @@
<jar jarfile="${tomcat-juli-adapters.jar}"
manifest="${tomcat.manifests}/default.manifest" >
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes">
- <include name="org/apache/juli/logging/impl/**.class" />
- <exclude name="org/apache/juli/logging/impl/WeakHashtable*.class" />
- <exclude name="org/apache/juli/logging/impl/LogFactoryImpl.class" />
+ <include name="org/apache/juli/logging/impl/**" />
+ <exclude name="org/apache/juli/logging/impl/WeakHashtable*" />
+ <exclude name="org/apache/juli/logging/impl/LogFactoryImpl*" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1712571&r1=1712570&r2=1712571&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov 4 15:55:02 2015
@@ -112,6 +112,15 @@
</add>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Ensure JULI adapters JAR in Tomcat extras package does not include
+ the LogFactoryImpl[$*] classes. Based on patch provided by
+ Benjamin Gandon. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.44 (jfclere)" rtext="released 2015-05-12">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
