svn commit: r1792135 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant: AbstractCatalinaTask.java BaseRedirectorHelperTask.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

svn commit: r1792135 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant: AbstractCatalinaTask.java BaseRedirectorHelperTask.java

markt
Author: markt
Date: Thu Apr 20 19:26:59 2017
New Revision: 1792135

URL: http://svn.apache.org/viewvc?rev=1792135&view=rev
Log:
Align with 9.0.x

Modified:
    tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
    tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1792135&r1=1792134&r2=1792135&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Apr 20 19:26:59 2017
@@ -55,13 +55,14 @@ public abstract class AbstractCatalinaTa
     protected String charset = "ISO-8859-1";
 
     public String getCharset() {
-        return this.charset;
+        return charset;
     }
 
     public void setCharset(String charset) {
         this.charset = charset;
     }
 
+
     /**
      * The login password for the <code>Manager</code> application.
      */
@@ -75,6 +76,7 @@ public abstract class AbstractCatalinaTa
         this.password = password;
     }
 
+
     /**
      * The URL of the <code>Manager</code> application to be used.
      */
@@ -88,6 +90,7 @@ public abstract class AbstractCatalinaTa
         this.url = url;
     }
 
+
     /**
      * The login username for the <code>Manager</code> application.
      */

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1792135&r1=1792134&r2=1792135&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java Thu Apr 20 19:26:59 2017
@@ -29,7 +29,8 @@ import org.apache.tools.ant.types.Redire
 
 /**
  * Abstract base class to add output redirection support for Catalina Ant tasks.
- * These tasks require Ant 1.5 or later. <br>
+ * These tasks require Ant 1.5 or later.
+ * <br>
  * <strong>WARNING:</strong> due to depends chain, Ant could call a Task more
  * than once and this can affect the output redirection when configured. If you
  * are collecting the output in a property, it will collect the output of only
@@ -73,8 +74,8 @@ public abstract class BaseRedirectorHelp
     protected boolean failOnError = true;
 
     /**
-     * <code>true</code> true when output redirection is requested for this task
-     * . Default is to log on Ant log.
+     * <code>true</code> true when output redirection is requested for this task.
+     * Default is to log on Ant log.
      */
     protected boolean redirectOutput = false;
 
@@ -163,7 +164,7 @@ public abstract class BaseRedirectorHelp
 
 
     /**
-     * Property name whose value should be set to the error of the task..
+     * Property name whose value should be set to the error of the task.
      *
      * @param errorProperty property name
      *
@@ -189,7 +190,8 @@ public abstract class BaseRedirectorHelp
     /**
      * If true, (error and non-error) output will be redirected as specified
      * while being sent to Ant's logging mechanism as if no redirection had
-     * taken place. Defaults to false. <br>
+     * taken place. Defaults to false.
+     * <br>
      * Actually handled internally, with Ant 1.6.3 it will be handled by the
      * <code>Redirector</code> itself.
      *



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Loading...