Author: rjung
Date: Wed Dec 10 18:46:22 2014
New Revision: 1644504
URL: http://svn.apache.org/r1644504
Log:
Revert r1643912 (Log4J Version 2 support for JULI).
Use of ant patch task is problematic on Windows.
Need for JULI integration needs more justification.
Check with upstream commonas logging.
Removed:
tomcat/trunk/res/patches/
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1644504&r1=1644503&r2=1644504&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Dec 10 18:46:22 2014
@@ -92,7 +92,7 @@ base-maven.loc=http://repo.maven.apache.
# - log4j
# - logkit
# - servletapi
-commons-logging.version=1.2
+commons-logging.version=1.1.3
commons-logging.home=${base.path}/commons-logging-${commons-logging.version}
commons-logging-src.loc.1=${base-commons.loc.1}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
commons-logging-src.loc.2=${base-commons.loc.2}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
@@ -104,14 +104,6 @@ avalon-framework.home=${base.path}/avalo
avalon-framework.loc=${base-maven.loc}/avalon-framework/avalon-framework/${avalon-framework.version}/avalon-framework-${avalon-framework.version}.jar
avalon-framework.jar=${avalon-framework.home}/avalon-framework-${avalon-framework.version}.jar
-# ----- log4j2 (required by our extension of commons logging) -----
-log4j2.version=2.1
-log4j2.home=${base.path}/log4j2-${log4j2.version}
-log4j2-api.loc=${base-maven.loc}/org/apache/logging/log4j/log4j-api/${log4j2.version}/log4j-api-${log4j2.version}.jar
-log4j2-core.loc=${base-maven.loc}/org/apache/logging/log4j/log4j-core/${log4j2.version}/log4j-core-${log4j2.version}.jar
-log4j2-api.jar=${log4j2.home}/log4j-api-${log4j2.version}.jar
-log4j2-core.jar=${log4j2.home}/log4j-core-${log4j2.version}.jar
-
# ----- log4j (required by commons logging) -----
log4j.version=1.2.17
log4j.home=${base.path}/log4j-${log4j.version}
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1644504&r1=1644503&r2=1644504&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Dec 10 18:46:22 2014
@@ -1529,18 +1529,6 @@
</antcall>
<antcall target="downloadfile">
- <param name="sourcefile" value="${log4j2-api.loc}"/>
- <param name="destfile" value="${log4j2-api.jar}"/>
- <param name="destdir" value="${log4j.home}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${log4j2-core.loc}"/>
- <param name="destfile" value="${log4j2-core.jar}"/>
- <param name="destdir" value="${log4j.home}"/>
- </antcall>
-
- <antcall target="downloadfile">
<param name="sourcefile" value="${log4j.loc}"/>
<param name="destfile" value="${log4j.jar}"/>
<param name="destdir" value="${log4j.home}"/>
@@ -1589,15 +1577,8 @@
<copy
tofile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml"
/>
- <patch
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"
- patchfile="${basedir}/res/patches/commons-logging-log4j2.patch"
- strip="0"
- failonerror="true"/>
-
<copy
todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
<fileset file="${avalon-framework.jar}" />
- <fileset file="${log4j2-api.jar}" />
- <fileset file="${log4j2-core.jar}" />
<fileset file="${log4j.jar}" />
<fileset file="${logkit.jar}" />
<fileset file="${servletapi.jar}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
