You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2005/01/22 17:34:47 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant DeployTask.java StartTask.java AbstractCatalinaTask.java SessionsTask.java StopTask.java ReloadTask.java
remm 2005/01/22 08:34:47
Modified: catalina/src/share/org/apache/catalina/ant DeployTask.java
StartTask.java AbstractCatalinaTask.java
SessionsTask.java StopTask.java ReloadTask.java
Log:
- Add charset support for the URLs used by the tasks, to remove deprecation.
Revision Changes Path
1.8 +21 -16 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/DeployTask.java
Index: DeployTask.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/DeployTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DeployTask.java 2 Sep 2004 22:31:38 -0000 1.7
+++ DeployTask.java 22 Jan 2005 16:34:47 -0000 1.8
@@ -21,6 +21,7 @@
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
@@ -175,21 +176,25 @@
// Building URL
StringBuffer sb = new StringBuffer("/deploy?path=");
- sb.append(URLEncoder.encode(this.path));
- if ((war == null) && (config != null)) {
- sb.append("&config=");
- sb.append(URLEncoder.encode(config));
- }
- if ((war == null) && (localWar != null)) {
- sb.append("&war=");
- sb.append(URLEncoder.encode(localWar));
- }
- if (update) {
- sb.append("&update=true");
- }
- if (tag != null) {
- sb.append("&tag=");
- sb.append(URLEncoder.encode(tag));
+ try {
+ sb.append(URLEncoder.encode(this.path, getCharset()));
+ if ((war == null) && (config != null)) {
+ sb.append("&config=");
+ sb.append(URLEncoder.encode(config, getCharset()));
+ }
+ if ((war == null) && (localWar != null)) {
+ sb.append("&war=");
+ sb.append(URLEncoder.encode(localWar, getCharset()));
+ }
+ if (update) {
+ sb.append("&update=true");
+ }
+ if (tag != null) {
+ sb.append("&tag=");
+ sb.append(URLEncoder.encode(tag, getCharset()));
+ }
+ } catch (UnsupportedEncodingException e) {
+ throw new BuildException("Invalid 'charset' attribute: " + getCharset());
}
execute(sb.toString(), stream, contentType, contentLength);
1.4 +8 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/StartTask.java
Index: StartTask.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/StartTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StartTask.java 27 Feb 2004 14:58:41 -0000 1.3
+++ StartTask.java 22 Jan 2005 16:34:47 -0000 1.4
@@ -18,6 +18,7 @@
package org.apache.catalina.ant;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
@@ -66,7 +67,12 @@
throw new BuildException
("Must specify 'path' attribute");
}
- execute("/start?path=" + URLEncoder.encode(this.path));
+ try {
+ execute("/start?path=" + URLEncoder.encode(this.path, getCharset()));
+ } catch (UnsupportedEncodingException e) {
+ throw new BuildException
+ ("Invalid 'charset' attribute: " + getCharset());
+ }
}
1.5 +15 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java
Index: AbstractCatalinaTask.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractCatalinaTask.java 3 Jan 2005 16:21:21 -0000 1.4
+++ AbstractCatalinaTask.java 22 Jan 2005 16:34:47 -0000 1.5
@@ -55,6 +55,20 @@
/**
+ * The charset used during URL encoding.
+ */
+ protected String charset = "ISO-8859-1";
+
+ public String getCharset() {
+ return (this.charset);
+ }
+
+ public void setCharset(String charset) {
+ this.charset = charset;
+ }
+
+
+ /**
* The login password for the <code>Manager</code> application.
*/
protected String password = null;
1.4 +10 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/SessionsTask.java
Index: SessionsTask.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/SessionsTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionsTask.java 27 Feb 2004 14:58:41 -0000 1.3
+++ SessionsTask.java 22 Jan 2005 16:34:47 -0000 1.4
@@ -18,6 +18,7 @@
package org.apache.catalina.ant;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
@@ -61,7 +62,14 @@
throw new BuildException
("Must specify 'path' attribute");
}
- execute("/sessions?path=" + URLEncoder.encode(this.path));
+
+ try {
+ execute("/sessions?path=" + URLEncoder.encode(this.path, getCharset()));
+ } catch (UnsupportedEncodingException e) {
+ throw new BuildException
+ ("Invalid 'charset' attribute: " + getCharset());
+ }
+
}
}
1.4 +8 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/StopTask.java
Index: StopTask.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/StopTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StopTask.java 27 Feb 2004 14:58:41 -0000 1.3
+++ StopTask.java 22 Jan 2005 16:34:47 -0000 1.4
@@ -18,6 +18,7 @@
package org.apache.catalina.ant;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
@@ -66,7 +67,12 @@
throw new BuildException
("Must specify 'path' attribute");
}
- execute("/stop?path=" + URLEncoder.encode(this.path));
+ try {
+ execute("/stop?path=" + URLEncoder.encode(this.path, getCharset()));
+ } catch (UnsupportedEncodingException e) {
+ throw new BuildException
+ ("Invalid 'charset' attribute: " + getCharset());
+ }
}
1.4 +9 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/ReloadTask.java
Index: ReloadTask.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/ReloadTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReloadTask.java 27 Feb 2004 14:58:40 -0000 1.3
+++ ReloadTask.java 22 Jan 2005 16:34:47 -0000 1.4
@@ -18,6 +18,7 @@
package org.apache.catalina.ant;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
@@ -66,7 +67,13 @@
throw new BuildException
("Must specify 'path' attribute");
}
- execute("/reload?path=" + URLEncoder.encode(this.path));
+ try {
+ execute("/reload?path=" + URLEncoder.encode(this.path, getCharset()));
+ } catch (UnsupportedEncodingException e) {
+ throw new BuildException
+ ("Invalid 'charset' attribute: " + getCharset());
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org