svn commit: r1668539 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Mar 23 08:28:13 2015 New Revision: 1668539 URL: http://svn.apache.org/r1668539 Log: Change log entry for r1663784 Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1668539&r1=1668538&r2=1668539&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 08:28:13 2015 @@ -68,12 +68,12 @@ 56608: When deploying an external WAR, add watched resources in the expanded directory based on whether the expanded directory is -expected to exist rather than if it does exist. +expected to exist rather than if it does exist. (markt) When triggering a reload due to a modified watched resource, ensure that multiple changed watched resources only trigger one reload rather - than a series of reloads. + than a series of reloads. (markt) Correct a regression in the fix for 57190 that incorrectly @@ -114,6 +114,15 @@ 57675: Correctly quote strings when using the extended access log. (markt) + +Enable Tomcat to detect when a WAR file has been changed while Tomcat is +not running. Tomcat does this by adding a META-INF/war-tracking file to +the expanded directory and settng the last modified time of this file to +the last modified time of the WAR. If Tomcat detects a modified WAR via +this mechanism the web application will be reployed (i.e. the expanded +directory will be removed and the modified WAR expanded in its place). +(markt) + 57704: Fix potential NPEs during web application start/stop when org.apache.tomcat.InstanceManager is not initialized. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668541 - in /tomcat/tc7.0.x/trunk/webapps/docs: changelog.xml deployer-howto.xml
Author: markt Date: Mon Mar 23 08:38:39 2015 New Revision: 1668541 URL: http://svn.apache.org/r1668541 Log: Correct the documentation for deployOnStartup to make clear that if a WAR file is updated while Tomcat is stopped and unpackWARs is true, Tomcat will not detect the changed WAR file when it starts and will not replace the unpacked WAR file with the contents of the updated WAR. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.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=1668541&r1=1668540&r2=1668541&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 08:38:39 2015 @@ -336,6 +336,13 @@ Update examples to use Apache Standard Taglib 1.2.5. (jboynes) + +Correct the documentation for deployOnStartup to make clear that if a +WAR file is updated while Tomcat is stopped and unpackWARs is true, +Tomcat will not detect the changed WAR file when it starts and will not +replace the unpacked WAR file with the contents of the updated WAR. +(markt) + Modified: tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml?rev=1668541&r1=1668540&r2=1668541&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml Mon Mar 23 08:38:39 2015 @@ -165,10 +165,12 @@ Any Context Descriptors will be deployed first. Exploded web applications not referenced by any Context -Descriptor will then be deployed. If they have an associated -.WAR file in the appBase and it is newer than the exploded web application, -the exploded directory will be removed and the webapp will be -redeployed from the .WAR +Descriptor will then be deployed. Note that if an exploded web +application has an associated .WAR file in the appBase, Tomcat +will not detect if the associated .WAR has been updated while +Tomcat was stopped and will deploy the exploded web application +as is. The exploded web application will not be removed and +replaced with the contents of the updated .WAR file. .WAR files will be deployed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668542 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/deployer-howto.xml
Author: markt Date: Mon Mar 23 08:40:21 2015 New Revision: 1668542 URL: http://svn.apache.org/r1668542 Log: CTR: Docs Correct the documentation for deployOnStartup to make clear that if a WAR file is updated while Tomcat is stopped and unpackWARs is true, Tomcat will not detect the changed WAR file when it starts and will not replace the unpacked WAR file with the contents of the updated WAR. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 23 08:40:21 2015 @@ -1,3 +1,3 @@ -/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989 +/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541 /tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988 /tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770 809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265 ,890349-890350,890417,891185-8911
Re: svn commit: r1663784 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ webapps/docs/config/
On 20/03/2015 13:51, Konstantin Kolinko wrote: > 1) I see no changelog entry for this new feature. > > Bugzilla reference: > https://bz.apache.org/bugzilla/show_bug.cgi?id=57251#c31 Added. > 2) A user is asking that this feature is mentioned in Tomcat 7 docs, > as if it is already working > http://tomcat.apache.org/tomcat-7.0-doc/deployer-howto.html#post_3798 > > [quote] > From the "Deployment on Tomcat startup" section: "2. Exploded web > applications not referenced by any Context Descriptor will then be > deployed. >>If they have an associated .WAR file in the appBase and it > is newer than the exploded web application, the exploded directory > will be removed and the webapp will be redeployed from the .WAR<< " > [/quote] > > Tomcat 6 docs also has that phrase. > > For Tomcat 6 the way to go is to fix the docs. > For Tomcat 7 there is a chance to backport this feature. For now, I've fixed the docs for both. I don't plan to back-port this feature. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57736] changes from Tomcat 7 to Tomcat 8 causing problems
https://bz.apache.org/bugzilla/show_bug.cgi?id=57736 Frank Holler changed: What|Removed |Added Resolution|INVALID |--- Status|RESOLVED|REOPENED --- Comment #2 from Frank Holler --- Hi again, i'm sorry to bother you again, but the slight difference between Tomcat 7 and Tomcat 8 causes many support trouble for me. To use unpackWars="true" is a problem for us. As you suggested, unpackWars="true" worked, but unpackWars="false" seems to be broken with Tomcat 8. So i digged a little deeper into the problem. I found out that Tomcat 7 and Tomcat 8 both extract classes and libs from WEB-INF to CATALINA_BASE/work/[app]/, even if unpackWars="false" is set. The difference seems to be that Tomcat 7 delives resource or class loader requests from the "work" direktory. So there is at least a file to open and all things worked fine. The javax.crypto.JarVerifier.verifySingleJar is happy and bouncycastle provider gets registered. With Tomcat 8 the things changed, so the classloader(?) returns an URI to the relativ path within the war instead of the jar in "work". This causes javax.crypto.JarVerifier.verifySingleJar to verify the WAR instead of the jar. The same behavior seems to match for the resource loader, which delived a relative path for our xsd stored within a jar. As Tomcat 7 worked fine i assume that many other webapps would have the same problem, if they running with unpackWars="false" So i beg you, please take a look at this behavior change from Tomcat 7 to Tomcat 8 Kind regards, Frank -- 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
[Bug 57736] changes from Tomcat 7 to Tomcat 8 causing problems
https://bz.apache.org/bugzilla/show_bug.cgi?id=57736 --- Comment #3 from Mark Thomas --- (In reply to Frank Holler from comment #2) > To use unpackWars="true" is a problem for us. Why? > So i digged a little deeper into the problem. > I found out that Tomcat 7 and Tomcat 8 both extract classes and libs from > WEB-INF to CATALINA_BASE/work/[app]/, even if unpackWars="false" is set. That is not correct. Tomcat 8 does not extract JARs or classes to the work directory under any circumstances. One of the options considered to address the performance problems is to restore the extraction of the JARs to the work directory but that creates complexity in an area where we have been trying to reduce it. This is still an option of last resort but my preference - where possible - is to address the reasons why people can't use unpackWARs="true". -- 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
[Bug 57740] New: PDFBox - PDField Font name and size are not changing [COSString.DA]
https://bz.apache.org/bugzilla/show_bug.cgi?id=57740 Bug ID: 57740 Summary: PDFBox - PDField Font name and size are not changing [COSString.DA] Product: Tomcat 6 Version: 6.0.33 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Servlet & JSP API Assignee: dev@tomcat.apache.org Reporter: ganesh25.v...@gmail.com In Apache Pdf Box Form Filling, I am trying to change the default font size of the Text Field (PDField) using following line oFrm.getDictionary().setString(COSName.DA, PDType1Font.COURIER.getBaseFont()); But the output does not set to the font specified above(COURIER), whenever I click on the Text Field It is changing to the Specified Font(COURIER). If I appended any text to the text field, afterwards the text appearance is OK (means set to Specified Font). Please address the problem and try to give your feedback. -- 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
[Bug 57740] PDFBox - PDField Font name and size are not changing [COSString.DA]
https://bz.apache.org/bugzilla/show_bug.cgi?id=57740 GANESAN K changed: What|Removed |Added CC||ganesh25.v...@gmail.com OS||All -- 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 Native 1.1.33
On 20/03/2015 15:53, Christopher Schultz wrote: >> The Apache Tomcat Native 1.1.33 is >> [X] Stable, go ahead and release > I'm having trouble on Mac OS X, though. > > Details: > Builds with lots of OpenSSL-related deprecation warnings on Mac OS X > 10.10.2, clang-600.0.57, Oracle Java 1.8.0_31, APR 1.4.8, and OpenSSL > 0.9.8zc. Seems reasonable if using that version of OpenSSL. > Builds cleanly on Mac OS X 10.10.2, clang-600.0.57, Oracle Java > 1.8.0_31, APR 1.4.8, and OpenSSL 1.0.1j (via brew). > > Builds cleanly on Mac OS X 10.10.2, clang-600.0.57, Oracle Java > 1.8.0_31, APR 1.4.8, and OpenSSL 1.0.2a-1 (via brew). > > I pumped (using 'ab') a couple hundred thousand TLS requests > (concurrency=10) through Tomcat 7.0.x trunk on Linux with no errors. > 70.056ms average localhost response time for a response body of 160001 > bytes. > > I tried to do 100k non-secure requests through Tomcat 8.0.x trunk on Mac > OS, but ab seems to be having a bit of trouble. I'm not sure if it's > tcnative that is the problem, or ab itself. I don't recall if I've ever > really used ab on my laptop for large quantities of requests. Tomcat > logged no errors during this time; ab reported "apr_sock_recv: timed > out" and also "apr_socket_connect: Operation already in progress (37)". I've just done a similar test on my OSX system with no errors at all. I'm using (via MacPorts): - APR 1.5.1 - OpenSSL 1.0.2 - OSX 10.9.5 - clang-600.0.56 - Java 1.7.0_71 Lots of things different there. Given I also tested non-secure requests I think it is safe to assume OpenSSL version is not relevant. The Java version just provides some headers so I don't think that will be relevant. That leaves OS version, APR version and compiler version. I see a couple of OSX related fixed in the APR 1.5.1 change log but I don't know the code well enough to know if they are relevant. My guess is that this is APR version related. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57740] PDFBox - PDField Font name and size are not changing [COSString.DA]
https://bz.apache.org/bugzilla/show_bug.cgi?id=57740 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- PDFBox uses Jira to track issues. See: https://pdfbox.apache.org/support.html -- 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
[Bug 57736] changes from Tomcat 7 to Tomcat 8 causing problems
https://bz.apache.org/bugzilla/show_bug.cgi?id=57736 --- Comment #4 from Frank Holler --- (In reply to Mark Thomas from comment #3) > (In reply to Frank Holler from comment #2) > > To use unpackWars="true" is a problem for us. > > Why? > > > So i digged a little deeper into the problem. > > I found out that Tomcat 7 and Tomcat 8 both extract classes and libs from > > WEB-INF to CATALINA_BASE/work/[app]/, even if unpackWars="false" is set. > > That is not correct. Tomcat 8 does not extract JARs or classes to the work > directory under any circumstances. > > One of the options considered to address the performance problems is to > restore the extraction of the JARs to the work directory but that creates > complexity in an area where we have been trying to reduce it. This is still > an option of last resort but my preference - where possible - is to address > the reasons why people can't use unpackWARs="true". You're rigt, my fault. i did not clean up the work directory after changing form unpackWars="true" to "false". So the remaining files was leftover from the last restart. The reason why we don't use unpackWars="true" is, that the unpacked directory won't get updated, if the war changes. For security reasons we (and our customers) don't deploy the "manager" or any other webapp, only our war. So the deployment process with unpackWars="false" is: 1.) drop the new war into webapps 2.) restart tomcat With unpackWars="true" and without using "manager"-app the steps to update would be: 1.) stop tomcat 2.) delete the unpacked folder => otherwise it won't work!!! 3.) drop the new war into webapps 4.) start tomcat again To check, if this behavior changed with tomcat 8 we did the following: Our webapp version 2.6.6 is deployed with unpackwars="true", the unpacked folder exists. Afterwards we replaced the WAR with version 2.6.7 and restart tomcat. As any version before, the unpacked directory wasn't updated, so the version 2.6.6 is started again, the new war with version 2.6.7 is ignored. After this problem occured often, we told our customers to set unpackWars="false", so our customers (and our support of course) has less problems when delvierung updates of our app. So perhaps you understand, why we won't like to tell our customers to change unpackWars back when updating to tomcat 8. I understand, that a revert of the changes isn't easy, but for my opinion, unpackWars="false" isn't usable with tomcat 8 any more without refactoring many of our logic to bypass the new loader behavior. The problem is, that we don't know, which of the used libs also have a problem (like com.mycila.xmltool), so we would be happy, if the behavior of tomcat 8 keeps compatible tomcat 7. Kind regards, Frank -- 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: r1668582 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/
Author: markt
Date: Mon Mar 23 10:09:42 2015
New Revision: 1668582
URL: http://svn.apache.org/r1668582
Log:
Refactoring.
Ensure all the constants are in the Constants class
Remove PACKAGE_NAME constant.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java?rev=1668582&r1=1668581&r2=1668582&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java
Mon Mar 23 10:09:42 2015
@@ -37,7 +37,7 @@ import org.apache.tomcat.util.threads.Th
public class AsyncChannelGroupUtil {
private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
+StringManager.getManager(AsyncChannelGroupUtil.class);
private static AsynchronousChannelGroup group = null;
private static int usageCount = 0;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1668582&r1=1668581&r2=1668582&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
Mon Mar 23 10:09:42 2015
@@ -51,7 +51,7 @@ public class AsyncChannelWrapperSecure i
private static final Log log =
LogFactory.getLog(AsyncChannelWrapperSecure.class);
private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
+StringManager.getManager(AsyncChannelWrapperSecure.class);
private static final ByteBuffer DUMMY = ByteBuffer.allocate(8192);
private final AsynchronousSocketChannel socketChannel;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java?rev=1668582&r1=1668581&r2=1668582&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
Mon Mar 23 10:09:42 2015
@@ -34,7 +34,7 @@ public class BackgroundProcessManager {
private static final Log log =
LogFactory.getLog(BackgroundProcessManager.class);
private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
+StringManager.getManager(BackgroundProcessManager.class);
private static final BackgroundProcessManager instance;
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1668582&r1=1668581&r2=1668582&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Mon Mar 23
10:09:42 2015
@@ -27,8 +27,6 @@ import javax.websocket.Extension;
*/
public class Constants {
-protected static final String PACKAGE_NAME =
-Constants.class.getPackage().getName();
// OP Codes
public static final byte OPCODE_CONTINUATION = 0x00;
public static final byte OPCODE_TEXT = 0x01;
@@ -48,6 +46,34 @@ public class Constants {
.intValue();
// Client connection
svn commit: r1668583 - in /tomcat/trunk/java/org/apache/tomcat/websocket/pojo: Constants.java PojoEndpointBase.java PojoEndpointServer.java PojoMessageHandlerWholeBinary.java PojoMessageHandlerWholeTe
Author: markt
Date: Mon Mar 23 10:13:20 2015
New Revision: 1668583
URL: http://svn.apache.org/r1668583
Log:
Refactoring.
Ensure all the constants are in the Constants class
Remove PACKAGE_NAME constant.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java Mon Mar
23 10:13:20 2015
@@ -21,8 +21,10 @@ package org.apache.tomcat.websocket.pojo
*/
public class Constants {
-protected static final String PACKAGE_NAME =
-Constants.class.getPackage().getName();
+public static final String POJO_PATH_PARAM_KEY =
+"org.apache.tomcat.websocket.pojo.PojoEndpoint.pathParams";
+public static final String POJO_METHOD_MAPPING_KEY =
+"org.apache.tomcat.websocket.pojo.PojoEndpoint.methodMapping";
private Constants() {
// Hide default constructor
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
Mon Mar 23 10:13:20 2015
@@ -40,8 +40,7 @@ import org.apache.tomcat.util.res.String
public abstract class PojoEndpointBase extends Endpoint {
private static final Log log = LogFactory.getLog(PojoEndpointBase.class);
-private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
+private static final StringManager sm =
StringManager.getManager(PojoEndpointBase.class);
private Object pojo;
private Map pathParameters;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
Mon Mar 23 10:13:20 2015
@@ -32,13 +32,7 @@ import org.apache.tomcat.util.res.String
public class PojoEndpointServer extends PojoEndpointBase {
private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
-
-public static final String POJO_PATH_PARAM_KEY =
-"org.apache.tomcat.websocket.pojo.PojoEndpoint.pathParams";
-public static final String POJO_METHOD_MAPPING_KEY =
-"org.apache.tomcat.websocket.pojo.PojoEndpoint.methodMapping";
-
+StringManager.getManager(PojoEndpointServer.class);
@Override
public void onOpen(Session session, EndpointConfig endpointConfig) {
@@ -59,12 +53,12 @@ public class PojoEndpointServer extends
@SuppressWarnings("unchecked")
Map pathParameters =
(Map) sec.getUserProperties().get(
-POJO_PATH_PARAM_KEY);
+Constants.POJO_PATH_PARAM_KEY);
setPathParameters(pathParameters);
PojoMethodMapping methodMapping =
(PojoMethodMapping) sec.getUserProperties().get(
-POJO_METHOD_MAPPING_KEY);
+Constants.POJO_METHOD_MAPPING_KEY);
setMethodMapping(methodMapping);
doOnOpen(session, endpointConfig);
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java?rev=1668583&r1=1668582&r2=1668583&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandler
svn commit: r1668584 - in /tomcat/trunk/java/org/apache/tomcat/websocket/server: Constants.java UriTemplate.java WsHttpUpgradeHandler.java WsRemoteEndpointImplServer.java WsServerContainer.java
Author: markt
Date: Mon Mar 23 10:18:34 2015
New Revision: 1668584
URL: http://svn.apache.org/r1668584
Log:
Refactoring.
Remove PACKAGE_NAME constant.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java Mon Mar
23 10:18:34 2015
@@ -21,9 +21,6 @@ package org.apache.tomcat.websocket.serv
*/
public class Constants {
-protected static final String PACKAGE_NAME =
-Constants.class.getPackage().getName();
-
public static final String BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.binaryBufferSize";
public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java Mon
Mar 23 10:18:34 2015
@@ -34,8 +34,7 @@ import org.apache.tomcat.util.res.String
*/
public class UriTemplate {
-private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
+private static final StringManager sm =
StringManager.getManager(UriTemplate.class);
private final String normalized;
private final List segments = new ArrayList<>();
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Mon Mar 23 10:18:34 2015
@@ -46,10 +46,8 @@ import org.apache.tomcat.websocket.WsSes
*/
public class WsHttpUpgradeHandler implements InternalHttpUpgradeHandler {
-private static final Log log =
-LogFactory.getLog(WsHttpUpgradeHandler.class);
-private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
+private static final Log log =
LogFactory.getLog(WsHttpUpgradeHandler.class);
+private static final StringManager sm =
StringManager.getManager(WsHttpUpgradeHandler.class);
private final ClassLoader applicationClassLoader;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Mon Mar 23 10:18:34 2015
@@ -39,7 +39,7 @@ import org.apache.tomcat.websocket.WsRem
public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase {
private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
+StringManager.getManager(WsRemoteEndpointImplServer.class);
private static final Log log =
LogFactory.getLog(WsHttpUpgradeHandler.class);
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Mon Mar 23 10:18:34 2015
@@ -70,8 +70,7 @@ import org.apach
[Bug 57736] changes from Tomcat 7 to Tomcat 8 causing problems
https://bz.apache.org/bugzilla/show_bug.cgi?id=57736 --- Comment #5 from Mark Thomas --- (In reply to Frank Holler from comment #4) > The reason why we don't use unpackWars="true" is, that the unpacked > directory won't get updated, if the war changes. For security reasons we > (and our customers) don't deploy the "manager" or any other webapp, only our > war. > > So the deployment process with unpackWars="false" is: > 1.) drop the new war into webapps > 2.) restart tomcat You must have also set autoDeploy="false" otherwise dropping an updated WAR into a running Tomcat instance would trigger a redploy. > With unpackWars="true" and without using "manager"-app the steps to update > would be: > 1.) stop tomcat > 2.) delete the unpacked folder => otherwise it won't work!!! > 3.) drop the new war into webapps > 4.) start tomcat again Not the case as of Tomcat 8.0.21. On restart, Tomcat will now detect the updated WAR, delete the expanded directory and expand the updated WAR (assuming deployOnStartup="true"). > I understand, that a revert of the changes isn't easy, but for my opinion, > unpackWars="false" isn't usable with tomcat 8 any more without refactoring > many of our logic to bypass the new loader behavior. > The problem is, that we don't know, which of the used libs also have a > problem (like com.mycila.xmltool), so we would be happy, if the behavior of > tomcat 8 keeps compatible tomcat 7. Tomcat's general policy for adding workarounds for bugs in other projects is that we won't do it. Fixing the issue at the source means the fix is more widely available and we have more time to spend on Tomcat bugs and new feature requests. We do make occasional exceptions - usually when the bug is likely to affect a large proportion of the Tomcat user based and the 3rd party vendor has indicated that they have no intention of fixing the bug. The new ability to detect an updated WAR while Tomcat has stopped looks to be sufficient to remove the need for your application to run with unpackWARs="false". The behaviour of javax.crypto with an unpacked WAR is a concern although we don't see as much bouncy castle usage as we used to. The issue with com.mycila.xmltool falls into the category that we'd expect the vendor to fix. As per the discussion on bug 57251 and as stated above, the preference remains to fix issues people have with unpackWARs="true". I haven't seen anything in this issue that explains why - as of 8.0.21 - running with unpackWARs="true" is not a viable option for you. -- 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
Time for 8.0.21
So much for my plan to do this at the beginning of the month. I plan to tag 8.0.21 just as soon as the release vote for Tomcat Native 1.1.33 passes (or if that vote fails once we have an updated Tomcat Native with Windows binaries built with the latest OpenSSL 1.0.1 release). Hopefully, 8.0.x will be tagged sometime today. Mark P.S. tc-native 1.1.33 needs one more vote - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668593 - /tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
Author: markt
Date: Mon Mar 23 11:30:22 2015
New Revision: 1668593
URL: http://svn.apache.org/r1668593
Log:
Correct comment
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1668593&r1=1668592&r2=1668593&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Mon Mar 23
11:30:22 2015
@@ -95,9 +95,8 @@ public class ExpandWar {
// Check to see of the WAR has been expanded previously
if (docBase.exists()) {
// A WAR was expanded. Tomcat will have set the last modified
-// time of the expanded directory to the last modified time of
-// the WAR so changes to the WAR while Tomcat is stopped can be
-// detected
+// time of warTracker file to the last modified time of the WAR so
+// changes to the WAR while Tomcat is stopped can be detected
if (!warTracker.exists() || warTracker.lastModified() ==
warLastModified) {
// No (detectable) changes to the WAR
success = true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668594 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ExpandWar.java
Author: markt Date: Mon Mar 23 11:30:57 2015 New Revision: 1668594 URL: http://svn.apache.org/r1668594 Log: Correct comment Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 23 11:30:57 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,16
svn commit: r1668596 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/WebappServiceLoader.java test/org/apache/catalina/startup/TestWebappServic
Author: violetagg
Date: Mon Mar 23 11:37:28 2015
New Revision: 1668596
URL: http://svn.apache.org/r1668596
Log:
When searching for SCIs use Context.getParentClassLoader instead of
ClassLoader.getParent.
Thus one can provide the correct parent class loader when running embedded
Tomcat in other environments such as OSGi.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
tomcat/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1668596&r1=1668595&r2=1668596&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Mar 23
11:37:28 2015
@@ -1124,7 +1124,7 @@ public class ContextConfig implements Li
// Step 3. Look for ServletContainerInitializer implementations
if (ok) {
-processServletContainerInitializers(sContext);
+processServletContainerInitializers();
}
if (!webXml.isMetadataComplete() || typeInitializerMap.size() > 0) {
@@ -1607,12 +1607,11 @@ public class ContextConfig implements Li
/**
* Scan JARs for ServletContainerInitializer implementations.
*/
-protected void processServletContainerInitializers(ServletContext
servletContext) {
+protected void processServletContainerInitializers() {
List detectedScis;
try {
-WebappServiceLoader loader =
-new WebappServiceLoader<>(servletContext,
context.getContainerSciFilter());
+WebappServiceLoader loader = new
WebappServiceLoader<>(context);
detectedScis = loader.load(ServletContainerInitializer.class);
} catch (IOException e) {
log.error(sm.getString(
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java?rev=1668596&r1=1668595&r2=1668596&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java Mon
Mar 23 11:37:28 2015
@@ -33,6 +33,8 @@ import java.util.regex.Pattern;
import javax.servlet.ServletContext;
+import org.apache.catalina.Context;
+
/**
* A variation of Java's JAR ServiceLoader that respects exclusion rules for
* web applications.
@@ -56,7 +58,8 @@ public class WebappServiceLoader {
private static final String LIB = "/WEB-INF/lib/";
private static final String SERVICES = "META-INF/services/";
-private final ServletContext context;
+private final Context context;
+private final ServletContext servletContext;
private final Pattern containerSciFilterPattern;
/**
@@ -64,8 +67,10 @@ public class WebappServiceLoader {
*
* @param context the context to use
*/
-public WebappServiceLoader(ServletContext context, String
containerSciFilter) {
+public WebappServiceLoader(Context context) {
this.context = context;
+this.servletContext = context.getServletContext();
+String containerSciFilter = context.getContainerSciFilter();
if (containerSciFilter != null && containerSciFilter.length() > 0) {
containerSciFilterPattern = Pattern.compile(containerSciFilter);
} else {
@@ -86,17 +91,17 @@ public class WebappServiceLoader {
LinkedHashSet applicationServicesFound = new LinkedHashSet<>();
LinkedHashSet containerServicesFound = new LinkedHashSet<>();
-ClassLoader loader = context.getClassLoader();
+ClassLoader loader = servletContext.getClassLoader();
// if the ServletContext has ORDERED_LIBS, then use that to specify the
// set of JARs from WEB-INF/lib that should be used for loading
services
@SuppressWarnings("unchecked")
List orderedLibs =
-(List)
context.getAttribute(ServletContext.ORDERED_LIBS);
+(List)
servletContext.getAttribute(ServletContext.ORDERED_LIBS);
if (orderedLibs != null) {
// handle ordered libs directly, ...
for (String lib : orderedLibs) {
-URL jarUrl = context.getResource(LIB + lib);
+URL jarUrl = servletContext.getResource(LIB + lib);
if (jarUrl == null) {
// should not happen, just ignore
continue;
@@ -117,7 +122,7 @@ public class WebappServiceLoader {
}
// and the par
svn commit: r1668606 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/WebappServiceLoader.java test/org/apache/catalina/startup/TestW
Author: violetagg Date: Mon Mar 23 11:51:09 2015 New Revision: 1668606 URL: http://svn.apache.org/r1668606 Log: Merged revision 1668596 from tomcat/trunk: When searching for SCIs use Context.getParentClassLoader instead of ClassLoader.getParent. Thus one can provide the correct parent class loader when running embedded Tomcat in other environments such as OSGi. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 23 11:51:09 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,164453
[Bug 57741] New: Add support for error-pages to CGIServlet
https://bz.apache.org/bugzilla/show_bug.cgi?id=57741 Bug ID: 57741 Summary: Add support for error-pages to CGIServlet Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: enhancement Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: jdh5...@gmail.com Created attachment 32591 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32591&action=edit Patch for applying the enchancement described in the report. Adds a new init-param to the servlet configuration which will be used to trigger the error-page mechanism. A configuration parameter has been added to the CGIServlet to allow use of the error-page mechanism. Default configuration will maintain current functionality. Currently, when the debug logging level is too low and there is an error executing the CGI script, a blank page is returned even if the corresponding error-page is configured correctly. This causes inconsistency with custom error-pages. -- 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: r1668609 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Mar 23 12:08:52 2015 New Revision: 1668609 URL: http://svn.apache.org/r1668609 Log: Add issue number for r1662178 for better reference. BZ 57645 was filed later than the fix was committed. Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1668609&r1=1668608&r2=1668609&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 12:08:52 2015 @@ -76,12 +76,6 @@ than a series of reloads. (markt) -Correct a regression in the fix for 57190 that incorrectly -required the path passed to -ServletContext.getContext(String) to be an exact match to a -path to an existing context. (markt) - - 57601: Ensure that HEAD requests return the correct content length (i.e. the same as for a GET) when the requested resource includes a resource served by the Default servlet. (jboynes/markt) @@ -101,6 +95,12 @@ (jboynes/fschumacher) +57645: Correct a regression in the fix for +57190 that incorrectly required the path passed to +ServletContext.getContext(String) to be an exact match to a +path to an existing context. (markt) + + Make sure that unpackWAR attribute of Context is handled correctly in HostConfig. (kfujino) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668615 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Mar 23 12:22:11 2015 New Revision: 1668615 URL: http://svn.apache.org/r1668615 Log: Add issue number for r1662179 for better reference. BZ 57645 was filed later than the fix was committed. 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=1668615&r1=1668614&r2=1668615&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 12:22:11 2015 @@ -116,12 +116,6 @@ than a series of reloads. -Correct a regression in the fix for 57190 that incorrectly -required the path passed to -ServletContext.getContext(String) to be an exact match to a -path to an existing context. (markt) - - 57601: Ensure that HEAD requests return the correct content length (i.e. the same as for a GET) when the requested resource includes a resource served by the Default servlet. (jboynes/markt) @@ -141,6 +135,12 @@ PersistentValve. (jboynes/fschumacher) +57645: Correct a regression in the fix for +57190 that incorrectly required the path passed to +ServletContext.getContext(String) to be an exact match to a +path to an existing context. (markt) + + Make sure that unpackWAR attribute of Context is handled correctly in HostConfig. (kfujino) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.33
2015-03-19 19:52 GMT+03:00 Mark Thomas : > Version 1.1.33 includes the following changes: > - Windows binaries built with APR 1.5.1 and OpenSSL 1.0.1m > - Fix BZ57653: Crash when multiple events for same socket are > returned via separate apr_pollfd_t structures. > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.1.33 is > [x] Stable, go ahead and release > [ ] Broken because of ... Testsuite tests for APR connector completed successfully, for current Tomcat trunk (@r1668555), Tomcat 8 (@r1668559), Tomcat 7 (@r1668555). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT][VOTE] Release Apache Tomcat Native 1.1.33
Binding: +1: markt, schultz, kkolinko No other votes were cast. The vote therefore passes. Thanks to everyone who provided feedback during the vote. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r8388 - /dev/tomcat/tomcat-connectors/native/1.1.33/ /release/tomcat/tomcat-connectors/native/ /release/tomcat/tomcat-connectors/native/1.1.33/ /release/tomcat/tomcat-connectors/native/1.1
Author: markt Date: Mon Mar 23 12:41:16 2015 New Revision: 8388 Log: tomcat native 1.1.33 release vote passed Added: release/tomcat/tomcat-connectors/native/1.1.33/ - copied from r8338, dev/tomcat/tomcat-connectors/native/1.1.33/ release/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip release/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.asc - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.asc release/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.md5 - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.md5 release/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.sha1 - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.sha1 release/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip release/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.asc - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.asc release/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.md5 - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.md5 release/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.sha1 - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.sha1 release/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.md5 - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.md5 release/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.sha1 - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.sha1 release/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.md5 - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.md5 release/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.sha1 - copied unchanged from r8350, dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.sha1 Removed: dev/tomcat/tomcat-connectors/native/1.1.33/ Modified: release/tomcat/tomcat-connectors/native/README.html Modified: release/tomcat/tomcat-connectors/native/README.html == --- release/tomcat/tomcat-connectors/native/README.html (original) +++ release/tomcat/tomcat-connectors/native/README.html Mon Mar 23 12:41:16 2015 @@ -1,5 +1,5 @@ The Apache Tomcat Native -Current release version is 1.1.32. +Current release version is 1.1.33. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r8389 - in /release/tomcat: taglibs/taglibs-standard-1.2.1/ tomcat-8/v8.0.18/
Author: markt Date: Mon Mar 23 12:42:30 2015 New Revision: 8389 Log: Prune some old binaries Removed: release/tomcat/taglibs/taglibs-standard-1.2.1/ release/tomcat/tomcat-8/v8.0.18/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56390] Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=56390 Pavel Avgustinov changed: What|Removed |Added CC||pa...@semmle.com -- 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: r1668622 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/WebappServiceLoader.java test/org/apache/catalina/startup/TestW
Author: violetagg Date: Mon Mar 23 12:54:23 2015 New Revision: 1668622 URL: http://svn.apache.org/r1668622 Log: Merged revision 1668596 from tomcat/trunk: When searching for SCIs use Context.getParentClassLoader instead of ClassLoader.getParent. Thus one can provide the correct parent class loader when running embedded Tomcat in other environments such as OSGi. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestWebappServiceLoader.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 23 12:54:23 2015 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1
[Bug 57743] New: Jar files in /WEB-INF/lib are kept open, preventing redeploy
https://bz.apache.org/bugzilla/show_bug.cgi?id=57743 Bug ID: 57743 Summary: Jar files in /WEB-INF/lib are kept open, preventing redeploy Product: Tomcat 8 Version: 8.0.20 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: pa...@semmle.com Created attachment 32592 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32592&action=edit A patch against AbstractResourceSet.java, adding a call to gc() when it is destroyed. As described in 56390, keeping jar files in a webapp folder open will prevent the application from being undeployed/redeployed on file systems which don't like open files to be deleted (in practice, that seems to mean Windows-based systems or NFS mounts). Having observed the problem with tomcat 8.0.20, which is meant to contain the fix for 56390, I believe I have uncovered the root cause. Here's what happens, in my scenario: - A new .war is copied into $CATALINA_HOME/webapps; this is picked up by `HostConfig.checkResources()`, which decides to redeploy the app. - To do this, it first undeploys it (HostConfig.java:1250 in the TOMCAT_8_0_20 tag), and then attempts to delete the exploded war (line 1251). - In my case, the undeploy triggered a servlet's `destroy()` method, which triggered some class loading from WEB-INF/lib. Thus, the context's `WebResourceRoot` was used immediately before the attempt to delete the webapp folder, and opened a jar file. - Even though the `JarInputStreamWrapper` was properly closed, the handle to the jar remains open -- by design of `AbstractArchiveResource`, it is not closed immediately but with the next periodically scheduled call to `gc()`, as part of `StandardRoot.backgroundProcess()`. As a result, when $CATALINA_HOME is on an NFS mount tomcat fails to delete the exploded webapp directory, and things go bad. The attached patch fixes the problem in my testing; it simply changes `AbstractResourceSet.destroyInternal()` so that instead of doing nothing it calls `gc()`, which will close any jar files which no longer have open input streams. This seems like it's necessary to avoid a resource leak even on systems that allow the deletion of open files, since if I'm not mistaken after the context has been detached it will no longer receive `gc()` calls from the background process thread. -- 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: r1668623 - in /tomcat/trunk/java/org/apache/coyote/http2: HPackHuffman.java Hpack.java HpackDecoder.java HpackEncoder.java HpackException.java
Author: markt
Date: Mon Mar 23 13:05:36 2015
New Revision: 1668623
URL: http://svn.apache.org/r1668623
Log:
Fix the Javadoc warnings
Modified:
tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java
tomcat/trunk/java/org/apache/coyote/http2/Hpack.java
tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
tomcat/trunk/java/org/apache/coyote/http2/HpackEncoder.java
tomcat/trunk/java/org/apache/coyote/http2/HpackException.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java?rev=1668623&r1=1668622&r2=1668623&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java Mon Mar 23
13:05:36 2015
@@ -364,14 +364,18 @@ public class HPackHuffman {
}
/**
- * Decodes a huffman encoded string into the target StringBuilder. There
must be enough space left in the buffer
- * for this method to succeed.
+ * Decodes a huffman encoded string into the target StringBuilder. There
+ * must be enough space left in the buffer for this method to succeed.
*
* @param data The byte buffer
- * @param length The data length
+ * @param length The length of data from the buffer to decode
* @param target The target for the decompressed data
+ *
+ * @throws HpackException If the Huffman encoded value in HPACK headers did
+ *not end with EOS padding
*/
-public static void decode(ByteBuffer data, int length, StringBuilder
target) throws HpackException {
+public static void decode(ByteBuffer data, int length, StringBuilder
target)
+throws HpackException {
assert data.remaining() >= length;
int treePos = 0;
boolean eosBits = true;
@@ -404,14 +408,16 @@ public class HPackHuffman {
}
}
if (!eosBits) {
-throw new
HpackException(sm.getString("hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS"));
+throw new HpackException(sm.getString(
+"hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS"));
}
}
/**
- * Encodes the given string into the buffer. If there is not enough space
in the buffer, or the encoded
- * version is bigger than the original it will return false and not modify
the buffers position
+ * Encodes the given string into the buffer. If there is not enough space
in
+ * the buffer, or the encoded version is bigger than the original it will
+ * return false and not modify the buffers position.
*
* @param buffer The buffer to encode into
* @param toEncode The string to encode
Modified: tomcat/trunk/java/org/apache/coyote/http2/Hpack.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Hpack.java?rev=1668623&r1=1668622&r2=1668623&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Hpack.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Hpack.java Mon Mar 23 13:05:36
2015
@@ -159,7 +159,8 @@ final class Hpack {
int m = 0;
do {
if(count++ > MAX_INTEGER_OCTETS) {
-throw new
HpackException(sm.getString("hpack.integerEncodedOverTooManyOctets",
MAX_INTEGER_OCTETS));
+throw new
HpackException(sm.getString("hpack.integerEncodedOverTooManyOctets",
+Integer.valueOf(MAX_INTEGER_OCTETS)));
}
if (source.remaining() == 0) {
//we have run out of data
Modified: tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java?rev=1668623&r1=1668622&r2=1668623&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java Mon Mar 23
13:05:36 2015
@@ -73,11 +73,13 @@ public class HpackDecoder {
}
/**
- * Decodes the provided frame data. If this method leaves data in the
buffer then
- * this buffer should be compacted so this data is preserved, unless there
is no
- * more data in which case this should be considered a protocol error.
+ * Decodes the provided frame data. If this method leaves data in the
buffer
+ * then this buffer should be compacted so this data is preserved, unless
+ * there is no more data in which case this should be considered a
protocol error.
*
* @param buffer The buffer
+ *
+ * @throws HpackException If the packed data is not valid
svn commit: r1668626 - /tomcat/trunk/java/org/apache/coyote/http2/HpackException.java
Author: markt
Date: Mon Mar 23 13:06:17 2015
New Revision: 1668626
URL: http://svn.apache.org/r1668626
Log:
Fix Javadoc error
Modified:
tomcat/trunk/java/org/apache/coyote/http2/HpackException.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/HpackException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HpackException.java?rev=1668626&r1=1668625&r2=1668626&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HpackException.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HpackException.java Mon Mar 23
13:06:17 2015
@@ -17,9 +17,8 @@
package org.apache.coyote.http2;
/**
- * Exception that is thrown when the HPACK compress context is broken.
- *
- * In this case the connection must be closed.
+ * Exception that is thrown when the HPACK compress context is broken. In this
+ * case the connection must be closed.
*/
public class HpackException extends Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668630 - in /tomcat/trunk: build.properties.default java/org/apache/catalina/core/AprLifecycleListener.java
Author: markt
Date: Mon Mar 23 13:08:38 2015
New Revision: 1668630
URL: http://svn.apache.org/r1668630
Log:
Update tc-native to 1.1.33 and make this the minimum recommended version due to
the potential crash on OS X, FreeBSD and possibly other platforms.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1668630&r1=1668629&r2=1668630&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Mar 23 13:08:38 2015
@@ -151,7 +151,7 @@ npn.jar=${npn.home}/npn-${npn.version}.j
npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.32
+tomcat-native.version=1.1.33
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1668630&r1=1668629&r2=1668630&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Mon
Mar 23 13:08:38 2015
@@ -69,7 +69,7 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MINOR = 1;
protected static final int TCN_REQUIRED_PATCH = 32;
protected static final int TCN_RECOMMENDED_MINOR = 1;
-protected static final int TCN_RECOMMENDED_PV = 32;
+protected static final int TCN_RECOMMENDED_PV = 33;
// -- Properties
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668632 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Mon Mar 23 13:15:10 2015 New Revision: 1668632 URL: http://svn.apache.org/r1668632 Log: Fix typos in changelog Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1668632&r1=1668631&r2=1668632&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 13:15:10 2015 @@ -117,9 +117,9 @@ Enable Tomcat to detect when a WAR file has been changed while Tomcat is not running. Tomcat does this by adding a META-INF/war-tracking file to -the expanded directory and settng the last modified time of this file to +the expanded directory and setting the last modified time of this file to the last modified time of the WAR. If Tomcat detects a modified WAR via -this mechanism the web application will be reployed (i.e. the expanded +this mechanism the web application will be redeployed (i.e. the expanded directory will be removed and the modified WAR expanded in its place). (markt) @@ -169,7 +169,7 @@ Fix a cipher ordering issue when using the OpenSSL syntax for JSSE cipher configuration to ensure that ephemeral ECDH with AES is preferred -to ephemeral ECDH with anthing else. (markt) +to ephemeral ECDH with anything else. (markt) 57570: Make the processing of trailer headers with chunked @@ -411,7 +411,7 @@ Fix several bugs that could cause multiple registrations for write events for a single socket when using Servlet 3.0 async. Typically, the -side effects of these mutltiple registrations would be exceptions +side effects of these multiple registrations would be exceptions appearing in the logs. (markt) @@ -435,7 +435,7 @@ When applying the maxSwallowSize limit to a connection read that many bytes first before closing the connection to give the client a -chance to read the reponse. (markt) +chance to read the response. (markt) Prevent an async timeout being processed multiple times for the same @@ -446,7 +446,7 @@ object to be long to allow values above 2Gb. (kkolinko) -Use the data that supports cipher defintion using OpenSSL syntax to +Use the data that supports cipher definition using OpenSSL syntax to improve the quality of values provided for the javax.servlet.request.key_size request attribute. (markt) @@ -913,7 +913,7 @@ 57338: Improve the ability of the ClusterSingleSignOn valve to handle nodes being added and -removed from the Cluser at run time. (markt) +removed from the Cluster at run time. (markt) @@ -1093,7 +1093,7 @@ remove sessions from the store when persisting them. (markt) -Deprecate the use of system proprties to control cookie parsing and +Deprecate the use of system properties to control cookie parsing and replace them with attributes on the new CookieProcessor that may be configured on a per context basis. (markt) @@ -1278,7 +1278,7 @@ 57153: Correctly scan for TLDs located in directories that -represent exanded JARs files that have been added to the web application +represent expanded JARs files that have been added to the web application class loader's class path. (markt) @@ -1571,7 +1571,7 @@ Schumacher. (violetagg) -Fix a potential resource leak in JDTCompiler when checking wether +Fix a potential resource leak in JDTCompiler when checking whether a resource is a package. Reported by Coverity Scan. (fschumacher) @@ -1661,7 +1661,7 @@ -When building a list of JSSE ciphers from an OpenSSL cipher defintiion, +When building a list of JSSE ciphers from an OpenSSL cipher definition, ignore unknown criteria rather than throwing a NullPointerException. (markt) @@ -2110,7 +2110,7 @@ 56685: Add quotes necessary for daemon.sh to -work correctly on Solaris. Based on a suggesiton by lfuka. (markt) +work correctly on Solaris. Based on a suggestion by lfuka. (markt) Update package renamed Apache Commons Pool2 to r1609323 to pick various @@ -3579,7 +3579,7 @@ 55166: Move the JSP descriptor and tag library descriptor -schema defintion files from jsp-api.jar to servlet-api.jar so relative +schema defini
svn commit: r1668634 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: markt Date: Mon Mar 23 13:30:46 2015 New Revision: 1668634 URL: http://svn.apache.org/r1668634 Log: Update tc-native to 1.1.33 and make this the minimum recommended version due to the potential crash on OS X, FreeBSD and possibly other platforms. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/build.properties.default tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 23 13:30:46 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,
svn commit: r1668635 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: markt Date: Mon Mar 23 13:32:19 2015 New Revision: 1668635 URL: http://svn.apache.org/r1668635 Log: Update tc-native to 1.1.33 and make this the minimum recommended version due to the potential crash on OS X, FreeBSD and possibly other platforms. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 23 13:32:19 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590
svn commit: r1668636 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Mon Mar 23 13:45:46 2015 New Revision: 1668636 URL: http://svn.apache.org/r1668636 Log: Fix typos in 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=1668636&r1=1668635&r2=1668636&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 13:45:46 2015 @@ -92,7 +92,7 @@ Content-Type request header. (markt) -Ensure that user name chekcing in the optional SecurityListener is +Ensure that user name checking in the optional SecurityListener is case-insensitive (as documented) and than the case-insensitive comparison is performed using the system default Locale. (markt) @@ -217,7 +217,7 @@ When applying the maxSwallowSize limit to a connection read that many bytes first before closing the connection to give the client a -chance to read the reponse. (markt) +chance to read the response. (markt) Prevent an async timeout being processed multiple times for the same @@ -1139,7 +1139,7 @@ if this technique is used in conjunction with an include. (markt) -Fix a potential resource leak in JDTCompiler when checking wether +Fix a potential resource leak in JDTCompiler when checking whether a resource is a package. Reported by Coverity Scan. (fschumacher) @@ -1488,7 +1488,7 @@ 56685: Add quotes necessary for daemon.sh to -work correctly on Solaris. Based on a suggesiton by lfuka. (markt) +work correctly on Solaris. Based on a suggestion by lfuka. (markt) 56596: Update to Tomcat Native Library version 1.1.31 to pick @@ -2956,7 +2956,7 @@ (kfujino) -55331: Dispatching to an asychronous servlet from +55331: Dispatching to an asynchronous servlet from AsyncListener.onTimeout() should not trigger an IllegalStateException. (markt) @@ -3450,7 +3450,7 @@ -Update Maven Cental location used to download dependencies at build time +Update Maven Central location used to download dependencies at build time to be repo.maven.apache.org. (kkolinko) @@ -3688,7 +3688,7 @@ are not permitted in scriptlets. (kkolinko/markt) -54821: Do not attept to parse text that looks like an EL +54821: Do not attempt to parse text that looks like an EL expressions in a JSP document if EL expressions have been disabled. (kkolinko/markt) @@ -5513,8 +5513,8 @@ 53403: Update a reference to the Servlet specification in the -first web applciation section of the documentation web application to -include newer versions of the specificarion. (markt) +first web application section of the documentation web application to +include newer versions of the specification. (markt) @@ -6243,7 +6243,7 @@ 52445: Don't assume that EL method expressions have -exactly three components (identifier, method name, paramaters). (markt) +exactly three components (identifier, method name, parameters). (markt) @@ -6251,7 +6251,7 @@ 38216: Add the ability to invoke MBean operations to the JMX -proxy sevrlet in the Manager application. Based on a patch by +proxy servlet in the Manager application. Based on a patch by Christopher Hlubek. (markt) @@ -6330,7 +6330,7 @@ plain text. Patch provided by M Hasko. (markt/kkolinko) -Fix build condition for tomcat-dbcp to always rebuild whan a new version +Fix build condition for tomcat-dbcp to always rebuild when a new version of commons-pool or commons-dbcp is downloaded. (kkolinko) @@ -7113,7 +7113,7 @@ 41709: Provide exception messages where no message is provided currently for IllegalStateExcpetions triggered by calling -HttpServletResponse methods when the reponse is committed. (markt) +HttpServletResponse methods when the response is committed. (markt) 51509: Fix potential concurrency issue in CSRF prevention @@ -8409,7 +8409,7 @@ length string. (markt) -Don't register non-singelton DataSource resources with JMX. (markt) +Don't register non-singleton DataSource resources with JMX. (markt) CVE-2011-1184: Provide additional configuration options for the
svn commit: r1668639 - /tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Author: markt
Date: Mon Mar 23 13:53:03 2015
New Revision: 1668639
URL: http://svn.apache.org/r1668639
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57743
Fix a lock file / resource leak issue when a JAR was accessed just before or
during the context destroy process.
Patch provided by Pavel Avgustinov.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1668639&r1=1668638&r2=1668639&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Mon Mar 23 13:53:03 2015
@@ -125,6 +125,6 @@ public abstract class AbstractResourceSe
@Override
protected final void destroyInternal() throws LifecycleException {
-// NO-OP
+gc();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668640 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/AbstractResourceSet.java webapps/docs/changelog.xml
Author: markt Date: Mon Mar 23 13:54:47 2015 New Revision: 1668640 URL: http://svn.apache.org/r1668640 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57743 Fix a lock file / resource leak issue when a JAR was accessed just before or during the context destroy process. Patch provided by Pavel Avgustinov. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 23 13:54:47 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465
[Bug 57743] Jar files in /WEB-INF/lib are kept open, preventing redeploy
https://bz.apache.org/bugzilla/show_bug.cgi?id=57743 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Thanks for the very clear bug report and analysis. Both the analysis and patch look good so the patch has been applied to trunk and 8.0.x for 8.0.21 onwards. Thanks again for your contribution. -- 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: r1668642 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Mon Mar 23 14:00:36 2015 New Revision: 1668642 URL: http://svn.apache.org/r1668642 Log: CTR: Fix typos in changelog Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1668642&r1=1668641&r2=1668642&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 14:00:36 2015 @@ -78,7 +78,7 @@ When applying the maxSwallowSize limit to a connection read that many bytes first before closing the connection to give the client a -chance to read the reponse. (markt) +chance to read the response. (markt) 57544: Fix a potential infinite loop when preparing a kept @@ -321,7 +321,7 @@ (kkolinko) -Fix a potential resource leak in JDTCompiler when checking wether +Fix a potential resource leak in JDTCompiler when checking whether a resource is a package. Reported by Coverity Scan. (fschumacher) @@ -541,7 +541,7 @@ Improvements to the Windows installer, to align it with installing -the sevice with service.bat. Use explicit memory sizes +the service with service.bat. Use explicit memory sizes (--JvmMs 128 Mb and --JvmMx 256 Mb). Specify log directory path when ininstalling, so that the log file is written to the Tomcat logs directory, instead of "%SystemRoot%\System32\LogFiles\Apache". @@ -3857,7 +3857,7 @@ Sessions get transferred, but node still waits until timeout. (rjung) -Perform deserializtion events with context class loader. (fhanik) +Perform deserialization events with context class loader. (fhanik) 47515: Correctly replicate timestamp during startup. (fhanik) @@ -3908,7 +3908,7 @@ (markt) -47161: Report thread count correctly in Manager when exectors +47161: Report thread count correctly in Manager when executors are used and return -1 when it can not easily be determined. (markt) @@ -3945,7 +3945,7 @@ application. (kkolinko) -47769: Clarify the JNDI docs with repect to use of +47769: Clarify the JNDI docs with respect to use ofand related elements, specifically when they are required and when they may be omitted. (markt) @@ -4320,7 +4320,7 @@ (markt) -45628: When checking MANIFEST dependancies, JARs without +45628: When checking MANIFEST dependencies, JARs without dependencies should allows be considered to be full-filled. (markt) @@ -5393,7 +5393,7 @@ 43944: Fix a missing resource exception. (markt) -Improve docs for Jasper configuration. Put options in alphabetcial +Improve docs for Jasper configuration. Put options in alphabetical order, add some missing options, deprecate an unused one and address feedback about the page provided on the users list. @@ -5652,7 +5652,7 @@ which lead to errors in the manager webapp JMXProxy output. (rjung) -33774: Retry JNDI authentiction on ServiceUnavailableException +33774: Retry JNDI authentication on ServiceUnavailableException as at least one provider throws this after an idle connection has been closed. (markt) @@ -6573,7 +6573,7 @@ -Many fixes for JSP 2.1 compliance, invloving tag files handling, deferred expressions +Many fixes for JSP 2.1 compliance, involving tag files handling, deferred expressions validation, bom encoding support (remm) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668643 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Mar 23 14:03:17 2015 New Revision: 1668643 URL: http://svn.apache.org/r1668643 Log: Limit line length to 80. Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1668643&r1=1668642&r2=1668643&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 14:03:17 2015 @@ -91,8 +91,8 @@ remaining request body data is swallowed. (markt) -57637: Do not create unnecessary sessions when using PersistentValve. -(jboynes/fschumacher) +57637: Do not create unnecessary sessions when using +PersistentValve. (jboynes/fschumacher) 57645: Correct a regression in the fix for @@ -117,11 +117,11 @@ Enable Tomcat to detect when a WAR file has been changed while Tomcat is not running. Tomcat does this by adding a META-INF/war-tracking file to -the expanded directory and setting the last modified time of this file to -the last modified time of the WAR. If Tomcat detects a modified WAR via -this mechanism the web application will be redeployed (i.e. the expanded -directory will be removed and the modified WAR expanded in its place). -(markt) +the expanded directory and setting the last modified time of this file +to the last modified time of the WAR. If Tomcat detects a modified WAR +via this mechanism the web application will be redeployed (i.e. the +expanded directory will be removed and the modified WAR expanded in its +place). (markt) 57704: Fix potential NPEs during web application start/stop - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668647 - in /tomcat/tc8.0.x/tags/TOMCAT_8_0_21: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Mar 23 14:07:34 2015 New Revision: 1668647 URL: http://svn.apache.org/r1668647 Log: Tag 8.0.21 Added: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ (props changed) - copied from r1668645, tomcat/tc8.0.x/trunk/ Modified: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/build.properties.default tomcat/tc8.0.x/tags/TOMCAT_8_0_21/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ -- bugtraq:append = false Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Mar 23 14:07:34 2015 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ -- --- svn:ignore (added) +++ svn:ignore Mon Mar 23 14:07:34 2015 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Mar 23 14:07:34 2015 @@ -0,0 +1 @@ +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,16
svn commit: r1668650 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Mar 23 14:09:39 2015 New Revision: 1668650 URL: http://svn.apache.org/r1668650 Log: votes 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=1668650&r1=1668649&r2=1668650&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 23 14:09:39 2015 @@ -32,32 +32,15 @@ PATCHES PROPOSED TO BACKPORT: Update examples to use Apache Standard Taglibs 1.2.3 http://svn.apache.org/r1662736 +1: jboynes + +1: kkolinko: For using version 1.2.5 of the library (r1668200) -1: - +0: kkolinko -1) When running with Security Manager enabled, it fails at - /examples/jsp/jsp2/tagfiles/products.jsp - and many subsequent pages with -java.security.AccessControlException: access denied (java.util.PropertyPermission org.apache.taglibs.standard.xml.accessExternalEntity read) - - followed by java.lang.NoClassDefFoundError which result in compilation failure. - - Without Security Manager it runs OK. - -2) Do not forget to update webapps/docs/changelog.xml - -3) OK with scan exclusion lists. - Unlike Tomcat 7 and later there is no need to update them. - - (Tomcat 6 does not perform annotation scanning, so exclusion does - not save much time. TLD exclusion lists are hard-coded in java code - (e.g. search for "ecj-4.3.1.jar"), and do not skip jstl.jar.) * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57570 Make processing of chunked encoding trailers an opt-in feature http://svn.apache.org/r1666396 http://svn.apache.org/r1666407 - +1: markt, remm + +1: markt, remm, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r8393 [2/2] - in /dev/tomcat/tomcat-8/v8.0.21: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.asc == --- dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.asc (added) +++ dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.asc Mon Mar 23 14:43:31 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJVEB+jAAoJEBDAHFovYFnnR58P/je3cCCUfS3lekCfMEnpQ6Mi +zMZs4G7L05j1/UojLo7ESiQTB69IMujrJx/mFTd/BR5c4/rJDyPryBp0q9XDcd5d +CCghUP794lRjLeXhB+b/EwNQuJPG2MHR0OFWkykCxj2ejSpHAZXHyzZVgpE15ZpT +CqBd+SKL8OlStbBD+Juf6S0o+SsHlYamZ68rqvMTTzTDRUjyBNG+a99r7+kBO+Re +f8yrhx6GQugNk5dMWz//7/dvg3nyCFXpRd0SU70irTe7WjMVz411yt+6vnxQTqLJ +fRqdTYn573vC0CABrT5xoJ0cWfeUfnBkg2zEsyURCXzNAEd3UsWvra7vZ9N1T+FT +OyMch/Ez66OeueYagr1zP9tEN30JXXfqm9lwDotIu9xND2zVQ8n3y+ugItVkSgQC +ZZXOLi2ZNqVOpQeAKG97mgOlaJl1UiiPViwrOLjObFC2xOPyvxcCFDJSjqCDBRrw +00WYrd9+piIhE8/JM5s+Kk7FQD+7sQ3/GYeyHAP4adDtxkR5n4IJ0wnSYLVAzuPV +5uGZrvgoB1BqqW6v8YzfM6Ug3rVIVNYF4k38U9TSlCv+b3zIuLUjyuGSNvLjLzpV +Sbmp9kG1HtRdm/HxwA2Mq4xXy5W/DOw95Bty+728xnPPSOVDyn+5jjhXgd8W7ytu +tCaYO0/sw1N9HqvVA2/C +=7L6l +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.md5 == --- dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.md5 Mon Mar 23 14:43:31 2015 @@ -0,0 +1 @@ +ac0a2c1ce4463ea819edf7d93ae1085c *catalina-ws.jar \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.sha1 == --- dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.sha1 (added) +++ dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.sha1 Mon Mar 23 14:43:31 2015 @@ -0,0 +1 @@ +a10f354e0b5f66f84cbf3dcc8815ee42a85fccd0 *catalina-ws.jar \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.asc == --- dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.asc (added) +++ dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.asc Mon Mar 23 14:43:31 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJVEB+iAAoJEBDAHFovYFnnbkAP/ivmJ15BX2bdNFmr0duDN6yT +dNxckGk4MscVY20uH1JJYBD4jIzArzNBWoWN5FaZuZSBCnzbRSXUg2U83FsIa6hf +wNP7ZfD/nPSG47duR6A81dEcR0dp1l6mG7bYwpTOrVXwGhknyFtXJuK4JTScphv9 +0rbyZcnbB2nxO6+Dn6/W0d8TUG7dF9Axy76jE+n8FJDy0rvDQl8S1RCpowQVc3Jk +x5Wo7Hk920oTzXGyL2VlreV7FncgLq0FND3FDsHuPNMdDAI6/MjvX5xDFmP7Q6hP +egBxkB7od1blwsIM83Y5fkqdAi9Vexk27KnG5iGQZUm9jJnumN4IlpatQRmTMiO0 +DV3KdmZPimNcdgDvRfj6rv2eGWeDaghY7QkDEo4gqOQuyUdWJ9j8Qdn7KEpQOGsT +C+InQPg0OgQ1S2GAytPiYshALgMhWX12a1iGS9UOxVk5oMfEdBc0BcxsjSRGfa8/ +Fk3xQ4lCMah7Z66go7GzxJ1xvxfTna5zyHIKL9nSDrOaIMX0MLBOczn1QQ7vRsuX +XzqyPII2a+UuQGp7ZskhsGoQ77ECXYRONtYC+BzhzT9tS6p9yTwcuJVwQxJlUOGg +RSkRw1M/XSPoARtXOAuN/UL8Mhd1xRuB4/3+LmKfuIKF1G/ta5cefFMSfmMDWk+p +1FpY4zHF71Z4awd5O3es +=l0BS +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.md5 == --- dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.md5 Mon Mar 23 14:43:31 2015 @@ -0,0 +1 @@ +8af571d0bf221a58168d58d6f7b72b7d *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.sha1 == --- dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.sha1 (added) +++ dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.sha1 Mon Mar 23 14:43:31 2015 @@ -0,0 +1 @@ +812d34a46d052d2196011d237540de7d7377f729 *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli.jar.asc == --- dev/tomcat/tomcat-8/v8.0.21/bin/ext
svn commit: r8393 [1/2] - in /dev/tomcat/tomcat-8/v8.0.21: ./ bin/ bin/embed/ bin/extras/ src/
Author: markt Date: Mon Mar 23 14:43:31 2015 New Revision: 8393 Log: Upload 8.0.21 ready for voting. Added: dev/tomcat/tomcat-8/v8.0.21/ dev/tomcat/tomcat-8/v8.0.21/KEYS (with props) dev/tomcat/tomcat-8/v8.0.21/README.html (with props) dev/tomcat/tomcat-8/v8.0.21/RELEASE-NOTES dev/tomcat/tomcat-8/v8.0.21/bin/ dev/tomcat/tomcat-8/v8.0.21/bin/README.html (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-deployer.tar.gz (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-deployer.tar.gz.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-deployer.tar.gz.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-deployer.tar.gz.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-deployer.zip (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-deployer.zip.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-deployer.zip.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-deployer.zip.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-fulldocs.tar.gz (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-fulldocs.tar.gz.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-fulldocs.tar.gz.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-i64.zip (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-i64.zip.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-i64.zip.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-i64.zip.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-x64.zip (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-x64.zip.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-x64.zip.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-x64.zip.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-x86.zip (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-x86.zip.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-x86.zip.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21-windows-x86.zip.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.exe (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.exe.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.exe.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.exe.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.tar.gz (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.tar.gz.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.tar.gz.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.tar.gz.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.zip (with props) dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.zip.asc dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.zip.md5 dev/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.zip.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/embed/ dev/tomcat/tomcat-8/v8.0.21/bin/embed/apache-tomcat-8.0.21-embed.tar.gz (with props) dev/tomcat/tomcat-8/v8.0.21/bin/embed/apache-tomcat-8.0.21-embed.tar.gz.asc dev/tomcat/tomcat-8/v8.0.21/bin/embed/apache-tomcat-8.0.21-embed.tar.gz.md5 dev/tomcat/tomcat-8/v8.0.21/bin/embed/apache-tomcat-8.0.21-embed.tar.gz.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/embed/apache-tomcat-8.0.21-embed.zip (with props) dev/tomcat/tomcat-8/v8.0.21/bin/embed/apache-tomcat-8.0.21-embed.zip.asc dev/tomcat/tomcat-8/v8.0.21/bin/embed/apache-tomcat-8.0.21-embed.zip.md5 dev/tomcat/tomcat-8/v8.0.21/bin/embed/apache-tomcat-8.0.21-embed.zip.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/extras/ dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-8/v8.0.21/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar (with props) dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.md5 dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli-adapters.jar.sha1 dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli.jar (with props) dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli.jar.md5 dev/tomcat/tomcat-8/v8.0.21/bin/extras/tomcat-juli
[jira] [Commented] (MTOMCAT-246) Allow for adding dirs/files to webapp classpath
[ https://issues.apache.org/jira/browse/MTOMCAT-246?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14375996#comment-14375996 ] Constantino Cronemberger commented on MTOMCAT-246: -- I managed to get it working by adding a resources declaration in a profile I use only when running with Tomcat7 plugin: dev instance-config/dev src/main/resources > Allow for adding dirs/files to webapp classpath > --- > > Key: MTOMCAT-246 > URL: https://issues.apache.org/jira/browse/MTOMCAT-246 > Project: Apache Tomcat Maven Plugin > Issue Type: New Feature > Components: tomcat7 >Reporter: Ondrej Burkert >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 3.0 > > Attachments: sample.zip > > > We have projects developed using Spring. Every project has a set of > configuration files (usually just logback configuration XML and a property > file). They are placed on the classpath and loaded from there by Spring app > context. > I don't see any way to put these on the classpath with current (we try 2.1 at > the moment) version of the plugin. Adding it using the > additionalClasspathDirs does not work as that is apparently Tomcat's not > application's classpath. It fails with FileNotFound exception. We place these > in the tomcat/lib folder for regular deployments. > Any workaround or preferably solution for the problem would be highly > appreciated. There are couple unanswered questions in this direction on > stackoverflow as well. > (http://stackoverflow.com/questions/18862237/tomcat7-maven-plugin-couldnt-locate-the-property-file-on-classpath, > > http://stackoverflow.com/questions/17962524/extending-classpath-and-tomcat-plugin) -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 8.0.21
The proposed Apache Tomcat 8.0.21 release is now available for voting. The main changes since 8.0.20 are: - Enable Tomcat to detect when a WAR file has been changed while Tomcat is not running. - Add support for Java 8 JSSE server-preferred TLS cipher suite ordering. This feature requires Java 8. - Update to Tomcat Native Library version 1.1.33 to pick up the Windows binaries that are based on OpenSSL 1.0.1m and APR 1.5.1 - Implement a new feature for AJP connectors - Tomcat Authorization. If enabled Tomcat will take an authenticated user name from the AJP protocol and use the appropriate Realm for the request to authorize (i.e. add roles) to that user. There is also the usual collection of bug fixes, new features and performance improvements. For full details, see the changelog: http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.21/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1039/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ The proposed 8.0.21 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.0.21 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668661 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Mar 23 15:06:13 2015 New Revision: 1668661 URL: http://svn.apache.org/r1668661 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=1668661&r1=1668660&r2=1668661&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 23 15:06:13 2015 @@ -43,6 +43,11 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, remm, kkolinko -1: +* Update to tc-native 1.1.33 and bump the recommended version to 1.1.33 as well + http://svn.apache.org/r1668635 + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668662 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Mar 23 15:07:26 2015 New Revision: 1668662 URL: http://svn.apache.org/r1668662 Log: Vote 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=1668662&r1=1668661&r2=1668662&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 23 15:07:26 2015 @@ -32,7 +32,7 @@ PATCHES PROPOSED TO BACKPORT: Update examples to use Apache Standard Taglibs 1.2.3 http://svn.apache.org/r1662736 +1: jboynes - +1: kkolinko: For using version 1.2.5 of the library (r1668200) + +1: kkolinko, markt: For using version 1.2.5 of the library (r1668200) -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668663 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Mar 23 15:10:09 2015 New Revision: 1668663 URL: http://svn.apache.org/r1668663 Log: vote 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=1668663&r1=1668662&r2=1668663&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 23 15:10:09 2015 @@ -45,7 +45,7 @@ PATCHES PROPOSED TO BACKPORT: * Update to tc-native 1.1.33 and bump the recommended version to 1.1.33 as well http://svn.apache.org/r1668635 - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1668664 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: violetagg Date: Mon Mar 23 15:12:06 2015 New Revision: 1668664 URL: http://svn.apache.org/r1668664 Log: vote 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=1668664&r1=1668663&r2=1668664&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 23 15:12:06 2015 @@ -32,7 +32,7 @@ PATCHES PROPOSED TO BACKPORT: Update examples to use Apache Standard Taglibs 1.2.3 http://svn.apache.org/r1662736 +1: jboynes - +1: kkolinko, markt: For using version 1.2.5 of the library (r1668200) + +1: kkolinko, markt, violetagg: For using version 1.2.5 of the library (r1668200) -1: @@ -45,7 +45,7 @@ PATCHES PROPOSED TO BACKPORT: * Update to tc-native 1.1.33 and bump the recommended version to 1.1.33 as well http://svn.apache.org/r1668635 - +1: markt, kkolinko + +1: markt, kkolinko, violetagg -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-293) create configuration to specify the name of the deployed directory
Constantino Cronemberger created MTOMCAT-293: Summary: create configuration to specify the name of the deployed directory Key: MTOMCAT-293 URL: https://issues.apache.org/jira/browse/MTOMCAT-293 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: commons-lib Affects Versions: 2.2 Reporter: Constantino Cronemberger Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor I am working in a system that has an Ajax application that can be deployed to multiple environments (dev, uat and prod), and we have the requirement that the same war is deployed to all environments. We also have few configuration parameters we are packaging with maven-assembly-plugin, so when we build the project it generates a main war plus a few zip files, one for each environment. I am configuring the backend project to run with tomcat7-maven-plugin, and have configured it to run the frontend module by adding it to the section. This is where the problem starts: both the main war and the zip file with the configuration have the same artifact id, and what happens at the end is that only the first one gets deployed. I have already tried to specify a different contextPath but it still creates the directories based on the artifact id. I foresee few possible solutions: 1 - add a new parameter to specify the directory name 2 - append the classifier to the artifactId to generate the directory name 3 - create the directory name based on the contextPath rather than on the artifactId Here is the configuration I am using: xxx.yyy my_module_ui 1.0.0-SNAPSHOT war dev true /config xxx.yyy my_module_ui 1.0.0-SNAPSHOT war true -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57108] Implement multiple sslcontext SNI (server name indication) dispatch
https://bz.apache.org/bugzilla/show_bug.cgi?id=57108 --- Comment #10 from Unlogic --- Well this is a bit tricky because there is two sides to this coin. In some cases you have a wildcard certificates or subject alternative name certificates the cover lots of domains. In those cases the current connector based approach works fine fine. But if you turn things around and have lets say 50 domains all with their own host and certificate and maybe even a few aliases for some hosts that in turn also require separate certificates. In that case the host based approach would make things simpler since you can put everything inside the hosts element. A trade off between the two solutions could be to define the keystores using a separate element in the config like when you define a connection pool. And then make it possible for both the connectors, hosts and aliases to refer back to the defined keystores depending on the use case. Here's an example: (a generic https connector not bound to any particular keystore that instead looks up the keystore based on the host/alias) (a https connector bound to the specified keystore like current tomcat versions) (a host not bound to any particular keystore) foo.com boo.com moo.com I hope that my example makes sense. It would make the keystore/certificate configuration a bit more flexible and support "both sides of the coin". -- 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 8.0.21
The proposed 8.0.21 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 8.0.21 Tested websockets/AsyncContext with JDK7/8 and all major browsers. -- Jeanfrancois On 2015-03-23 10:59 AM, Mark Thomas wrote: The proposed Apache Tomcat 8.0.21 release is now available for voting. The main changes since 8.0.20 are: - Enable Tomcat to detect when a WAR file has been changed while Tomcat is not running. - Add support for Java 8 JSSE server-preferred TLS cipher suite ordering. This feature requires Java 8. - Update to Tomcat Native Library version 1.1.33 to pick up the Windows binaries that are based on OpenSSL 1.0.1m and APR 1.5.1 - Implement a new feature for AJP connectors - Tomcat Authorization. If enabled Tomcat will take an authenticated user name from the AJP protocol and use the appropriate Realm for the request to authorize (i.e. add roles) to that user. There is also the usual collection of bug fixes, new features and performance improvements. For full details, see the changelog: http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.21/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1039/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ The proposed 8.0.21 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.0.21 - 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
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 9 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 27 mins 30 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150324-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150324.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150324-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150324/bin /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat
