Author: markt Date: Tue Apr 28 13:18:51 2009 New Revision: 769385 URL: http://svn.apache.org/viewvc?rev=769385&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46958 Allow xml manager status to work irrespective of context path
Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 13:18:51 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,718360,719119,719124,719602,719626,719628,720046,720069,721040,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,768335 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,718360,719119,719124,719602,719626,719628,720046,720069,721040,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,768335 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769385&r1=769384&r2=769385&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 13:18:51 2009 @@ -104,12 +104,6 @@ +1: markt, remm -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46958 - Allow xml manager status to work irrespective of context path - http://svn.apache.org/viewvc?rev=763193&view=rev - +1: markt, remm, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46967 Better handling of errors when trying to use Manager.randomFile Based on a patch by Kirk Wolf Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=769385&r1=769384&r2=769385&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java Tue Apr 28 13:18:51 2009 @@ -193,7 +193,7 @@ "<?xml version=\"1.0\" encoding=\""+CHARSET+"\"?>"; public static final String XML_STYLE = - "<?xml-stylesheet type=\"text/xsl\" href=\"/manager/xform.xsl\" ?>"; + "<?xml-stylesheet type=\"text/xsl\" href=\"xform.xsl\" ?>"; } 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=769385&r1=769384&r2=769385&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 13:18:51 2009 @@ -112,6 +112,10 @@ <bug>46924</bug>: Clarify behaviour when auto deployment is enabled and a WAR, directory or context file is deleted or updated. (markt) </fix> + <fix> + <bug>46958</bug>: All xml manager status output to work regardless of + context path. (markt) + </fix> </changelog> </subsection> <subsection name="Other"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org