From: markt Date: Mon, 15 Jun 2009 12:31:54 +0000 (+0000) Subject: Remove deprecated Ant tasks X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d5deb9eb25643994ea9ebfd375903fe6ffa4082b;p=tomcat7.0 Remove deprecated Ant tasks git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@784755 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/ant/InstallTask.java b/java/org/apache/catalina/ant/InstallTask.java deleted file mode 100644 index dd13c0008..000000000 --- a/java/org/apache/catalina/ant/InstallTask.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.catalina.ant; - - -import java.net.URLEncoder; - -import org.apache.tools.ant.BuildException; - - -/** - * Ant task that implements the /install command, supported by the - * Tomcat manager application. - * - * @author Craig R. McClanahan - * @version $Revision$ $Date$ - * @since 4.1 - * @deprecated Replaced by DeployTask - */ -public class InstallTask extends AbstractCatalinaTask { - - - // ------------------------------------------------------------- Properties - - - /** - * URL of the context configuration file for this application, if any. - */ - protected String config = null; - - public String getConfig() { - return (this.config); - } - - public void setConfig(String config) { - this.config = config; - } - - - /** - * 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; - } - - - /** - * URL of the web application archive (WAR) file, or the unpacked directory - * containing this application, if any. - */ - protected String war = null; - - public String getWar() { - return (this.war); - } - - public void setWar(String war) { - this.war = war; - } - - - // --------------------------------------------------------- Public Methods - - - /** - * Execute the requested operation. - * - * @exception BuildException if an error occurs - */ - public void execute() throws BuildException { - - super.execute(); - if (path == null) { - throw new BuildException - ("Must specify 'path' attribute"); - } - if ((config == null) && (war == null)) { - throw new BuildException - ("Must specify at least one of 'config' and 'war'"); - } - StringBuffer sb = new StringBuffer("/install?path="); - sb.append(URLEncoder.encode(this.path)); - if (config != null) { - sb.append("&config="); - sb.append(URLEncoder.encode(config)); - } - if (war != null) { - sb.append("&war="); - sb.append(URLEncoder.encode(war)); - } - execute(sb.toString()); - - } - - -} diff --git a/java/org/apache/catalina/ant/RemoveTask.java b/java/org/apache/catalina/ant/RemoveTask.java deleted file mode 100644 index 5eb939566..000000000 --- a/java/org/apache/catalina/ant/RemoveTask.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.catalina.ant; - - -import java.net.URLEncoder; - -import org.apache.tools.ant.BuildException; - - -/** - * Ant task that implements the /remove command, supported by the - * Tomcat manager application. - * - * @author Craig R. McClanahan - * @version $Revision$ $Date$ - * @deprecated Replaced by UndeployTask - */ -public class RemoveTask extends AbstractCatalinaTask { - - - // ------------------------------------------------------------- Properties - - - /** - * 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; - } - - - // --------------------------------------------------------- Public Methods - - - /** - * Execute the requested operation. - * - * @exception BuildException if an error occurs - */ - public void execute() throws BuildException { - - super.execute(); - if (path == null) { - throw new BuildException - ("Must specify 'path' attribute"); - } - execute("/remove?path=" + URLEncoder.encode(this.path)); - - } - - -} diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml index a0189fe4c..5736b14a6 100644 --- a/webapps/docs/manager-howto.xml +++ b/webapps/docs/manager-howto.xml @@ -267,13 +267,6 @@ its message strings in resource bundles, so it is possible that the strings have been translated for your platform. The examples below show the English version of the messages.

-
-

WARNING: the legacy commands /install and -/remove are deprecated. -They are presently equivalent to /deploy and /undeploy, -but could be removed in a future release.

-
-