Author: markt
Date: Wed Feb 28 16:02:22 2018
New Revision: 1825579
URL: http://svn.apache.org/viewvc?rev=1825579&view=rev
Log:
Add support for specifying the application version when deploying an
application via the Manager application HTML interface.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1825579&r1=1825578&r2=1825579&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Wed
Feb 28 16:02:22 2018
@@ -527,14 +527,15 @@ public final class HTMLManagerServlet ex
}
// Deploy Section
- args = new Object[7];
+ args = new Object[8];
args[0] = smClient.getString("htmlManagerServlet.deployTitle");
args[1] = smClient.getString("htmlManagerServlet.deployServer");
args[2] = response.encodeURL(request.getContextPath() +
"/html/deploy");
args[3] = smClient.getString("htmlManagerServlet.deployPath");
- args[4] = smClient.getString("htmlManagerServlet.deployConfig");
- args[5] = smClient.getString("htmlManagerServlet.deployWar");
- args[6] = smClient.getString("htmlManagerServlet.deployButton");
+ args[4] = smClient.getString("htmlManagerServlet.deployVersion");
+ args[5] = smClient.getString("htmlManagerServlet.deployConfig");
+ args[6] = smClient.getString("htmlManagerServlet.deployWar");
+ args[7] = smClient.getString("htmlManagerServlet.deployButton");
writer.print(MessageFormat.format(DEPLOY_SECTION, args));
args = new Object[4];
@@ -1284,7 +1285,7 @@ public final class HTMLManagerServlet ex
" <small>{4}</small>\n" +
" </td>\n" +
" <td class=\"row-left\">\n" +
- " <input type=\"text\" name=\"deployConfig\" size=\"20\">\n" +
+ " <input type=\"text\" name=\"deployVersion\" size=\"20\">\n" +
" </td>\n" +
"</tr>\n" +
"<tr>\n" +
@@ -1292,6 +1293,14 @@ public final class HTMLManagerServlet ex
" <small>{5}</small>\n" +
" </td>\n" +
" <td class=\"row-left\">\n" +
+ " <input type=\"text\" name=\"deployConfig\" size=\"20\">\n" +
+ " </td>\n" +
+ "</tr>\n" +
+ "<tr>\n" +
+ " <td class=\"row-right\">\n" +
+ " <small>{6}</small>\n" +
+ " </td>\n" +
+ " <td class=\"row-left\">\n" +
" <input type=\"text\" name=\"deployWar\" size=\"40\">\n" +
" </td>\n" +
"</tr>\n" +
@@ -1300,7 +1309,7 @@ public final class HTMLManagerServlet ex
" \n" +
" </td>\n" +
" <td class=\"row-left\">\n" +
- " <input type=\"submit\" value=\"{6}\">\n" +
+ " <input type=\"submit\" value=\"{7}\">\n" +
" </td>\n" +
"</tr>\n" +
"</table>\n" +
Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1825579&r1=1825578&r2=1825579&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Wed
Feb 28 16:02:22 2018
@@ -37,8 +37,8 @@ htmlManagerServlet.configSslReloadTitle=
htmlManagerServlet.configSslHostName=TLS host name (optional)
htmlManagerServlet.configReloadButton=Re-read
htmlManagerServlet.deployButton=Deploy
-htmlManagerServlet.deployConfig=XML Configuration file URL:
-htmlManagerServlet.deployPath=Context Path (required):
+htmlManagerServlet.deployConfig=XML Configuration file path:
+htmlManagerServlet.deployPath=Context Path:
htmlManagerServlet.deployServer=Deploy directory or WAR file located on server
htmlManagerServlet.deployTitle=Deploy
htmlManagerServlet.deployUpload=WAR file to deploy
@@ -48,7 +48,8 @@ htmlManagerServlet.deployUploadInServerX
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
-htmlManagerServlet.deployWar=WAR or Directory URL:
+htmlManagerServlet.deployVersion=Version (for parallel deployment):
+htmlManagerServlet.deployWar=WAR or Directory path:
htmlManagerServlet.diagnosticsLeak=Check to see if a web application has
caused a memory leak on stop, reload or undeploy
htmlManagerServlet.diagnosticsLeakButton=Find leaks
htmlManagerServlet.diagnosticsLeakWarning=This diagnostic check will trigger a
full garbage collection. Use it with extreme caution on production systems.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1825579&r1=1825578&r2=1825579&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 28 16:02:22 2018
@@ -147,6 +147,10 @@
<bug>48672</bug>: Add documentation for the Host Manager web
application. Patch provided by Marek Czernek. (markt)
</add>
+ <add>
+ Add support for specifying the application version when deploying an
+ application via the Manager application HTML interface. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
