craigmcc 02/02/25 17:24:33
Modified: catalina/src/share/org/apache/catalina/ant DeployTask.java
InstallTask.java ReloadTask.java RemoveTask.java
StartTask.java StopTask.java
Log:
Update Ant tasks to URLEncode the query parameters that are sent along with
the commands to the Manager webapp. This deals with issues like spaces in
the context path, which were not being deployed correctly.
FIXME - The code that maps a request URI to a context still chokes on a
space in the context path; that is the next thing to be fixed.
Revision Changes Path
1.2 +5 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/DeployTask.java
Index: DeployTask.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/DeployTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeployTask.java 12 Feb 2002 22:14:01 -0000 1.1
+++ DeployTask.java 26 Feb 2002 01:24:33 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/DeployTask.java,v
1.1 2002/02/12 22:14:01 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2002/02/12 22:14:01 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/DeployTask.java,v
1.2 2002/02/26 01:24:33 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/26 01:24:33 $
*
* ====================================================================
*
@@ -67,6 +67,7 @@
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
+import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -76,7 +77,7 @@
* the Tomcat manager application.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2002/02/12 22:14:01 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/26 01:24:33 $
* @since 4.1
*/
public class DeployTask extends AbstractCatalinaTask {
@@ -142,7 +143,7 @@
} catch (IOException e) {
throw new BuildException(e);
}
- execute("/deploy?path=" + this.path, stream,
+ execute("/deploy?path=" + URLEncoder.encode(this.path), stream,
"application/octet-stream", contentLength);
}
1.3 +8 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/InstallTask.java
Index: InstallTask.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/InstallTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstallTask.java 12 Feb 2002 22:14:01 -0000 1.2
+++ InstallTask.java 26 Feb 2002 01:24:33 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/InstallTask.java,v
1.2 2002/02/12 22:14:01 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/12 22:14:01 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/InstallTask.java,v
1.3 2002/02/26 01:24:33 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/26 01:24:33 $
*
* ====================================================================
*
@@ -63,6 +63,7 @@
package org.apache.catalina.ant;
+import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -72,7 +73,7 @@
* Tomcat manager application.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2002/02/12 22:14:01 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/26 01:24:33 $
* @since 4.1
*/
public class InstallTask extends AbstractCatalinaTask {
@@ -144,14 +145,14 @@
("Must specify at least one of 'config' and 'war'");
}
StringBuffer sb = new StringBuffer("/install?path=");
- sb.append(this.path);
+ sb.append(URLEncoder.encode(this.path));
if (config != null) {
sb.append("&config=");
- sb.append(config);
+ sb.append(URLEncoder.encode(config));
}
if (war != null) {
sb.append("&war=");
- sb.append(war);
+ sb.append(URLEncoder.encode(war));
}
execute(sb.toString());
1.3 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ReloadTask.java
Index: ReloadTask.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ReloadTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReloadTask.java 12 Feb 2002 22:14:01 -0000 1.2
+++ ReloadTask.java 26 Feb 2002 01:24:33 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ReloadTask.java,v
1.2 2002/02/12 22:14:01 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/12 22:14:01 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ReloadTask.java,v
1.3 2002/02/26 01:24:33 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/26 01:24:33 $
*
* ====================================================================
*
@@ -63,6 +63,7 @@
package org.apache.catalina.ant;
+import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -72,7 +73,7 @@
* Tomcat manager application.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2002/02/12 22:14:01 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/26 01:24:33 $
* @since 4.1
*/
public class ReloadTask extends AbstractCatalinaTask {
@@ -110,7 +111,7 @@
throw new BuildException
("Must specify 'path' attribute");
}
- execute("/reload?path=" + this.path);
+ execute("/reload?path=" + URLEncoder.encode(this.path));
}
1.2 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/RemoveTask.java
Index: RemoveTask.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/RemoveTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoveTask.java 11 Jan 2002 00:37:30 -0000 1.1
+++ RemoveTask.java 26 Feb 2002 01:24:33 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/RemoveTask.java,v
1.1 2002/01/11 00:37:30 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/11 00:37:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/RemoveTask.java,v
1.2 2002/02/26 01:24:33 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/26 01:24:33 $
*
* ====================================================================
*
@@ -63,6 +63,7 @@
package org.apache.catalina.ant;
+import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -72,7 +73,7 @@
* Tomcat manager application.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2002/01/11 00:37:30 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/26 01:24:33 $
*/
public class RemoveTask extends AbstractCatalinaTask {
@@ -109,7 +110,7 @@
throw new BuildException
("Must specify 'path' attribute");
}
- execute("/remove?path=" + this.path);
+ execute("/remove?path=" + URLEncoder.encode(this.path));
}
1.3 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/StartTask.java
Index: StartTask.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/StartTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StartTask.java 12 Feb 2002 22:14:01 -0000 1.2
+++ StartTask.java 26 Feb 2002 01:24:33 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/StartTask.java,v
1.2 2002/02/12 22:14:01 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/12 22:14:01 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/StartTask.java,v
1.3 2002/02/26 01:24:33 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/26 01:24:33 $
*
* ====================================================================
*
@@ -63,6 +63,7 @@
package org.apache.catalina.ant;
+import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -72,7 +73,7 @@
* Tomcat manager application.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2002/02/12 22:14:01 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/26 01:24:33 $
* @since 4.1
*/
public class StartTask extends AbstractCatalinaTask {
@@ -110,7 +111,7 @@
throw new BuildException
("Must specify 'path' attribute");
}
- execute("/start?path=" + this.path);
+ execute("/start?path=" + URLEncoder.encode(this.path));
}
1.3 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/StopTask.java
Index: StopTask.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/StopTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StopTask.java 12 Feb 2002 22:14:01 -0000 1.2
+++ StopTask.java 26 Feb 2002 01:24:33 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/StopTask.java,v
1.2 2002/02/12 22:14:01 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/12 22:14:01 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/StopTask.java,v
1.3 2002/02/26 01:24:33 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/26 01:24:33 $
*
* ====================================================================
*
@@ -63,6 +63,7 @@
package org.apache.catalina.ant;
+import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -72,7 +73,7 @@
* Tomcat manager application.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2002/02/12 22:14:01 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/26 01:24:33 $
* @since 4.1
*/
public class StopTask extends AbstractCatalinaTask {
@@ -110,7 +111,7 @@
throw new BuildException
("Must specify 'path' attribute");
}
- execute("/stop?path=" + this.path);
+ execute("/stop?path=" + URLEncoder.encode(this.path));
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
