Re: [VOTE] Release Apache Tomcat 7.0.24
On 17/01/2012 01:15, Konstantin Kolinko wrote: > 2012/1/17 Mark Thomas : >> On 16/01/2012 19:04, Sylvain Laurent wrote: >>> >>> On 16 janv. 2012, at 10:44, Rainer Jung wrote: 1) Unit test failure due to missing target directory in src dist I noticed that test/webapp-3.0-virtual-library/target is missing from the src dist. So when rebuilding from src dist and running unit tests, I get a failure in TestVirtualContext, because some resource which is usually retrieved form the target dir is missing: Testcase: testVirtualClassLoader took 7.434 sec FAILED expected:<200> but was:<404> junit.framework.AssertionFailedError: expected:<200> but was:<404> at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:302) at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:294) at org.apache.catalina.loader.TestVirtualContext.testVirtualClassLoader(TestVirtualContext.java:100) AFAIK the root cause is, that we exclude **/target/** in the ant target dist-source from being copied. Note that there is also test/webapp-3.0-virtual-library/target. I don't know, whether we can simply drop this exclude, or should rename the directory. I CC'd Sylvain explicitely, maybe he can comment on it. >>> >>> If there are no side effect to dropping this exclude, you may do it (I >>> really don't know enough of the build system of tomcat). >>> Otherwise I can rename those directories so that it is not excluded. Just >>> let me know. >> >> If I recall correctly, those directories are excluded because some IDEs >> use that name by default. If you could rename them that would be great. > > Not IDEs, but Maven. It writes its output into directories named > "target", in each of its modules. (I guess that is not configurable, > grr...) > > That is why "target" was present in .gitignore when it was first added, > [1] http://svn.apache.org/viewvc?view=revision&revision=1187740 > > This fault is a combination of mine > [2] http://svn.apache.org/viewvc?view=revision&revision=1204938 > > that applied patterns from gitignore to src distribution and of Sylvain's > [3] http://svn.apache.org/viewvc?view=revision&revision=1209731 > > when Sylvain removed that line from ".gitignore" > and used that name in his commit. Thanks for the full explanation. I didn't have time to look into that yesterday. In that case, I agree with your plan below and will do that shortly. Mark > I am generally in favor of using more targeted patterns in "dist-source" > target, > (That is, comment out "**/target/**" for now, with a comment that we > use that name, > and add the same comment to .gitignore > and later exclude more specific patterns when a need comes) > but consider if one of developers used Maven to work on something in modules. > > Currently modules/jdbc-pool and modules/tomcat-lite have pom.xml, > though svn:ignore property on those directories does not list "target" > as excluded. > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232345 - in /tomcat/trunk: .gitignore build.xml
Author: rjung
Date: Tue Jan 17 08:57:51 2012
New Revision: 1232345
URL: http://svn.apache.org/viewvc?rev=1232345&view=rev
Log:
Build handling of "target" directories:
- do no longer exclude from copying to dist/src
- Add comment to .gitignore why we do not ignore "target"
Those directories are in use in
test/webapp-3.0-virtual-library and
test/webapp-3.0-virtual-webapp.
Modified:
tomcat/trunk/.gitignore
tomcat/trunk/build.xml
Modified: tomcat/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1232345&r1=1232344&r2=1232345&view=diff
==
--- tomcat/trunk/.gitignore (original)
+++ tomcat/trunk/.gitignore Tue Jan 17 08:57:51 2012
@@ -14,9 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# -
-output
logs
nbproject
+output
+# Next line commented out, because test/webapp-3.0-virtual-library and
+# test/webapp-3.0-virtual-webapp use it:
+# target
work
build.properties
mvn.properties
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1232345&r1=1232344&r2=1232345&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jan 17 08:57:51 2012
@@ -1653,7 +1653,11 @@ Apache Tomcat ${version} native binaries
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232346 - in /tomcat/tc7.0.x/trunk: ./ .gitignore build.xml
Author: rjung Date: Tue Jan 17 09:02:37 2012 New Revision: 1232346 URL: http://svn.apache.org/viewvc?rev=1232346&view=rev Log: Build handling of "target" directories: - do no longer exclude from copying to dist/src - Add comment to .gitignore why we do not ignore "target" Those directories are in use in test/webapp-3.0-virtual-library and test/webapp-3.0-virtual-webapp. Backport of r1232345 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/.gitignore tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 09:02:37 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,
Re: [VOTE] Release Apache Tomcat 7.0.24
On 17.01.2012 02:15, Konstantin Kolinko wrote: 2012/1/17 Mark Thomas: On 16/01/2012 19:04, Sylvain Laurent wrote: On 16 janv. 2012, at 10:44, Rainer Jung wrote: 1) Unit test failure due to missing target directory in src dist I noticed that test/webapp-3.0-virtual-library/target is missing from the src dist. So when rebuilding from src dist and running unit tests, I get a failure in TestVirtualContext, because some resource which is usually retrieved form the target dir is missing: Testcase: testVirtualClassLoader took 7.434 sec FAILED expected:<200> but was:<404> junit.framework.AssertionFailedError: expected:<200> but was:<404> at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:302) at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:294) at org.apache.catalina.loader.TestVirtualContext.testVirtualClassLoader(TestVirtualContext.java:100) AFAIK the root cause is, that we exclude **/target/** in the ant target dist-source from being copied. Note that there is also test/webapp-3.0-virtual-library/target. I don't know, whether we can simply drop this exclude, or should rename the directory. I CC'd Sylvain explicitely, maybe he can comment on it. If there are no side effect to dropping this exclude, you may do it (I really don't know enough of the build system of tomcat). Otherwise I can rename those directories so that it is not excluded. Just let me know. If I recall correctly, those directories are excluded because some IDEs use that name by default. If you could rename them that would be great. Not IDEs, but Maven. It writes its output into directories named "target", in each of its modules. (I guess that is not configurable, grr...) That is why "target" was present in .gitignore when it was first added, [1] http://svn.apache.org/viewvc?view=revision&revision=1187740 This fault is a combination of mine [2] http://svn.apache.org/viewvc?view=revision&revision=1204938 that applied patterns from gitignore to src distribution and of Sylvain's [3] http://svn.apache.org/viewvc?view=revision&revision=1209731 when Sylvain removed that line from ".gitignore" and used that name in his commit. I am generally in favor of using more targeted patterns in "dist-source" target, (That is, comment out "**/target/**" for now, with a comment that we use that name, and add the same comment to .gitignore and later exclude more specific patterns when a need comes) but consider if one of developers used Maven to work on something in modules. Done in r1232345 (trunk) and r1232346 (tc7). Currently modules/jdbc-pool and modules/tomcat-lite have pom.xml, though svn:ignore property on those directories does not list "target" as excluded. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232349 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jan 17 09:09:24 2012 New Revision: 1232349 URL: http://svn.apache.org/viewvc?rev=1232349&view=rev Log: Update changelog Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1232349&r1=1232348&r2=1232349&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 17 09:09:24 2012 @@ -79,10 +79,14 @@ Automate the OpenPGP signature generation for the release process. (markt) + +Don't exclude directories named target from the build process. +(rjung) + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232351 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default
Author: markt Date: Tue Jan 17 09:10:16 2012 New Revision: 1232351 URL: http://svn.apache.org/viewvc?rev=1232351&view=rev Log: Update version for next release Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1232351&r1=1232350&r2=1232351&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Tue Jan 17 09:10:16 2012 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=24 +version.build=25 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1232351&r1=1232350&r2=1232351&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Tue Jan 17 09:10:16 2012 @@ -35,12 +35,12 @@ maven.snapshot.repo.repositoryId=apache. #Maven release properties for Tomcat staging maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository maven.release.repo.repositoryId=tomcat-staging -maven.release.deploy.version=7.0.24 +maven.release.deploy.version=7.0.25 #Maven release properties for the main ASF repo (staging in nexus) maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/deploy/maven2 maven.asf.release.repo.repositoryId=apache.releases -maven.asf.release.deploy.version=7.0.24 +maven.asf.release.deploy.version=7.0.25 #Where do we load the libraries from - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] [RESULT] Release Apache Tomcat 7.0.24
The result of the vote was broken. The issues have already been fixed and I'll be re-tagging shortly. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 17.01.2012 09:46, Mark Thomas wrote: In that case, I agree with your plan below and will do that shortly. Sorry Mark, didn't see your response earlier, I hope there was no energy wasted by doing duplicate work. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232353 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_25: ./ build.properties.default
Author: markt Date: Tue Jan 17 09:14:08 2012 New Revision: 1232353 URL: http://svn.apache.org/viewvc?rev=1232353&view=rev Log: Tag 7.0.25 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ (props changed) - copied from r1232352, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- --- bugtraq:message (added) +++ bugtraq:message Tue Jan 17 09:14:08 2012 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- --- svn:ignore (added) +++ svn:ignore Tue Jan 17 09:14:08 2012 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jan 17 09:14:08 2012 @@ -0,0 +1 @@ +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,12
Re: [VOTE] Release Apache Tomcat 7.0.24
On 17/01/2012 09:11, Rainer Jung wrote: > On 17.01.2012 09:46, Mark Thomas wrote: >> In that case, I agree with your plan below and will do that shortly. > > Sorry Mark, didn't see your response earlier, I hope there was no energy > wasted by doing duplicate work. Not at all. I saw your commit just before I started work. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232361 - /tomcat/tc7.0.x/tags/TOMCAT_7_0_25/
Author: markt Date: Tue Jan 17 09:38:33 2012 New Revision: 1232361 URL: http://svn.apache.org/viewvc?rev=1232361&view=rev Log: Signing isn't working. Need to fix before re-tagging Removed: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232368 - /tomcat/trunk/build.xml
Author: markt
Date: Tue Jan 17 09:49:59 2012
New Revision: 1232368
URL: http://svn.apache.org/viewvc?rev=1232368&view=rev
Log:
Fix generation of OpenPGP signatures
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1232368&r1=1232367&r2=1232368&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jan 17 09:49:59 2012
@@ -1769,12 +1769,13 @@ Apache Tomcat ${version} native binaries
-
+
+
+
-
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232370 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: markt Date: Tue Jan 17 09:50:50 2012 New Revision: 1232370 URL: http://svn.apache.org/viewvc?rev=1232370&view=rev Log: Fix OpenPGP signatures Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 09:50:50 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,116154
svn commit: r1232371 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_25: ./ build.properties.default
Author: markt Date: Tue Jan 17 09:51:33 2012 New Revision: 1232371 URL: http://svn.apache.org/viewvc?rev=1232371&view=rev Log: Tag 7.0.25 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ (props changed) - copied from r1232370, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- --- bugtraq:message (added) +++ bugtraq:message Tue Jan 17 09:51:33 2012 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- --- svn:ignore (added) +++ svn:ignore Tue Jan 17 09:51:33 2012 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jan 17 09:51:33 2012 @@ -0,0 +1 @@ +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,12
svn commit: r1232377 - /tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Author: kkolinko Date: Tue Jan 17 10:07:45 2012 New Revision: 1232377 URL: http://svn.apache.org/viewvc?rev=1232377&view=rev Log: Add release date Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1232377&r1=1232376&r2=1232377&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 17 10:07:45 2012 @@ -39,7 +39,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 7.0.25
The proposed Apache Tomcat 7.0.25 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.25/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-082/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ The proposed 7.0.25 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.25 Stable I dropped both alpha and beta as if it is not stable, I'll re-roll the release. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232378 - in /tomcat/site/trunk: docs/index.html docs/oldnews.html xdocs/index.xml xdocs/oldnews.xml
Author: kkolinko Date: Tue Jan 17 10:16:41 2012 New Revision: 1232378 URL: http://svn.apache.org/viewvc?rev=1232378&view=rev Log: Add 5.5.34 announcement to old news. Move 5.5.35 announcement at the main page to the top, according to its date. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1232378&r1=1232377&r2=1232378&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Jan 17 10:16:41 2012 @@ -230,6 +230,45 @@ project logo are trademarks of the Apach + +Tomcat 5.5.35 Released2012-01-16 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 5.5.35 of +Apache Tomcat. This release includes many bug fixes and a number of security +fixes over Apache Tomcat 5.5.34. + + + +Note: End of life date for Apache Tomcat 5.5.x is announced. +Read more... + + + + + +Download | +ChangeLog for 5.5.35 + + + + + + + + + + + + + + + Tomcat 6.0.35 Released2011-12-05 @@ -315,45 +354,6 @@ Full details of these changes, and all t - -Tomcat 5.5.35 Released2012-01-16 - - - - - - - -The Apache Tomcat Project is proud to announce the release of version 5.5.35 of -Apache Tomcat. This release includes many bug fixes and a number of security -fixes over Apache Tomcat 5.5.34. - - - -Note: End of life date for Apache Tomcat 5.5.x is announced. -Read more... - - - - - -Download | -ChangeLog for 5.5.35 - - - - - - - - - - - - - - - Tomcat Native 1.1.22 Released2011-08-08 Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1232378&r1=1232377&r2=1232378&view=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Tue Jan 17 10:16:41 2012 @@ -230,6 +230,45 @@ Full details of these changes, and all t + +Tomcat 5.5.34 Released2011-09-22 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 5.5.34 of +Apache Tomcat. This release includes many bug fixes and a number of security +fixes over Apache Tomcat 5.5.33. + + + +Note: End of life date for Apache Tomcat 5.5.x is announced. +Read more... + + + + + +Download | +ChangeLog for 5.5.34 + + + + + + + + + + + + + + + Tomcat 7.0.21 Released2011-09-01 Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1232378&r1=1232377&r2=1232378&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Tue Jan 17 10:16:41 2012 @@ -37,6 +37,21 @@ project logo are trademarks of the Apach + + +The Apache Tomcat Project is proud to announce the release of version 5.5.35 of +Apache Tomcat. This release includes many bug fixes and a number of security +fixes over Apache Tomcat 5.5.34. + +Note: End of life date for Apache Tomcat 5.5.x is announced. +Read more... + + +Download | +ChangeLog for 5.5.35 + + + The Apache Tomcat Project is proud to announce the release of version 6.0.35 of @@ -76,21 +91,6 @@ Full details of these changes, and all t - - -The Apache Tomcat Project is proud to announce the release of version 5.5.35 of -Apache Tomcat. This release includes many bug fixes and a number of security -fixes over Apache Tomcat 5.5.34. - -Note: End of life date for Apache Tomcat 5.5.x is announced. -Read more... - - -Download | -ChangeLog for 5.5.35 - - - The Apache Tomcat Project is proud to announce the release of version 1.1.22 of Tomcat Native. Modified: tomcat/site/trunk/xdocs/oldnews.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=1232378&r1=1232377&r2=1232378&view=diff == --- tomcat/site/trunk/xdocs/oldnews.xml (original) +++ tomcat/site/trunk/xdocs/oldnews.xml Tue Jan 17 10:16:41 2012 @@ -31,6 +31,21 @@ Full details of these changes, and all t + + +The Apache Tomcat Project is proud to announce the release of version 5.5.34 of +Apache Tomcat. This release includes many bug fixes and a number of security +fixes over Apache Tomcat 5.5.33. + +Note: End of life date for Apache Tomcat 5.5.x is announced. +Read more... + + +Download | +ChangeLog for 5.5.34 + + + The Apache Tomcat Project is proud to announce the release of version 7.0.21 of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2666 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1232368 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1232380 - /tomcat/trunk/webapps/docs/config/host.xml
Author: kkolinko Date: Tue Jan 17 10:22:26 2012 New Revision: 1232380 URL: http://svn.apache.org/viewvc?rev=1232380&view=rev Log: Correct spelling of StandardHost's attribute copyXML Modified: tomcat/trunk/webapps/docs/config/host.xml Modified: tomcat/trunk/webapps/docs/config/host.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1232380&r1=1232379&r2=1232380&view=diff == --- tomcat/trunk/webapps/docs/config/host.xml (original) +++ tomcat/trunk/webapps/docs/config/host.xml Tue Jan 17 10:22:26 2012 @@ -391,7 +391,7 @@ sure to delete the associated expanded directory before restarting Tomcat, so that the updated WAR file will be re-expanded when Tomcat restarts. -If copyXml is true (it is false +If copyXML is true (it is false by default), any web application archive file within the Hosts's appBase directory that does not have a corresponding context XML descriptor (with a ".xml" extension rather than a ".war" @@ -408,7 +408,7 @@ context path will /. Multi-level contexts may be defined by using #, e.g. use a directory named foo#bar for a context path of /foo/bar. -If copyXml is true (it is false +If copyXML is true (it is false by default), any directory within the Hosts's appBase directory that does not have a corresponding context XML descriptor in the Host's xmlBase will be scanned to see if it contains - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232381 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/host.xml
Author: kkolinko Date: Tue Jan 17 10:26:24 2012 New Revision: 1232381 URL: http://svn.apache.org/viewvc?rev=1232381&view=rev Log: Merged revision 1232380 from tomcat/trunk: Correct spelling of StandardHost's attribute copyXML Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 10:26:24 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626
svn commit: r1232382 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html docs/security-7.html xdocs/security-5.xml xdocs/security-6.xml xdocs/security-7.xml
Author: markt Date: Tue Jan 17 10:31:37 2012 New Revision: 1232382 URL: http://svn.apache.org/viewvc?rev=1232382&view=rev Log: Deal with Mitre splitting up an issue and not telling us. Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/security-7.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1232382&r1=1232381&r2=1232382&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Tue Jan 17 10:31:37 2012 @@ -350,6 +350,16 @@ +Note: Mitre elected to break this issue down into multiple issues and + have allocated the following additional references to parts of this + issue: + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5062"; rel="nofollow">CVE-2011-5062, + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5063"; rel="nofollow">CVE-2011-5063 and + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5064"; rel="nofollow">CVE-2011-5064. The Apache Tomcat security team will + continue to treat this as a single issue using the reference + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1184"; rel="nofollow">CVE-2011-1184. + + The implementation of HTTP DIGEST authentication was discovered to have several weaknesses: Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1232382&r1=1232381&r2=1232382&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Tue Jan 17 10:31:37 2012 @@ -436,6 +436,16 @@ +Note: Mitre elected to break this issue down into multiple issues and + have allocated the following additional references to parts of this + issue: + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5062"; rel="nofollow">CVE-2011-5062, + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5063"; rel="nofollow">CVE-2011-5063 and + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5064"; rel="nofollow">CVE-2011-5064. The Apache Tomcat security team will + continue to treat this as a single issue using the reference + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1184"; rel="nofollow">CVE-2011-1184. + + The implementation of HTTP DIGEST authentication was discovered to have several weaknesses: Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1232382&r1=1232381&r2=1232382&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Tue Jan 17 10:31:37 2012 @@ -729,6 +729,16 @@ +Note: Mitre elected to break this issue down into multiple issues and + have allocated the following additional references to parts of this + issue: + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5062"; rel="nofollow">CVE-2011-5062, + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5063"; rel="nofollow">CVE-2011-5063 and + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5064"; rel="nofollow">CVE-2011-5064. The Apache Tomcat security team will + continue to treat this as a single issue using the reference + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1184"; rel="nofollow">CVE-2011-1184. + + The implementation of HTTP DIGEST authentication was discovered to have several weaknesses: Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1232382&r1=1232381&r2=1232382&view=diff == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Tue Jan 17 10:31:37 2012 @@ -70,6 +70,19 @@ http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1184"; rel="nofollow">CVE-2011-1184 +Note: Mitre elected to break this issue down into multiple issues and + have allocated the following additional references to parts of this + issue: + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5062"; + rel="nofollow">CVE-2011-5062, + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5063"; + rel="nofollow">CVE-2011-5063 and + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-5064"; + rel="
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2667 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1232380 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
[SECURITY] CVE-2011-3375 Apache Tomcat Information disclosure
CVE-2011-3375 Apache Tomcat Information disclosure Severity: Important Vendor: The Apache Software Foundation Versions Affected: - Tomcat 7.0.0 to 7.0.21 - Tomcat 6.0.30 to 6.0.33 - Earlier versions are not affected Description: For performance reasons, information parsed from a request is often cached in two places: the internal request object and the internal processor object. These objects are not recycled at exactly the same time. When certain errors occur that needed to be added to the access log, the access logging process triggers the re-population of the request object after it has been recycled. However, the request object was not recycled before being used for the next request. That lead to information leakage (e.g. remote IP address, HTTP headers) from the previous request to the next request. The issue was resolved be ensuring that the request and response objects were recycled after being re-populated to generate the necessary access log entries. Mitigation: Users of affected versions should apply one of the following mitigations: - Tomcat 7.0.x users should upgrade to 7.0.22 or later - Tomcat 6.0.x users should upgrade to 6.0.35 or later Credit: The issue was initially reported via Apache Tomcat's public issue tracker with the potential security implications identified by the Apache Tomcat security team. References: http://tomcat.apache.org/security.html http://tomcat.apache.org/security-7.html http://tomcat.apache.org/security-6.html https://issues.apache.org/bugzilla/show_bug.cgi?id=51872 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[SECURITY] CVE-2012-0022 Apache Tomcat Denial of Service
CVE-2012-0022 Apache Tomcat Denial of Service Severity: Important Vendor: The Apache Software Foundation Versions Affected: - Tomcat 7.0.0 to 7.0.22 - Tomcat 6.0.0 to 6.0.33 - Tomcat 5.5.0 to 5.5.34 - Earlier, unsupported versions may also be affected Description: Analysis of the recent hash collision vulnerability identified unrelated inefficiencies with Apache Tomcat's handling of large numbers of parameters and parameter values. These inefficiencies could allow an attacker, via a specially crafted request, to cause large amounts of CPU to be used which in turn could create a denial of service. The issue was addressed by modifying the Tomcat parameter handling code to efficiently process large numbers of parameters and parameter values. Mitigation: Users of affected versions should apply one of the following mitigations: - Tomcat 7.0.x users should upgrade to 7.0.23 or later - Tomcat 6.0.x users should upgrade to 6.0.35 or later - Tomcat 5.5.x users should upgrade to 5.5.35 or later Credit: The inefficiencies in handling large numbers of parameters were identified by the Apache Tomcat security team. References: http://tomcat.apache.org/security.html http://tomcat.apache.org/security-7.html http://tomcat.apache.org/security-6.html http://tomcat.apache.org/security-5.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232388 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html docs/security-7.html xdocs/security-5.xml xdocs/security-6.xml xdocs/security-7.xml
Author: markt Date: Tue Jan 17 11:34:44 2012 New Revision: 1232388 URL: http://svn.apache.org/viewvc?rev=1232388&view=rev Log: Add CVE-2011-3375 and CVE-2012-0022 Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/security-7.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1232388&r1=1232387&r2=1232388&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Tue Jan 17 11:34:44 2012 @@ -195,6 +195,9 @@ Apache Tomcat 5.x vulnerabilities +Fixed in Apache Tomcat 5.5.35 + + Fixed in Apache Tomcat 5.5.34 @@ -335,6 +338,54 @@ + +Fixed in Apache Tomcat 5.5.35released 1 Jan 2012 + + + + + + + + +Important: Denial of service + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-0022"; rel="nofollow">CVE-2012-0022 + + + +Analysis of the recent hash collision vulnerability identified unrelated + inefficiencies with Apache Tomcat's handling of large numbers of + parameters and parameter values. These inefficiencies could allow an + attacker, via a specially crafted request, to cause large amounts of CPU + to be used which in turn could create a denial of service. The issue was + addressed by modifying the Tomcat parameter handling code to efficiently + process large numbers of parameters and parameter values. + + +This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=1221282";>1221282, + http://svn.apache.org/viewvc?view=rev&rev=1224640";>1224640 and + http://svn.apache.org/viewvc?view=rev&rev=1228191";>1228191. + + +This was identified by the Tomcat security team on 21 October 2011 and + made public on 17 January 2012. + + +Affects: 5.5.0-5.5.34 + + + + + + + + + + + + + + Fixed in Apache Tomcat 5.5.34released 22 Sep 2011 Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1232388&r1=1232387&r2=1232388&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Tue Jan 17 11:34:44 2012 @@ -323,15 +323,44 @@ -Note: The issue below was fixed in Apache Tomcat 6.0.34 but the - release vote for the 6.0.34 release candidate did not pass. Therefore, - although users must download 6.0.35 to obtain a version that includes a - fix for this issue, version 6.0.34 is not included in the list of - affected versions. +Note: The issues below were fixed in Apache Tomcat + 6.0.34 but the release vote for the 6.0.34 release candidate did not + pass. Therefore, although users must download 6.0.35 to obtain a version + that includes a fix for this issue, version 6.0.34 is not included in the + list of affected versions. +Important: Information disclosure + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-3375"; rel="nofollow">CVE-2011-3375 + + + +For performance reasons, information parsed from a request is often + cached in two places: the internal request object and the internal + processor object. These objects are not recycled at exactly the same + time. When certain errors occur that needed to be added to the access + log, the access logging process triggers the re-population of the request + object after it has been recycled. However, the request object was not + recycled before being used for the next request. That lead to information + leakage (e.g. remote IP address, HTTP headers) from the previous request + to the next request. The issue was resolved be ensuring that the request + and response objects were recycled after being re-populated to generate + the necessary access log entries. + + +This was fixed in http://svn.apache.org/viewvc?view=rev&rev=1185998";>revision 1185998. + + +This was identified by the Tomcat security team on 22 September 2011 and + made public on 17 January 2012. + + +Affects: 6.0.30-6.0.33 + + + Important: Authentication bypass and information disclosure http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-3190"; rel="nofollow">CVE-2011-3190 @@ -408,6 +437,34 @@ + + + +Important: Denial of service + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-0022"; rel="nofollow">CVE-2012-0022 + + + +Analysis of the recent hash collision vulnerability identified unrelated + inefficiencies with Apache Tomcat's handling of large numbers of + para
svn propchange: r1221282 - svn:log
Author: markt Revision: 1221282 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:38:14 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:38:14 2012 @@ -23,3 +23,4 @@ +1: kkolinko, markt, funkman, jim -1: +This was part of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1224640 - svn:log
Author: markt Revision: 1224640 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:38:30 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:38:30 2012 @@ -1,2 +1,3 @@ CTR Correct typo in message name - followup to r1221282 +This was part of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1228191 - svn:log
Author: markt Revision: 1228191 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:38:48 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:38:48 2012 @@ -3,3 +3,4 @@ Also do not flag extra '&' as errors. http://svn.apache.org/viewvc?rev=1224659&view=rev +This was part of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1185998 - svn:log
Author: markt Revision: 1185998 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:39:31 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:39:31 2012 @@ -2,3 +2,5 @@ Fix https://issues.apache.org/bugzilla/s Ensure access log always logs the correct remote IP. Ensure requests with multiple errors do not result in multiple access log entries. + +This was the fix for CVE-2011-3375 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1176592 - svn:log
Author: markt Revision: 1176592 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:39:59 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:39:59 2012 @@ -1,3 +1,5 @@ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872 Ensure access log always logs the correct remote IP. Ensure requests with multiple errors do not result in multiple access log entries. + +This was the fix for CVE-2011-3375 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1200601 - svn:log
Author: markt Revision: 1200601 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:40:38 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:40:38 2012 @@ -1,2 +1,4 @@ - Improve performance of parameter processing. - Implement FailedRequestFilter to reject broken requests + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1206324 - svn:log
Author: markt Revision: 1206324 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:41:02 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:41:02 2012 @@ -1,3 +1,5 @@ Parameters.java: - Fix regression in urldecoding of parameters that contain spaces Patch by Willem Fibbe + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1229027 - svn:log
Author: markt Revision: 1229027 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:41:21 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:41:21 2012 @@ -1,3 +1,5 @@ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52384 Do not fail in Parameter parsing when debug logging is enabled. Also do not flag extra '&' in parameters as errors. + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1189899 - svn:log
Author: markt Revision: 1189899 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:41:44 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:41:44 2012 @@ -1 +1,3 @@ Re-factor parameter parsing to improve performance + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1190482 - svn:log
Author: markt Revision: 1190482 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:42:00 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:42:00 2012 @@ -1 +1,3 @@ Fix NPE in parameter re-factoring identified by JSP TCK. + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1194917 - svn:log
Author: markt Revision: 1194917 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:42:15 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:42:15 2012 @@ -1 +1,3 @@ Review comments from kkolinko for parameter parsing improvements + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1195225 - svn:log
Author: markt Revision: 1195225 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:42:32 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:42:32 2012 @@ -1 +1,3 @@ Review from kkolinko. Minor performance tweaks. + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1195226 - svn:log
Author: markt Revision: 1195226 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:42:44 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:42:44 2012 @@ -1 +1,3 @@ Simplify addition of parameters + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1195537 - svn:log
Author: markt Revision: 1195537 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:42:57 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:42:57 2012 @@ -1,3 +1,5 @@ Merged revision 1195531 from tomcat/trunk: Replace Hashtable with HashMap in parameter processing. Improve paramsAsString() debug method by iterating over entries instead of keys. + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1195909 - svn:log
Author: markt Revision: 1195909 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:43:09 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:43:09 2012 @@ -1,3 +1,5 @@ Merged revision 1195905 from tomcat/trunk: Followup to r1195531 (r1195537 in tc7) Use standard Collections.enumeration() wrapper instead of our Enumerator class. + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1195944 - svn:log
Author: markt Revision: 1195944 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:43:27 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:43:27 2012 @@ -1,3 +1,5 @@ Merged revision 1195943 from tomcat/trunk: Followup to parameter parsing improvements. urlDecode() sets bc.charset. If decoding is skipped (because there is no '%' in the string) we shouldn't forget to set the charset. + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1195951 - svn:log
Author: markt Revision: 1195951 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:43:38 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:43:38 2012 @@ -2,3 +2,5 @@ Merged revision 1195949 from tomcat/trun Followup to r1195943 (r1195944 in TC7) Simplify code. Move toString() call out of urlDecode() method. No functional change. + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1195977 - svn:log
Author: markt Revision: 1195977 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:43:52 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:43:52 2012 @@ -1 +1,3 @@ Extend the parameter limits to multi-part processing + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1198641 - svn:log
Author: markt Revision: 1198641 Modified property: svn:log Modified: svn:log at Tue Jan 17 11:44:10 2012 -- --- svn:log (original) +++ svn:log Tue Jan 17 11:44:10 2012 @@ -1,2 +1,4 @@ Merged revision 1198640 from tomcat/trunk: Restore handleQueryParameters() call that was lost in r1189882 + +This was pat of the fix for CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.25
On 17.01.2012 11:16, Mark Thomas wrote: The proposed Apache Tomcat 7.0.25 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.25/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-082/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ The proposed 7.0.25 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.25 Stable I dropped both alpha and beta as if it is not stable, I'll re-roll the release. The two files - KEYS - RELEASE-NOTES are missing at the top level download directory. Can you please add them? Thanks! Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-43) Allow configuration of URI encoding
[ https://issues.apache.org/jira/browse/MTOMCAT-43?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13187629#comment-13187629 ] Morten Haraldsen commented on MTOMCAT-43: - This does not seem to be working. Line 195/196 of TomcatRunner.java // FIXME parameter for that def ? ISO-8859-1 //connector.setURIEncoding(uriEncoding); Please fix this. Best regards Morten > Allow configuration of URI encoding > --- > > Key: MTOMCAT-43 > URL: https://issues.apache.org/jira/browse/MTOMCAT-43 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Reporter: Dan C >Priority: Minor > Attachments: configure-uri-encoding.patch > > > My webapp relies on the servlet container decoding URIs as UTF-8. The > attached patch lets me configure this for the embedded Tomcat. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-43) Allow configuration of URI encoding
[ https://issues.apache.org/jira/browse/MTOMCAT-43?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13187641#comment-13187641 ] Olivier Lamy commented on MTOMCAT-43: - this issue concerns tomcat*:run mojo not the new feature for executable jar/war. But that's true :-) I will open a separate issue. > Allow configuration of URI encoding > --- > > Key: MTOMCAT-43 > URL: https://issues.apache.org/jira/browse/MTOMCAT-43 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat6, tomcat7 >Affects Versions: 1.1 >Reporter: Dan C >Priority: Minor > Fix For: 2.0 > > Attachments: configure-uri-encoding.patch > > > My webapp relies on the servlet container decoding URIs as UTF-8. The > attached patch lets me configure this for the embedded Tomcat. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-115) Allow configuration of URI encoding for executable war
Allow configuration of URI encoding for executable war -- Key: MTOMCAT-115 URL: https://issues.apache.org/jira/browse/MTOMCAT-115 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: tomcat6, tomcat7 Affects Versions: 1.1 Reporter: Dan C Assignee: Olivier Lamy Priority: Minor Fix For: 2.0 My webapp relies on the servlet container decoding URIs as UTF-8. The attached patch lets me configure this for the embedded Tomcat. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Reopened] (MTOMCAT-43) Allow configuration of URI encoding
[ https://issues.apache.org/jira/browse/MTOMCAT-43?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy reopened MTOMCAT-43: - Assignee: Olivier Lamy > Allow configuration of URI encoding > --- > > Key: MTOMCAT-43 > URL: https://issues.apache.org/jira/browse/MTOMCAT-43 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat6, tomcat7 >Affects Versions: 1.1 >Reporter: Dan C >Assignee: Olivier Lamy >Priority: Minor > Fix For: 2.0 > > Attachments: configure-uri-encoding.patch > > > My webapp relies on the servlet container decoding URIs as UTF-8. The > attached patch lets me configure this for the embedded Tomcat. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-43) Allow configuration of URI encoding for tomcat run goals
[ https://issues.apache.org/jira/browse/MTOMCAT-43?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy updated MTOMCAT-43: Component/s: tomcat7 tomcat6 Affects Version/s: 1.1 Fix Version/s: 2.0 Summary: Allow configuration of URI encoding for tomcat run goals (was: Allow configuration of URI encoding) > Allow configuration of URI encoding for tomcat run goals > > > Key: MTOMCAT-43 > URL: https://issues.apache.org/jira/browse/MTOMCAT-43 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat6, tomcat7 >Affects Versions: 1.1 >Reporter: Dan C >Assignee: Olivier Lamy >Priority: Minor > Fix For: 2.0 > > Attachments: configure-uri-encoding.patch > > > My webapp relies on the servlet container decoding URIs as UTF-8. The > attached patch lets me configure this for the embedded Tomcat. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-115) Allow configuration of URI encoding for executable war
[ https://issues.apache.org/jira/browse/MTOMCAT-115?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy updated MTOMCAT-115: - Component/s: (was: tomcat6) > Allow configuration of URI encoding for executable war > -- > > Key: MTOMCAT-115 > URL: https://issues.apache.org/jira/browse/MTOMCAT-115 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 1.1 >Reporter: Dan C >Assignee: Olivier Lamy >Priority: Minor > Fix For: 2.0 > > > My webapp relies on the servlet container decoding URIs as UTF-8. The > attached patch lets me configure this for the embedded Tomcat. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-43) Allow configuration of URI encoding for tomcat run goals
[ https://issues.apache.org/jira/browse/MTOMCAT-43?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy closed MTOMCAT-43. --- Resolution: Fixed > Allow configuration of URI encoding for tomcat run goals > > > Key: MTOMCAT-43 > URL: https://issues.apache.org/jira/browse/MTOMCAT-43 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat6, tomcat7 >Affects Versions: 1.1 >Reporter: Dan C >Assignee: Olivier Lamy >Priority: Minor > Fix For: 2.0 > > Attachments: configure-uri-encoding.patch > > > My webapp relies on the servlet container decoding URIs as UTF-8. The > attached patch lets me configure this for the embedded Tomcat. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.25
On 17/01/2012 12:54, Rainer Jung wrote: > On 17.01.2012 11:16, Mark Thomas wrote: >> The proposed Apache Tomcat 7.0.25 release is now available for voting. >> >> It can be obtained from: >> http://people.apache.org/~markt/dev/tomcat-7/v7.0.25/ >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-082/ >> The svn tag is: >> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ >> >> The proposed 7.0.25 release is: >> [ ] Broken - do not release >> [ ] Stable - go ahead and release as 7.0.25 Stable >> >> I dropped both alpha and beta as if it is not stable, I'll re-roll the >> release. > > The two files > > - KEYS > - RELEASE-NOTES > > are missing at the top level download directory. Can you please add them? Done. Not sure how that happened. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 38216] Extend Jmxproxy to allow call of MBean Operations
https://issues.apache.org/bugzilla/show_bug.cgi?id=38216
Chris O'Connor changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|FIXED |
--- Comment #6 from Chris O'Connor 2012-01-17 14:49:57
UTC ---
Very useful feature and i'm just putting it onto our tomcat 6 boxes. However it
doesn't account for the invocation of the mbean returning null when outputting
the result. I propose that the invokeOperation becomes
public void invokeOperation(PrintWriter writer, String onameStr, String op,
String[] valuesStr){
try {
ObjectName oname=new ObjectName( onameStr );
MBeanOperationInfo methodInfo = registry.getMethodInfo(oname,op);
MBeanParameterInfo[] signature = methodInfo.getSignature();
String[] signatureTypes = new String[signature.length];
Object[] values = new Object[signature.length];
for (int i = 0; i < signature.length; i++) {
MBeanParameterInfo pi = signature[i];
signatureTypes[i] = pi.getType();
values[i] = registry.convertValue(pi.getType(), valuesStr[i] );
}
Object retVal = mBeanServer.invoke(oname,op,values,signatureTypes);
if(retVal != null){
writer.println("OK - Operation " + op + " returned:");
output("", writer, retVal);
}else{
writer.println("OK - Operation " + op + " without return
value");
}
} catch( Exception ex ) {
writer.println("Error - " + ex.toString());
ex.printStackTrace(writer);
}
}
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.25
On 17.01.2012 11:16, Mark Thomas wrote:
The proposed Apache Tomcat 7.0.25 release is now available for voting.
It can be obtained from:
http://people.apache.org/~markt/dev/tomcat-7/v7.0.25/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-082/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/
The proposed 7.0.25 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 7.0.25 Stable
I dropped both alpha and beta as if it is not stable, I'll re-roll the
release.
+1, some unit test failures which seem to be timing issues, but one
crash in APR, this time another test and during
AprLifecycleListener.terminateAPR() -> apr_pool_terminate() ->
apr_allocator_destroy(). But those sporadic crashes observe are not
regressions.
Details:
- MD5 OK
- signatures OK
- key in KEYS file
- gz and zip for src and bin consistent
- src consistent with svn tag, except for the following minor points
(no regression)
- line ends of modules/jdbc-pool/resources/MANIFEST.MF differ
between svn and gz although eol-style is set correctly.
- the files we copy before building, e.g.
catalina.properties and jdbc-pool.xml are of course
not in svn for the cp target location, but they are
in the src bundles.
- builds fine
- build result looks consistent with binaries
- no checkstyle complaints
- no Javadoc errors
- Unit tests some spurious failures and one APR crash
(probably not a regression):
- TestWebappClassLoaderMemoryLeak (NIO): Timer thread still running
- TestAsyncContextImpl (NIO): one failure in line 172,
because response time was 975 ms, which is not >= 1000
- TestSwallowAbortedUploads (APR): crash during tearDown().
Details see at end of this mail.
- JMX MBean-Comparison only expected differences:
- Attribute "-requestBytesSent" for RequestProcessor related
to thread http-bio-8080-exec-1 shows "0" instead of "131072".
This is likely a consequence of the JMXProxy now first formatting
the complete result via the MBeanDumper and then writing back
everything, so at the time of formatting nothing was written yet,
so byte count "0". I checked with a request streaming data and
when I dump the MBeans in parallel, I can see the correct
requestBytesSent in the MBean for that streaming request.
- New attribute "localPort" in Connector, ProtocolHandler
and ThreadPool MBeans
- New attribute "nameIndex" in ProtocolHandler MBean
- slightly different sorting for "rejectedSessions"
- two new loggers (o.a.c.mbeans and o.a.c.mbeans.MBeanDumper)
Build and tests were done using Java 1.6.0_30, OS was Solaris 10 Sparc,
tcnative was 1.1.22 based on APR 1.4.5 and OpenSSL 1.0.0f.
Details about APR crash:
Crash in
Testcase: testAbortedUploadUnlimitedSwallow took 0.004 sec
during tearDown in the library allocator destruction:
fe024970 apr_allocator_destroy (293930, fc041180, 140, 0, 0, 0) + 10
fe025690 apr_pool_terminate (31928, fe37dcd0, 40800, 0, 0, 34000) + 44
fc00d700 * org/apache/tomcat/jni/Library.terminate()V+-19432
fc00d6ac * org/apache/tomcat/jni/Library.terminate()V+0
...
fc005940 *
org/apache/catalina/core/AprLifecycleListener.terminateAPR()V+23 (line 295)
fc005ab0 *
org/apache/catalina/core/AprLifecycleListener.lifecycleEvent(Lorg/apache/catalina/LifecycleEvent;)V+151
(line 243)
fc005fd0 *
org/apache/catalina/util/LifecycleSupport.fireLifecycleEvent(Ljava/lang/String;Ljava/lang/Object;)V+37
(line 235)
fc005ab0 *
org/apache/catalina/util/LifecycleBase.fireLifecycleEvent(Ljava/lang/String;Ljava/lang/Object;)V+6
(line 180)
fc005ab0 *
org/apache/catalina/util/LifecycleBase.setStateInternal(Lorg/apache/catalina/LifecycleState;Ljava/lang/Object;Z)V+140
(line 753)
fc005ab0 * org/apache/catalina/util/LifecycleBase.destroy()V+275 (line
585)
fc005fd0 * org/apache/catalina/startup/Tomcat.destroy()V+9 (line 709)
fc005ab0 * org/apache/catalina/startup/TomcatBaseTest.tearDown()V+57
(line 321)
Debugger says:
apr_allocator_destroy (allocator=0x293930) at memory/unix/apr_pools.c:143
Line 143 is the first line in the following while loop:
APR_DECLARE(void) apr_allocator_destroy(apr_allocator_t *allocator)
{
apr_uint32_t index;
apr_memnode_t *node, **ref;
for (index = 0; index < MAX_INDEX; index++) {
ref = &allocator->free[index];
while ((node = *ref) != NULL) {
*ref = node->next;
#if APR_ALLOCATOR_USES_MMAP
munmap(node, (node->index+1) << BOUNDARY_INDEX);
#else
free(node);
#endif
}
}
...
It crashes there, because it tries to dereference the invalid
address 0x4f28 at allocator->free[1]:
(gdb) print *allocator
$1 = {max_index = 16, max_free_index = 0, current_free_index = 0, mutex
= 0x0, owner = 0x286420, free = {0x0, 0x4f28, 0x0 ,
0xaf1998, 0x0, 0x0, 0x0}}
Some more data:
(gdb) print *allocator->owner
$2 = {parent = 0x
svn commit: r1232447 - in /tomcat/trunk: BUILDING.txt webapps/docs/building.xml
Author: kkolinko
Date: Tue Jan 17 15:46:44 2012
New Revision: 1232447
URL: http://svn.apache.org/viewvc?rev=1232447&view=rev
Log:
Improve BUILDING.txt.
Especially:
1. Reformat the document.
2. Document creation of "build.properties" as an explicit step before building.
3. Document enabling GPG when doing a release.
4. Document enabling Checkstyle.
5. Document running the tests.
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/webapps/docs/building.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1232447&r1=1232446&r2=1232447&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Tue Jan 17 15:46:44 2012
@@ -33,119 +33,290 @@ In order to build a binary distribution
source distribution, do the following:
-(0) Download and Install a Java Development Kit
+(1) Download and Install a Java Development Kit
-* If the JDK is already installed, skip to (1).
+ 1. If the JDK is already installed, skip to (2).
-* Download a Java Development Kit (JDK) release (version 1.6.x or later) from:
+ 2. Download a Java Development Kit (JDK) release (version 1.6.x or later)
+from:
-http://www.oracle.com/technetwork/java/javase/downloads/index.html
+http://www.oracle.com/technetwork/java/javase/downloads/index.html
-* Install the JDK according to the instructions included with the release.
+ 3. Install the JDK according to the instructions included with the release.
-* Set an environment variable JAVA_HOME to the pathname of the directory
- into which you installed the JDK release.
+ 4. Set an environment variable JAVA_HOME to the pathname of the directory
+into which you installed the JDK release.
-(1) Install Apache Ant 1.8.x on your computer
+(2) Install Apache Ant 1.8.x on your computer
-* If Apache Ant 1.8.x is already installed on your computer, skip to (2).
+ 1. If Apache Ant 1.8.x is already installed on your computer, skip to (3).
-* Download a binary distribution of Ant 1.8.x from:
+ 2. Download a binary distribution of Ant 1.8.x from:
-http://ant.apache.org/bindownload.cgi
+http://ant.apache.org/bindownload.cgi
-* Unpack the binary distribution into a convenient location so that the
- Ant release resides in its own directory (conventionally named
- "apache-ant-[version]"). For the purposes of the remainder of this document,
- the symbolic name "${ant.home}" is used to refer to the full pathname of
- the release directory.
+ 3. Unpack the binary distribution into a convenient location so that the
+Ant release resides in its own directory (conventionally named
+"apache-ant-[version]").
-* Create an ANT_HOME environment variable to point the directory
- ${ant.home}.
+For the purposes of the remainder of this document, the symbolic name
+"${ant.home}" is used to refer to the full pathname of the release
+directory.
-* Modify the PATH environment variable to include the directory
- ${ant.home}/bin in its list. This makes the "ant" command line script
- available, which will be used to actually perform the build.
+ 4. Create an ANT_HOME environment variable to point the directory
+${ant.home}.
+ 5. Modify the PATH environment variable to include the directory
+${ant.home}/bin in its list. This makes the "ant" command line script
+available, which will be used to actually perform the build.
-(2) Building Tomcat @VERSION_MAJOR_MINOR@
-(2.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@
+(3) Building Tomcat @VERSION_MAJOR_MINOR@
-* Tomcat SVN repository URL:
- http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/
+(3.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@
-* Download a source package from:
- http://tomcat.apache.org/download-@version_ma...@0.cgi
+Checkout the source using SVN, selecting a tag for released version or
+trunk for the current development code, or download and unpack a source
+package.
-* Checkout the source using SVN, selecting a tag for released version or
- trunk for the current development code, or unpack a source package. The
- location where the source has been placed will be referred as
- ${tomcat.source}.
+ * Tomcat SVN repository URL:
-(2.2) Building
+http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/
-* Go to that directory, and do:
+ * Source packages can be downloaded from:
-cd ${tomcat.source}
-ant
+http://tomcat.apache.org/download-@version_ma...@0.cgi
+
+The location where the source has been placed will be further referred as
+${tomcat.source}.
+
+(3.2) Building
+
+ 1. The build is controlled by creating a ${tomcat.source}/build.properties
+file.
+
+It is recommended to always create the file, because of unfortunate
+default value of base.path property. You may start with the f
svn commit: r1232451 - in /tomcat/tc7.0.x/trunk: ./ BUILDING.txt webapps/docs/building.xml webapps/docs/changelog.xml
Author: kkolinko Date: Tue Jan 17 16:00:07 2012 New Revision: 1232451 URL: http://svn.apache.org/viewvc?rev=1232451&view=rev Log: Merged revision 1232447 from tomcat/trunk: Improve BUILDING.txt. Especially: 1. Reformat the document. 2. Document creation of "build.properties" as an explicit step before building. 3. Document enabling GPG when doing a release. 4. Document enabling Checkstyle. 5. Document running the tests. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/BUILDING.txt tomcat/tc7.0.x/trunk/webapps/docs/building.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 16:00:07 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1
DO NOT REPLY [Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #8 from Konstantin Kolinko 2012-01-17 16:03:46 UTC --- Recent discussion on dev (Re: r1080719): http://tomcat.markmail.org/thread/q6lfopguhnedtbzt -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232558 - in /tomcat/site/trunk: docs/security-5.html xdocs/security-5.xml
Author: kkolinko Date: Tue Jan 17 20:06:08 2012 New Revision: 1232558 URL: http://svn.apache.org/viewvc?rev=1232558&view=rev Log: Correct date Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/xdocs/security-5.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1232558&r1=1232557&r2=1232558&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Tue Jan 17 20:06:08 2012 @@ -339,7 +339,7 @@ -Fixed in Apache Tomcat 5.5.35released 1 Jan 2012 +Fixed in Apache Tomcat 5.5.35released 16 Jan 2012 Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1232558&r1=1232557&r2=1232558&view=diff == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Tue Jan 17 20:06:08 2012 @@ -64,7 +64,7 @@ --> - + Important: Denial of service CVE-2012-0022 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.25
On 17/01/2012 10:16, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.25 release is now available for voting. > > It can be obtained from: > http://people.apache.org/~markt/dev/tomcat-7/v7.0.25/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-082/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/ > > The proposed 7.0.25 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.25 Stable > > I dropped both alpha and beta as if it is not stable, I'll re-roll the > release. Unit tests pass on 64-bit Linux TCKs pass for the following on 64-bit Linux - EL - JSP with direct HTTP BIO, NIO & APR - Servlet with direct HTTP BIO, NIO & APR - Servlet with mod_proxy_http + HTTP BIO, NIO & APR - Servlet with mod_proxy_ajp + AJP BIO, NIO & APR - Servlet with mod_jk + AJP BIO, NIO & APR Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1183612 [2/2] - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
On 1/13/2012 8:30 PM, Brian Burch wrote: > On 14/01/12 09:45, Filip Hanik - Dev Lists wrote: >> No grudge held :) >> I'm just bringing it up since very many files have been reformatted for >> the sake of formatting. And when tracing down a problem, I, and I >> suspect others too, often use SVN history to figure out what and how >> changed. So a formatting change that makes satisfies a personal >> formatting preference for one developer, down the line can make it a lot >> harder to trace changes for others. > > I don't want to throw petrol on glowing embers, and I realise my own efforts > barely count. > However, when I've been researching the history of changes in logic that I > didn't fully > understand, the svn history has been unhelpful and confusing. Now I > understand why! One very useful trick is svn diff -x --ignore-all-whitespace -x --ignore-eol-style - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52480] New: TC7 + AntCompiler problems with whitespace in pathname
https://issues.apache.org/bugzilla/show_bug.cgi?id=52480
Bug #: 52480
Summary: TC7 + AntCompiler problems with whitespace in pathname
Product: Tomcat 7
Version: 7.0.23
Platform: PC
OS/Version: Linux
Status: NEW
Severity: major
Priority: P2
Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: epr...@orpheus.fr
Classification: Unclassified
### Overview
Bug opened for Linux but it also happens on Windows - see below for detailed
environments.
TC fails to compile JSP when:
1) the compiler is AntCompiler
and 2) there is a whitespace somewhere in the absolute pathname to TC home dir.
It may also fail when the absolute pathname to TC home dir contains non
URI-compatible characters but I have tested only with whitespace.
Configuring logging.properties to have AntCompiler set to level FINEST, logs
show that:
- whitespace is translated to "%20";
- javac task fails with many errors, the first being "package javax.servlet
does not exist".
Our tests show that:
- When AntCompiler is used AND tomcat is installed in a directory whose
absolute pathname does NOT contain any whitespace, compilation is ok.
- When AntCompiler is used AND tomcat is installed in a directory whose
absolute pathname DOES contain at least one whitespace, compilation fails.
- When JDTCompiler is used, compilation is ok (whitespace or not).
This has been tested with the two environments described below (+ steps to
reproduce).
### History
Some discussion has hapened on Tomcat mailing list on January 2011 and "markt
at apache.org" wrote I should fill a bug (my initial mail subject is "TC7 +
AntCompiler problems with whitespace in pathname", posted January 17th 2011
around midnight, French time zone).
Following "aw at ice-sa.com"'s advice on the mailing list, I googled with
"deployment" and found this:
- TC6: In CGI Mode, "executable" full path with spaces does not work
https://issues.apache.org/bugzilla/show_bug.cgi?id=49657
- TC5: Tomcat fails to start on linux if CATALINA_HOME contains a space
https://issues.apache.org/bugzilla/show_bug.cgi?id=43578
- TC5: java.endorsed.dirs is not used when JSP compilation is forked (see
comment #2)
https://issues.apache.org/bugzilla/show_bug.cgi?id=31257#c2
It looks like having spaces ought to be ok.
Note: on Windows, the installation wizard deploys TC into "C:\Program
Files\Apache Software Foundation" which contains many spaces.
### Background
Q: Why not use JDTCompiler?
A: We have at least one "huge" JSP that fails to compile with JDTCompiler
("unresolved compilation error"). When we delete code from this JSP, it
compiles. We could resolve the problem for this specific JSP but we have not
found what makes the boundary between "it compiles" and "it does not compile"
(tried suppressSmap=false, development=false). We can not afford to deploy our
application on a production server with a compiler that might "randomly" fail
on some other JSP. Previous version of our application has always been compiled
with Sun / Oracle JDK: we prefer not to change the compiler brand.
### Build & Platform
Test environment #1:
- OS is Linux 32 bits (Ubuntu 10.04 LTS)
- TC is tomcat-7.0.23
- Files ant.jar + ant-launcher.jar from ant-1.8.2 copied to tomcat lib dir
- File tools.jar copied from JDK to tomcat lib dir
- "javac -version" returns
javac 1.6.0_26
- "java -version" returns
java version "1.6.0_26"
Java(TM) SE Runtime Environment (build 1.6.0_26-b03)
Java HotSpot(TM) Client VM (build 20.1-b02, mixed mode, sharing)
Test environment #2:
- OS is Windows 7 64 bits
- TC is tomcat-7.0.23
- Files ant.jar + ant-launcher.jar from ant-1.8.2 copied to tomcat lib dir
- File tools.jar copied from JDK to tomcat lib dir
- "javac.exe -version" returns
javac 1.7.0
- "java.exe -version" returns
java version "1.7.0"
Java(TM) SE Runtime Environment (build 1.7.0-b147)
Java HotSpot(TM) 64-Bit Server VM (build 21.0-b17, mixed mode)
Note: same results with Windows 2008 R2
### Steps to reproduce
Each test begins this way:
- Extract apache-tomcat-7.0.23.tar.gz to
- Depending on test absolute pathname contains a space or not
- Download apache-ant-1.8.2-bin.tar.gz
- Extract to any temp directory
- Copy apache-ant-1.8.2/lib/ant.jar + apache-ant-1.8.2/lib/ant-launcher.jar to
/lib
- Forget ant (extracted directory can be deleted)
- Copy JDK lib/tools.jar to /lib (mandatory when fork=false, see
below)
- Update original web.xml this way (starting at line 230):
jsp
org.apache.jasper.servlet.JspServlet
fork
false
xpoweredBy
false
compiler
javac1.6
suppressSmap
true
3
- Delete /work to be sure not to run with any previous compilation
results
- Run tomcat with startup.
svn commit: r1232760 - /tomcat/trunk/build.xml
Author: kkolinko
Date: Wed Jan 18 06:49:34 2012
New Revision: 1232760
URL: http://svn.apache.org/viewvc?rev=1232760&view=rev
Log:
Correct typo
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1232760&r1=1232759&r2=1232760&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jan 18 06:49:34 2012
@@ -1653,7 +1653,7 @@ Apache Tomcat ${version} native binaries
-
svn commit: r1232761 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: kkolinko Date: Wed Jan 18 06:54:11 2012 New Revision: 1232761 URL: http://svn.apache.org/viewvc?rev=1232761&view=rev Log: Merged revision 1232760 from tomcat/trunk: Correct typo Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 18 06:54:11 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,11
svn commit: r1232774 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Jan 18 07:54:44 2012 New Revision: 1232774 URL: http://svn.apache.org/viewvc?rev=1232774&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1232774&r1=1232773&r2=1232774&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 18 07:54:44 2012 @@ -98,6 +98,19 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, rjung -1: +* Improvements to Windows installer: + 1. When building a Windows installer do not copy whole "res" folder to + output/dist, but only the files that we need. Make sure that + INSTALLLICENSE file has correct line ends. + 2. Remove res/License.rtf. The file that is actually shown + by the Windows installer is res/INSTALLLICENSE. + + It is backport of r1231779 of Tomcat 7. + 1) Execute command: +svn del res/License.rtf + 2) Patch +http://people.apache.org/~kkolinko/patches/2012-01-18_tc6_LicenseRtf.patch + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
