tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1489176 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ant/DeployTask.java webapps/docs/changelog.xml
Date Mon, 03 Jun 2013 21:03:59 GMT
Author: markt
Date: Mon Jun  3 21:03:59 2013
New Revision: 1489176

URL: http://svn.apache.org/r1489176
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55035
Add support for the version parameter to the deploy Ant task.
Patch provided by Sergey Tcherednichenko.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1489170

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=1489176&r1=1489175&r2=1489176&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java Mon Jun  3 21:03:59
2013
@@ -38,7 +38,7 @@ import org.apache.tools.ant.BuildExcepti
  * @version $Id$
  * @since 4.1
  */
-public class DeployTask extends AbstractCatalinaTask {
+public class DeployTask extends AbstractCatalinaCommandTask {
 
 
     // ------------------------------------------------------------- Properties
@@ -74,20 +74,6 @@ public class DeployTask extends Abstract
 
 
     /**
-     * The context path of the web application we are managing.
-     */
-    protected String path = null;
-
-    public String getPath() {
-        return (this.path);
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-
-    /**
      * Tag to associate with this to be deployed webapp.
      */
     protected String tag = null;
@@ -186,9 +172,8 @@ public class DeployTask extends Abstract
         }
 
         // Building URL
-        StringBuilder sb = new StringBuilder("/deploy?path=");
+        StringBuilder sb = createQueryString("/deploy");
         try {
-            sb.append(URLEncoder.encode(this.path, getCharset()));
             if ((war == null) && (config != null)) {
                 sb.append("&config=");
                 sb.append(URLEncoder.encode(config, getCharset()));

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1489176&r1=1489175&r2=1489176&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jun  3 21:03:59 2013
@@ -116,6 +116,11 @@
         being used and logout() and login() occur within a single request. Patch
         provided by Keith Mashinter. (markt) 
       </fix>
+      <add>
+        <bug>55035</bug>: Add support for the version attribute to the deploy
+        command of the Ant tasks for interfacing with the text based Manager
+        application. Patch provided by  Sergey Tcherednichenko. (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">



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


Mime
View raw message