Author: markt
Date: Sun Jan 6 14:08:30 2008
New Revision: 609430
URL: http://svn.apache.org/viewvc?rev=609430&view=rev
Log:
Fix bug 43611. Provide an error message rather than failing silently when
uploading a WAR for a context already defined in server.xml
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609430&r1=609429&r2=609430&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 6 14:08:30 2008
@@ -124,6 +124,10 @@
Fix CVE-2007-5461, an important information disclosure vulnerability in
the WebDAV Servlet. (markt)
</fix>
+ <fix>
+ <bug>43611</bug>: Provide an error message when trying to upload a WAR
+ for a context that has been defined in server.xml. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote" >
Modified:
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java?rev=609430&r1=609429&r2=609430&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Sun Jan 6 14:08:30 2008
@@ -204,7 +204,11 @@
} else {
path = "/" + basename;
}
-
+ if ((host.findChild(path) != null) && !isDeployed(path)) {
+ message = sm.getString
+ ("htmlManagerServlet.deployUploadInServerXml", war);
+ break;
+ }
if (!isServiced(path)) {
addServiced(path);
try {
Modified:
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties?rev=609430&r1=609429&r2=609430&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
(original)
+++
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
Sun Jan 6 14:08:30 2008
@@ -36,6 +36,7 @@
htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0}
htmlManagerServlet.deployUploadFile=Select WAR file to upload
htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \"{0}\" must be a
.war
+htmlManagerServlet.deployUploadInServerXml=FAIL - War file \"{0}\" cannot be
uploaded if context is defined in server.xml
htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file
htmlManagerServlet.deployUploadWarExists=FAIL - War file \"{0}\" already
exists on server
htmlManagerServlet.deployWar=WAR or Directory URL:
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609430&r1=609429&r2=609430&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 6 14:08:30 2008
@@ -47,13 +47,6 @@
-1:
0: fhanik, this needs to be reworked completely, so I'm neutral
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43611
- Provide an error message when trying to upload a war if the context is
defined
- in server.xml
- http://svn.apache.org/viewvc?rev=600177&view=rev
- +1: markt, pero, fhanik
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43594
Use CATALINA_BASE (if set) for setenv
http://svn.apache.org/viewvc?rev=600185&view=rev
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
