Author: kkolinko
Date: Sat Mar 15 20:00:57 2014
New Revision: 1577929
URL: http://svn.apache.org/r1577929
Log:
r1576923 : Better Javadoc
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1576923
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1577929&r1=1577928&r2=1577929&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Sat Mar 15 20:00:57 2014
@@ -620,10 +620,13 @@ public class ManagerServlet extends Http
* Deploy a web application archive (included in the current request)
* at the specified context path.
*
- * @param writer Writer to render results to
- * @param cn Name of the application to be installed
- * @param tag Tag to be associated with the webapp
- * @param request Servlet request we are processing
+ * @param writer Writer to render results to
+ * @param cn Name of the application to be installed
+ * @param tag Tag to be associated with the webapp
+ * @param update Flag that indicates that any existing app should be
+ * replaced
+ * @param request Servlet request we are processing
+ * @param smClient i18n messages using the locale of the client
*/
protected synchronized void deploy
(PrintWriter writer, ContextName cn,
@@ -716,9 +719,10 @@ public class ManagerServlet extends Http
* Install an application for the specified path from the specified
* web application archive.
*
- * @param writer Writer to render results to
- * @param tag Revision tag to deploy from
- * @param cn Name of the application to be installed
+ * @param writer Writer to render results to
+ * @param tag Revision tag to deploy from
+ * @param cn Name of the application to be installed
+ * @param smClient i18n messages using the locale of the client
*/
protected void deploy(PrintWriter writer, ContextName cn, String tag,
StringManager smClient) {
@@ -780,14 +784,15 @@ public class ManagerServlet extends Http
* Install an application for the specified path from the specified
* web application archive.
*
- * @param writer Writer to render results to
- * @param config URL of the context configuration file to be installed
- * @param cn Name of the application to be installed
- * @param war URL of the web application archive to be installed
- * @param update true to override any existing webapp on the path
+ * @param writer Writer to render results to
+ * @param config URL of the context configuration file to be installed
+ * @param cn Name of the application to be installed
+ * @param war URL of the web application archive to be installed
+ * @param update true to override any existing webapp on the path
+ * @param smClient i18n messages using the locale of the client
*/
protected void deploy(PrintWriter writer, String config, ContextName cn,
- String war, boolean update, StringManager smClient) {
+ String war, boolean update, StringManager smClient) {
if (config != null && config.length() == 0) {
config = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
