tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r600663 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/manager/HTMLManagerServlet.java java/org/apache/catalina/manager/LocalStrings.properties
Date Mon, 03 Dec 2007 20:22:22 GMT
Author: jim
Date: Mon Dec  3 12:22:21 2007
New Revision: 600663

URL: http://svn.apache.org/viewvc?rev=600663&view=rev
Log:
Merge r600177 from trunk:

Fix bug 43611. Provide an error message if user tries to upload a war for a context defined
in server.xml rather than failing silently.
Submitted by: markt
Reviewed by: jim

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=600663&r1=600662&r2=600663&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec  3 12:22:21 2007
@@ -31,13 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match the dir structure
 
-* 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, funkman, pero, remm
-  -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

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=600663&r1=600662&r2=600663&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Mon Dec
 3 12:22:21 2007
@@ -228,6 +228,12 @@
                     path = "/" + basename;
                 }
 
+                if ((host.findChild(path) != null) && !isDeployed(path)) {
+                    message = sm.getString
+                        ("htmlManagerServlet.deployUploadInServerXml", war);
+                    break;
+                }
+
                 if (!isServiced(path)) {
                     addServiced(path);
                     try {

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=600663&r1=600662&r2=600663&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 Mon Dec
 3 12:22:21 2007
@@ -38,6 +38,7 @@
 htmlManagerServlet.deployUpload=WAR file to deploy
 htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0}
 htmlManagerServlet.deployUploadFile=Select WAR file to upload
+htmlManagerServlet.deployUploadInServerXml=FAIL - War file \"{0}\" cannot be uploaded if
context is defined in server.xml 
 htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \"{0}\" must be a .war
 htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file
 htmlManagerServlet.deployUploadWarExists=FAIL - War file \"{0}\" already exists on server



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message