Author: markt
Date: Sat Nov 15 10:24:40 2008
New Revision: 717907
URL: http://svn.apache.org/viewvc?rev=717907&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46115
Path is required when using deploy
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/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 15 10:24:40 2008
@@ -1 +1 @@
-/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,711126
+/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709816,711126
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=717907&r1=717906&r2=717907&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Nov 15 10:24:40 2008
@@ -165,12 +165,6 @@
+1: markt
-1: fhanik - InternalAprInputBuffer/InternalNioInputBuffer should provide
the same behavior
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46115
- Path is required when using deploy
- http://svn.apache.org/viewvc?rev=709816&view=rev
- +1: markt, rjung, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42409
Use resetBuffer() as suggested by the spec. Makes custom and standard error
page handling consistent
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=717907&r1=717906&r2=717907&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Sat Nov 15 10:24:40 2008
@@ -32,7 +32,7 @@
htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
htmlManagerServlet.deployButton=Deploy
htmlManagerServlet.deployConfig=XML Configuration file URL:
-htmlManagerServlet.deployPath=Context Path (optional):
+htmlManagerServlet.deployPath=Context Path (required):
htmlManagerServlet.deployServer=Deploy directory or WAR file located on server
htmlManagerServlet.deployTitle=Deploy
htmlManagerServlet.deployUpload=WAR file to deploy
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=717907&r1=717906&r2=717907&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Nov 15 10:24:40 2008
@@ -271,6 +271,10 @@
<bug>46067</bug>: Fix typos in Advanced IO how to. (markt)
</fix>
<fix>
+ <bug>46115</bug>: Correct Manager UI to show that path is required when
+ using the deploy command. (markt)
+ </fix>
+ <fix>
<bug>46121</bug>: Add note to manager documentation regarding possible
naming clash with new Ant 1.7 resources datatype and how to avoid it.
(markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
