This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f7ebc3345518dfcdf3da3c06c09a6df6218c4d1a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 3 10:06:02 2024 +0100
Code clean-up - formatting. No functional change.
---
.../apache/catalina/ant/AbstractCatalinaTask.java | 58 +++----
.../catalina/ant/BaseRedirectorHelperTask.java | 89 ++++-------
java/org/apache/catalina/ant/DeployTask.java | 12 +-
java/org/apache/catalina/ant/FindLeaksTask.java | 12 +-
.../apache/catalina/ant/JKStatusUpdateTask.java | 96 ++++--------
java/org/apache/catalina/ant/JMXGetTask.java | 25 +--
java/org/apache/catalina/ant/JMXQueryTask.java | 19 ++-
java/org/apache/catalina/ant/JMXSetTask.java | 35 +++--
java/org/apache/catalina/ant/ListTask.java | 4 +-
java/org/apache/catalina/ant/ReloadTask.java | 5 +-
java/org/apache/catalina/ant/ResourcesTask.java | 10 +-
java/org/apache/catalina/ant/ServerinfoTask.java | 3 +-
java/org/apache/catalina/ant/SessionsTask.java | 3 +-
.../catalina/ant/SslConnectorCiphersTask.java | 4 +-
java/org/apache/catalina/ant/StartTask.java | 4 +-
java/org/apache/catalina/ant/StopTask.java | 4 +-
java/org/apache/catalina/ant/ThreaddumpTask.java | 4 +-
java/org/apache/catalina/ant/UndeployTask.java | 4 +-
java/org/apache/catalina/ant/ValidatorTask.java | 12 +-
java/org/apache/catalina/ant/VminfoTask.java | 4 +-
java/org/apache/catalina/ant/jmx/Arg.java | 8 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 40 +++--
.../catalina/ant/jmx/JMXAccessorConditionBase.java | 36 +++--
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 49 +++---
.../ant/jmx/JMXAccessorEqualsCondition.java | 9 +-
.../catalina/ant/jmx/JMXAccessorGetTask.java | 26 ++--
.../catalina/ant/jmx/JMXAccessorInvokeTask.java | 67 ++++----
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 27 ++--
.../catalina/ant/jmx/JMXAccessorSetTask.java | 44 +++---
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 173 +++++++++------------
.../ant/jmx/JMXAccessorUnregisterTask.java | 28 ++--
31 files changed, 420 insertions(+), 494 deletions(-)
diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 61ac76e5e5..810929a4d9 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -32,11 +32,11 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
/**
- * Abstract base class for Ant tasks that interact with the <em>Manager</em>
web
- * application for dynamically deploying and undeploying applications. These
- * tasks require Ant 1.4 or later.
+ * Abstract base class for Ant tasks that interact with the <em>Manager</em>
web application for dynamically deploying
+ * and undeploying applications. These tasks require Ant 1.4 or later.
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
@@ -107,16 +107,14 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
}
/**
- * If set to true - ignore the constraint of the first line of the response
- * message that must be "OK -".
+ * If set to true - ignore the constraint of the first line of the
response message that must be "OK -".
* <p>
- * When this attribute is set to {@code false} (the default), the first
line
- * of server response is expected to start with "OK -". If it does not then
- * the task is considered as failed and the first line is treated as an
- * error message.
+ * When this attribute is set to {@code false} (the default), the first
line of server response is expected to start
+ * with "OK -". If it does not then the task is considered as failed and
the first line is treated as an error
+ * message.
* <p>
- * When this attribute is set to {@code true}, the first line of the
- * response is treated like any other, regardless of its text.
+ * When this attribute is set to {@code true}, the first line of the
response is treated like any other, regardless
+ * of its text.
*/
protected boolean ignoreResponseConstraint = false;
@@ -132,9 +130,8 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
// --------------------------------------------------------- Public Methods
/**
- * Execute the specified command. This logic only performs the common
- * attribute validation required by all subclasses; it does not perform any
- * functional logic directly.
+ * Execute the specified command. This logic only performs the common
attribute validation required by all
+ * subclasses; it does not perform any functional logic directly.
*
* @exception BuildException if a validation error occurs
*/
@@ -159,19 +156,18 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
/**
- * Execute the specified command, based on the configured properties. The
- * input stream will be closed upon completion of this task, whether it was
- * executed successfully or not.
+ * Execute the specified command, based on the configured properties. The
input stream will be closed upon
+ * completion of this task, whether it was executed successfully or not.
*
- * @param command Command to be executed
- * @param istream InputStream to include in an HTTP PUT, if any
- * @param contentType Content type to specify for the input, if any
+ * @param command Command to be executed
+ * @param istream InputStream to include in an HTTP PUT, if any
+ * @param contentType Content type to specify for the input, if any
* @param contentLength Content length to specify for the input, if any
*
* @exception BuildException if an error occurs
*/
public void execute(String command, InputStream istream, String
contentType, long contentLength)
- throws BuildException {
+ throws BuildException {
URLConnection conn = null;
InputStreamReader reader = null;
@@ -289,19 +285,13 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
/*
- * This is a hack.
- * We need to use streaming to avoid OOME on large uploads.
- * We'd like to use Authenticator.setDefault() for authentication as the
JRE
- * then provides the DIGEST client implementation.
- * However, the above two are not compatible. When the request is made, the
- * resulting 401 triggers an exception because, when using streams, the
- * InputStream is no longer available to send with the repeated request
that
- * now includes the appropriate Authorization header.
- * The hack is to make a simple OPTIONS request- i.e. without a request
- * body.
- * This triggers authentication and the requirement to authenticate for
this
- * host is cached and used to provide an appropriate Authorization when the
- * next request is made (that includes a request body).
+ * This is a hack. We need to use streaming to avoid OOME on large
uploads. We'd like to use
+ * Authenticator.setDefault() for authentication as the JRE then provides
the DIGEST client implementation. However,
+ * the above two are not compatible. When the request is made, the
resulting 401 triggers an exception because, when
+ * using streams, the InputStream is no longer available to send with the
repeated request that now includes the
+ * appropriate Authorization header. The hack is to make a simple OPTIONS
request- i.e. without a request body. This
+ * triggers authentication and the requirement to authenticate for this
host is cached and used to provide an
+ * appropriate Authorization when the next request is made (that includes
a request body).
*/
private void preAuthenticate() throws IOException, URISyntaxException {
URLConnection conn = null;
diff --git a/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
b/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
index 7e4d7c3892..0316faad45 100644
--- a/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
+++ b/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
@@ -28,20 +28,16 @@ import org.apache.tools.ant.taskdefs.Redirector;
import org.apache.tools.ant.types.RedirectorElement;
/**
- * Abstract base class to add output redirection support for Catalina Ant
tasks.
- * These tasks require Ant 1.5 or later.
+ * Abstract base class to add output redirection support for Catalina Ant
tasks. 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
- * the first run, since Ant properties are immutable and once created they
- * cannot be changed. <br>
- * If you are collecting output in a file the file will be overwritten with the
- * output of the last run, unless you set append="true", in which case each run
- * will append it's output to the file.
- *
+ * <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 the
+ * first run, since Ant properties are immutable and once created they cannot
be changed. <br>
+ * If you are collecting output in a file the file will be overwritten with
the output of the last run, unless you set
+ * append="true", in which case each run will append it's output to the file.
*
* @author Gabriele Garuglieri
+ *
* @since 5.5
*/
public abstract class BaseRedirectorHelperTask extends Task {
@@ -65,37 +61,31 @@ public abstract class BaseRedirectorHelperTask extends Task
{
PrintStream redirectErrPrintStream = null;
/**
- * Whether to fail (with a BuildException) if ManagerServlet returns an
- * error. The default behavior is to do so. <b> This flag does not control
- * parameters checking. If the task is called with wrong or invalid
- * parameters, it will throw BuildException independently from the setting
- * of this flag. </b>
+ * Whether to fail (with a BuildException) if ManagerServlet returns an
error. The default behavior is to do so. <b>
+ * This flag does not control parameters checking. If the task is called
with wrong or invalid parameters, it will
+ * throw BuildException independently from the setting of this flag. </b>
*/
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;
/**
- * will be set to <code>true</code> when the configuration of the
Redirector
- * is complete.
+ * will be set to <code>true</code> when the configuration of the
Redirector is complete.
*/
protected boolean redirectorConfigured = false;
/**
- * Flag which indicates that, if redirected, output should also be always
- * sent to the log. Default is that output is sent only to redirected
- * streams.
+ * Flag which indicates that, if redirected, output should also be always
sent to the log. Default is that output is
+ * sent only to redirected streams.
*/
protected boolean alwaysLog = false;
/**
- * Whether to fail (with a BuildException) if ManagerServlet returns an
- * error. The default behavior is to do so.
+ * Whether to fail (with a BuildException) if ManagerServlet returns an
error. The default behavior is to do so.
*
* @param fail The new value of failonerror
*/
@@ -107,8 +97,7 @@ public abstract class BaseRedirectorHelperTask extends Task {
/**
* Returns the value of the failOnError property.
*
- * @return <code>true</code> if the task should will if an error occurs,
- * otherwise <code>false</code>
+ * @return <code>true</code> if the task should will if an error occurs,
otherwise <code>false</code>
*/
public boolean isFailOnError() {
return failOnError;
@@ -130,7 +119,6 @@ public abstract class BaseRedirectorHelperTask extends Task
{
* File the error output of the task is redirected to.
*
* @param error name of the error file
- *
*/
public void setError(File error) {
redirector.setError(error);
@@ -139,11 +127,10 @@ public abstract class BaseRedirectorHelperTask extends
Task {
/**
- * Controls whether error output is logged. This is only useful when output
- * is being redirected and error output is desired in the Ant log
+ * Controls whether error output is logged. This is only useful when
output is being redirected and error output is
+ * desired in the Ant log
*
- * @param logError if true the standard error is sent to the Ant log system
- * and not sent to output stream.
+ * @param logError if true the standard error is sent to the Ant log
system and not sent to output stream.
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
@@ -155,7 +142,6 @@ public abstract class BaseRedirectorHelperTask extends Task
{
* Property name whose value should be set to the output of the task.
*
* @param outputProperty property name
- *
*/
public void setOutputproperty(String outputProperty) {
redirector.setOutputProperty(outputProperty);
@@ -167,7 +153,6 @@ public abstract class BaseRedirectorHelperTask extends Task
{
* Property name whose value should be set to the error of the task.
*
* @param errorProperty property name
- *
*/
public void setErrorProperty(String errorProperty) {
redirector.setErrorProperty(errorProperty);
@@ -179,7 +164,6 @@ public abstract class BaseRedirectorHelperTask extends Task
{
* If true, append output to existing file.
*
* @param append if true, append output to existing file
- *
*/
public void setAppend(boolean append) {
redirector.setAppend(append);
@@ -188,12 +172,9 @@ public abstract class BaseRedirectorHelperTask extends
Task {
/**
- * 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>
- * Actually handled internally, with Ant 1.6.3 it will be handled by the
- * <code>Redirector</code> itself.
+ * 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>
+ * Actually handled internally, with Ant 1.6.3 it will be handled by the
<code>Redirector</code> itself.
*
* @param alwaysLog <code>boolean</code>
*/
@@ -204,8 +185,7 @@ public abstract class BaseRedirectorHelperTask extends Task
{
/**
- * Whether output and error files should be created even when empty.
- * Defaults to true.
+ * Whether output and error files should be created even when empty.
Defaults to true.
*
* @param createEmptyFiles <CODE>boolean</CODE>.
*/
@@ -238,9 +218,8 @@ public abstract class BaseRedirectorHelperTask extends Task
{
redirectOutput = true;
}
/*
- * Due to depends chain, Ant could call the Task more than once, this
is
- * to prevent that we attempt to configure uselessly more than once the
- * Redirector.
+ * Due to depends chain, Ant could call the Task more than once, this
is to prevent that we attempt to configure
+ * uselessly more than once the Redirector.
*/
redirectorConfigured = true;
}
@@ -264,10 +243,9 @@ public abstract class BaseRedirectorHelperTask extends
Task {
/**
- * Ask redirector to close all the streams. It is necessary to call this
- * method before leaving the Task to have the Streams flush their contents.
- * If you are collecting output in a property, it will be created only if
- * this method is called, otherwise you'll find it unset.
+ * Ask redirector to close all the streams. It is necessary to call this
method before leaving the Task to have the
+ * Streams flush their contents. If you are collecting output in a
property, it will be created only if this method
+ * is called, otherwise you'll find it unset.
*/
protected void closeRedirector() {
try {
@@ -278,8 +256,8 @@ public abstract class BaseRedirectorHelperTask extends Task
{
log("Error closing redirector: " + ioe.getMessage(),
Project.MSG_ERR);
}
/*
- * Due to depends chain, Ant could call the Task more than once, this
is
- * to prevent that we attempt to reuse the previously closed Streams.
+ * Due to depends chain, Ant could call the Task more than once, this
is to prevent that we attempt to reuse the
+ * previously closed Streams.
*/
redirectOutStream = null;
redirectOutPrintStream = null;
@@ -313,7 +291,6 @@ public abstract class BaseRedirectorHelperTask extends Task
{
* Handles output with the INFO priority and flushes the stream.
*
* @param output The output to log. Should not be <code>null</code>.
- *
*/
@Override
protected void handleFlush(String output) {
@@ -347,7 +324,6 @@ public abstract class BaseRedirectorHelperTask extends Task
{
* Handles error output with the ERR priority and flushes the stream.
*
* @param output The error output to log. Should not be <code>null</code>.
- *
*/
@Override
protected void handleErrorFlush(String output) {
@@ -357,10 +333,9 @@ public abstract class BaseRedirectorHelperTask extends
Task {
/**
- * Handles output with ERR priority to error stream and all other
priorities
- * to output stream.
+ * Handles output with ERR priority to error stream and all other
priorities to output stream.
*
- * @param output The output to log. Should not be <code>null</code>.
+ * @param output The output to log. Should not be <code>null</code>.
* @param priority The priority level that should be used
*/
protected void handleOutput(String output, int priority) {
diff --git a/java/org/apache/catalina/ant/DeployTask.java
b/java/org/apache/catalina/ant/DeployTask.java
index bf4bc673e9..2ae8650fc6 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -30,10 +30,10 @@ import java.util.regex.Pattern;
import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/deploy</code> command, supported by the
- * Tomcat manager application.
+ * Ant task that implements the <code>/deploy</code> command, supported by the
Tomcat manager application.
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public class DeployTask extends AbstractCatalinaCommandTask {
@@ -55,8 +55,7 @@ public class DeployTask extends AbstractCatalinaCommandTask {
/**
- * URL of the server local web application archive (WAR) file to be
- * deployed.
+ * URL of the server local web application archive (WAR) file to be
deployed.
*/
protected String localWar = null;
@@ -123,8 +122,7 @@ public class DeployTask extends AbstractCatalinaCommandTask
{
throw new BuildException("Must specify 'path' attribute");
}
if ((war == null) && (localWar == null) && (config == null) && (tag ==
null)) {
- throw new BuildException(
- "Must specify either 'war', 'localWar', 'config',
or 'tag' attribute");
+ throw new BuildException("Must specify either 'war', 'localWar',
'config', or 'tag' attribute");
}
// Building an input stream on the WAR to upload, if any
BufferedInputStream stream = null;
@@ -141,7 +139,7 @@ public class DeployTask extends AbstractCatalinaCommandTask
{
throw new BuildException(e);
}
} else {
- FileInputStream fsInput= null;
+ FileInputStream fsInput = null;
try {
fsInput = new FileInputStream(war);
FileChannel fsChannel = fsInput.getChannel();
diff --git a/java/org/apache/catalina/ant/FindLeaksTask.java
b/java/org/apache/catalina/ant/FindLeaksTask.java
index 4be09969a8..3eb44df7d3 100644
--- a/java/org/apache/catalina/ant/FindLeaksTask.java
+++ b/java/org/apache/catalina/ant/FindLeaksTask.java
@@ -19,16 +19,14 @@ package org.apache.catalina.ant;
import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/findleaks</code> command, supported by
- * the Tomcat manager application.
+ * Ant task that implements the <code>/findleaks</code> command, supported by
the Tomcat manager application.
*/
public class FindLeaksTask extends AbstractCatalinaTask {
private boolean statusLine = true;
/**
- * Sets the statusLine parameter that controls if the response includes a
- * status line or not.
+ * Sets the statusLine parameter that controls if the response includes a
status line or not.
*
* @param statusLine <code>true</code> if the status line should be
included
*/
@@ -37,11 +35,9 @@ public class FindLeaksTask extends AbstractCatalinaTask {
}
/**
- * Returns the statusLine parameter that controls if the response includes
a
- * status line or not.
+ * Returns the statusLine parameter that controls if the response includes
a status line or not.
*
- * @return <code>true</code> if the status line should be included,
- * otherwise <code>false</code>
+ * @return <code>true</code> if the status line should be included,
otherwise <code>false</code>
*/
public boolean getStatusLine() {
return statusLine;
diff --git a/java/org/apache/catalina/ant/JKStatusUpdateTask.java
b/java/org/apache/catalina/ant/JKStatusUpdateTask.java
index 4f322b74f7..b24f02110a 100644
--- a/java/org/apache/catalina/ant/JKStatusUpdateTask.java
+++ b/java/org/apache/catalina/ant/JKStatusUpdateTask.java
@@ -22,10 +22,10 @@ import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/status</code> command, supported by the
- * mod_jk status (1.2.9) application.
+ * Ant task that implements the <code>/status</code> command, supported by the
mod_jk status (1.2.9) application.
*
* @author Peter Rossbach
+ *
* @since 5.5.9
*/
public class JKStatusUpdateTask extends AbstractCatalinaTask {
@@ -74,8 +74,7 @@ public class JKStatusUpdateTask extends AbstractCatalinaTask {
}
/**
- * @param internalid
- * The internalid to set.
+ * @param internalid The internalid to set.
*/
public void setInternalid(int internalid) {
this.internalid = internalid;
@@ -89,8 +88,7 @@ public class JKStatusUpdateTask extends AbstractCatalinaTask {
}
/**
- * @param lbForceSession
- * The lbForceSession to set.
+ * @param lbForceSession The lbForceSession to set.
*/
public void setLbForceSession(Boolean lbForceSession) {
this.lbForceSession = lbForceSession;
@@ -104,8 +102,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param lbRecovertime
- * The lbRecovertime to set.
+ * @param lbRecovertime The lbRecovertime to set.
*/
public void setLbRecovertime(Integer lbRecovertime) {
this.lbRecovertime = lbRecovertime;
@@ -119,8 +116,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param lbRetries
- * The lbRetries to set.
+ * @param lbRetries The lbRetries to set.
*/
public void setLbRetries(Integer lbRetries) {
this.lbRetries = lbRetries;
@@ -134,8 +130,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param lbStickySession
- * The lbStickySession to set.
+ * @param lbStickySession The lbStickySession to set.
*/
public void setLbStickySession(Boolean lbStickySession) {
this.lbStickySession = lbStickySession;
@@ -149,8 +144,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param worker
- * The worker to set.
+ * @param worker The worker to set.
*/
public void setWorker(String worker) {
this.worker = worker;
@@ -164,8 +158,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param workerType
- * The workerType to set.
+ * @param workerType The workerType to set.
*/
public void setWorkerType(String workerType) {
this.workerType = workerType;
@@ -179,8 +172,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param workerLb
- * The workerLb to set.
+ * @param workerLb The workerLb to set.
*/
public void setWorkerLb(String workerLb) {
this.workerLb = workerLb;
@@ -194,8 +186,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param workerClusterDomain
- * The workerClusterDomain to set.
+ * @param workerClusterDomain The workerClusterDomain to set.
*/
public void setWorkerClusterDomain(String workerClusterDomain) {
this.workerClusterDomain = workerClusterDomain;
@@ -209,8 +200,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param workerDisabled
- * The workerDisabled to set.
+ * @param workerDisabled The workerDisabled to set.
*/
public void setWorkerDisabled(Boolean workerDisabled) {
this.workerDisabled = workerDisabled;
@@ -238,8 +228,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param workerLoadFactor
- * The workerLoadFactor to set.
+ * @param workerLoadFactor The workerLoadFactor to set.
*/
public void setWorkerLoadFactor(Integer workerLoadFactor) {
this.workerLoadFactor = workerLoadFactor;
@@ -253,8 +242,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
/**
- * @param workerRedirect
- * The workerRedirect to set.
+ * @param workerRedirect The workerRedirect to set.
*/
public void setWorkerRedirect(String workerRedirect) {
this.workerRedirect = workerRedirect;
@@ -263,8 +251,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
/**
* Execute the requested operation.
*
- * @exception BuildException
- * if an error occurs
+ * @exception BuildException if an error occurs
*/
@Override
public void execute() throws BuildException {
@@ -279,11 +266,8 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
/**
* Create JkStatus link
* <ul>
- * <li><b>load balance example:
- *
</b>http://localhost/status?cmd=update&mime=txt&w=lb&lf=false&ls=true</li>
- * <li><b>worker example:
- *
</b>http://localhost/status?cmd=update&mime=txt&w=node1&l=lb&wf=1&wd=false&ws=false
- * </li>
+ * <li><b>load balance example:
</b>http://localhost/status?cmd=update&mime=txt&w=lb&lf=false&ls=true</li>
+ * <li><b>worker example:
</b>http://localhost/status?cmd=update&mime=txt&w=node1&l=lb&wf=1&wd=false&ws=false</li>
* </ul>
*
* @return create jkstatus link
@@ -297,7 +281,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
sb.append(URLEncoder.encode(worker, getCharset()));
if (isLBMode) {
-
//http://localhost/status?cmd=update&mime=txt&w=lb&lf=false&ls=true
+ //
http://localhost/status?cmd=update&mime=txt&w=lb&lf=false&ls=true
if ((lbRetries != null)) { // > 0
sb.append("&lr=");
sb.append(lbRetries);
@@ -315,7 +299,7 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
sb.append(lbForceSession);
}
} else {
-
//http://localhost/status?cmd=update&mime=txt&w=node1&l=lb&wf=1&wd=false&ws=false
+ //
http://localhost/status?cmd=update&mime=txt&w=node1&l=lb&wf=1&wd=false&ws=false
if ((workerLb != null)) { // must be configured
sb.append("&l=");
sb.append(URLEncoder.encode(workerLb, getCharset()));
@@ -337,14 +321,12 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
}
if ((workerClusterDomain != null)) {
sb.append("&wc=");
- sb.append(URLEncoder.encode(workerClusterDomain,
- getCharset()));
+ sb.append(URLEncoder.encode(workerClusterDomain,
getCharset()));
}
}
} catch (UnsupportedEncodingException e) {
- throw new BuildException("Invalid 'charset' attribute: "
- + getCharset());
+ throw new BuildException("Invalid 'charset' attribute: " +
getCharset());
}
return sb;
}
@@ -362,54 +344,44 @@ public class JKStatusUpdateTask extends
AbstractCatalinaTask {
if ("lb".equals(workerType)) {
if (lbRecovertime == null && lbRetries == null) {
throw new BuildException(
- "Must specify at a lb worker either 'lbRecovertime' or"
- + "'lbRetries' attribute");
+ "Must specify at a lb worker either 'lbRecovertime'
or" + "'lbRetries' attribute");
}
if (lbStickySession == null || lbForceSession == null) {
- throw new BuildException("Must specify at a lb worker either"
- + "'lbStickySession' and 'lbForceSession' attribute");
+ throw new BuildException(
+ "Must specify at a lb worker either" +
"'lbStickySession' and 'lbForceSession' attribute");
}
if (null != lbRecovertime && 60 < lbRecovertime.intValue()) {
- throw new BuildException(
- "The 'lbRecovertime' must be greater than 59");
+ throw new BuildException("The 'lbRecovertime' must be greater
than 59");
}
if (null != lbRetries && 1 < lbRetries.intValue()) {
- throw new BuildException(
- "The 'lbRetries' must be greater than 1");
+ throw new BuildException("The 'lbRetries' must be greater than
1");
}
isLBMode = true;
} else if ("worker".equals(workerType)) {
if (workerDisabled == null) {
- throw new BuildException(
- "Must specify at a node worker 'workerDisabled'
attribute");
+ throw new BuildException("Must specify at a node worker
'workerDisabled' attribute");
}
if (workerStopped == null) {
- throw new BuildException(
- "Must specify at a node worker 'workerStopped'
attribute");
+ throw new BuildException("Must specify at a node worker
'workerStopped' attribute");
}
- if (workerLoadFactor == null ) {
- throw new BuildException(
- "Must specify at a node worker 'workerLoadFactor'
attribute");
+ if (workerLoadFactor == null) {
+ throw new BuildException("Must specify at a node worker
'workerLoadFactor' attribute");
}
if (workerClusterDomain == null) {
- throw new BuildException(
- "Must specify at a node worker 'workerClusterDomain'
attribute");
+ throw new BuildException("Must specify at a node worker
'workerClusterDomain' attribute");
}
if (workerRedirect == null) {
- throw new BuildException(
- "Must specify at a node worker 'workerRedirect'
attribute");
+ throw new BuildException("Must specify at a node worker
'workerRedirect' attribute");
}
if (workerLb == null) {
throw new BuildException("Must specify 'workerLb' attribute");
}
if (workerLoadFactor.intValue() < 1) {
- throw new BuildException(
- "The 'workerLoadFactor' must be greater or equal 1");
+ throw new BuildException("The 'workerLoadFactor' must be
greater or equal 1");
}
isLBMode = false;
} else {
- throw new BuildException(
- "Only 'lb' and 'worker' supported as workerType
attribute");
+ throw new BuildException("Only 'lb' and 'worker' supported as
workerType attribute");
}
}
}
\ No newline at end of file
diff --git a/java/org/apache/catalina/ant/JMXGetTask.java
b/java/org/apache/catalina/ant/JMXGetTask.java
index fd0ba47ff4..b9d1c488b1 100644
--- a/java/org/apache/catalina/ant/JMXGetTask.java
+++ b/java/org/apache/catalina/ant/JMXGetTask.java
@@ -24,8 +24,8 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the JMX Get command (<code>/jmxproxy/?get</code>)
- * supported by the Tomcat manager application.
+ * Ant task that implements the JMX Get command (<code>/jmxproxy/?get</code>)
supported by the Tomcat manager
+ * application.
*
* @author Peter Rossbach
*/
@@ -36,7 +36,7 @@ public class JMXGetTask extends AbstractCatalinaTask {
/**
* The full bean name
*/
- protected String bean = null;
+ protected String bean = null;
/**
* The attribute you wish to alter
@@ -47,33 +47,37 @@ public class JMXGetTask extends AbstractCatalinaTask {
/**
* Get method for the bean name
+ *
* @return Bean name
*/
- public String getBean () {
+ public String getBean() {
return this.bean;
}
/**
* Set method for the bean name
+ *
* @param bean Bean name
*/
- public void setBean (String bean) {
+ public void setBean(String bean) {
this.bean = bean;
}
/**
* Get method for the attribute name
+ *
* @return Attribute name
*/
- public String getAttribute () {
+ public String getAttribute() {
return this.attribute;
}
/**
* Set method for the attribute name
+ *
* @param attribute Attribute name
*/
- public void setAttribute (String attribute) {
+ public void setAttribute(String attribute) {
this.attribute = attribute;
}
@@ -88,11 +92,10 @@ public class JMXGetTask extends AbstractCatalinaTask {
if (bean == null || attribute == null) {
throw new BuildException("Must specify 'bean' and 'attribute'
attributes");
}
- log("Getting attribute " + attribute +
- " in bean " + bean );
+ log("Getting attribute " + attribute + " in bean " + bean);
try {
- execute("/jmxproxy/?get=" + URLEncoder.encode(bean, getCharset())
- + "&att=" + URLEncoder.encode(attribute, getCharset()));
+ execute("/jmxproxy/?get=" + URLEncoder.encode(bean, getCharset())
+ "&att=" +
+ URLEncoder.encode(attribute, getCharset()));
} catch (UnsupportedEncodingException e) {
throw new BuildException("Invalid 'charset' attribute: " +
getCharset());
}
diff --git a/java/org/apache/catalina/ant/JMXQueryTask.java
b/java/org/apache/catalina/ant/JMXQueryTask.java
index d239efb98e..26565d9b97 100644
--- a/java/org/apache/catalina/ant/JMXQueryTask.java
+++ b/java/org/apache/catalina/ant/JMXQueryTask.java
@@ -24,8 +24,8 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the JMX Query command
- * (<code>/jmxproxy/?qry</code>) supported by the Tomcat manager application.
+ * Ant task that implements the JMX Query command
(<code>/jmxproxy/?qry</code>) supported by the Tomcat manager
+ * application.
*
* @author Vivek Chopra
*/
@@ -35,32 +35,37 @@ public class JMXQueryTask extends AbstractCatalinaTask {
/**
* The JMX query string
+ *
* @see #setQuery(String)
*/
- protected String query = null;
+ protected String query = null;
// Public Methods
/**
* Get method for the JMX query string
+ *
* @return Query string
*/
- public String getQuery () {
+ public String getQuery() {
return this.query;
}
/**
* Set method for the JMX query string.
- * <p>Examples of query format:</p>
+ * <p>
+ * Examples of query format:
+ * </p>
* <UL>
* <LI>*:*</LI>
* <LI>*:type=RequestProcessor,*</LI>
* <LI>*:j2eeType=Servlet,*</LI>
* <LI>Catalina:type=Environment,resourcetype=Global,name=simpleValue</LI>
* </UL>
+ *
* @param query JMX Query string
*/
- public void setQuery (String query) {
+ public void setQuery(String query) {
this.query = query;
}
@@ -83,6 +88,6 @@ public class JMXQueryTask extends AbstractCatalinaTask {
}
}
log("Query string is " + queryString);
- execute ("/jmxproxy/" + queryString);
+ execute("/jmxproxy/" + queryString);
}
}
diff --git a/java/org/apache/catalina/ant/JMXSetTask.java
b/java/org/apache/catalina/ant/JMXSetTask.java
index 547669aef7..3e2573829b 100644
--- a/java/org/apache/catalina/ant/JMXSetTask.java
+++ b/java/org/apache/catalina/ant/JMXSetTask.java
@@ -24,8 +24,8 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the JMX Set command (<code>/jmxproxy/?set</code>)
- * supported by the Tomcat manager application.
+ * Ant task that implements the JMX Set command (<code>/jmxproxy/?set</code>)
supported by the Tomcat manager
+ * application.
*
* @author Vivek Chopra
*/
@@ -36,7 +36,7 @@ public class JMXSetTask extends AbstractCatalinaTask {
/**
* The full bean name
*/
- protected String bean = null;
+ protected String bean = null;
/**
* The attribute you wish to alter
@@ -46,55 +46,61 @@ public class JMXSetTask extends AbstractCatalinaTask {
/**
* The new value for the attribute
*/
- protected String value = null;
+ protected String value = null;
// Public Methods
/**
* Get method for the bean name
+ *
* @return Bean name
*/
- public String getBean () {
+ public String getBean() {
return this.bean;
}
/**
* Set method for the bean name
+ *
* @param bean Bean name
*/
- public void setBean (String bean) {
+ public void setBean(String bean) {
this.bean = bean;
}
/**
* Get method for the attribute name
+ *
* @return Attribute name
*/
- public String getAttribute () {
+ public String getAttribute() {
return this.attribute;
}
/**
* Set method for the attribute name
+ *
* @param attribute Attribute name
*/
- public void setAttribute (String attribute) {
+ public void setAttribute(String attribute) {
this.attribute = attribute;
}
/**
* Get method for the attribute value
+ *
* @return Attribute value
*/
- public String getValue () {
+ public String getValue() {
return this.value;
}
/**
* Set method for the attribute value.
+ *
* @param value Attribute value
*/
- public void setValue (String value) {
+ public void setValue(String value) {
this.value = value;
}
@@ -109,13 +115,10 @@ public class JMXSetTask extends AbstractCatalinaTask {
if (bean == null || attribute == null || value == null) {
throw new BuildException("Must specify 'bean', 'attribute' and
'value' attributes");
}
- log("Setting attribute " + attribute +
- " in bean " + bean +
- " to " + value);
+ log("Setting attribute " + attribute + " in bean " + bean + " to " +
value);
try {
- execute("/jmxproxy/?set=" + URLEncoder.encode(bean, getCharset())
- + "&att=" + URLEncoder.encode(attribute, getCharset())
- + "&val=" + URLEncoder.encode(value, getCharset()));
+ execute("/jmxproxy/?set=" + URLEncoder.encode(bean, getCharset())
+ "&att=" +
+ URLEncoder.encode(attribute, getCharset()) + "&val=" +
URLEncoder.encode(value, getCharset()));
} catch (UnsupportedEncodingException e) {
throw new BuildException("Invalid 'charset' attribute: " +
getCharset());
}
diff --git a/java/org/apache/catalina/ant/ListTask.java
b/java/org/apache/catalina/ant/ListTask.java
index eeab9cd84f..378f04fcf9 100644
--- a/java/org/apache/catalina/ant/ListTask.java
+++ b/java/org/apache/catalina/ant/ListTask.java
@@ -21,10 +21,10 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/list</code> command, supported by the
- * Tomcat manager application.
+ * Ant task that implements the <code>/list</code> command, supported by the
Tomcat manager application.
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public class ListTask extends AbstractCatalinaTask {
diff --git a/java/org/apache/catalina/ant/ReloadTask.java
b/java/org/apache/catalina/ant/ReloadTask.java
index 4497c6ab3a..23b824da0d 100644
--- a/java/org/apache/catalina/ant/ReloadTask.java
+++ b/java/org/apache/catalina/ant/ReloadTask.java
@@ -17,15 +17,14 @@
package org.apache.catalina.ant;
-
import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/reload</code> command, supported by the
- * Tomcat manager application.
+ * Ant task that implements the <code>/reload</code> command, supported by the
Tomcat manager application.
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public class ReloadTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/ant/ResourcesTask.java
b/java/org/apache/catalina/ant/ResourcesTask.java
index b8b6c46be6..88dfa5c3a4 100644
--- a/java/org/apache/catalina/ant/ResourcesTask.java
+++ b/java/org/apache/catalina/ant/ResourcesTask.java
@@ -24,10 +24,10 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/resources</code> command, supported by
- * the Tomcat manager application.
+ * Ant task that implements the <code>/resources</code> command, supported by
the Tomcat manager application.
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public class ResourcesTask extends AbstractCatalinaTask {
@@ -37,8 +37,7 @@ public class ResourcesTask extends AbstractCatalinaTask {
/**
- * The fully qualified class name of the resource type being requested
- * (if any).
+ * The fully qualified class name of the resource type being requested (if
any).
*/
protected String type = null;
@@ -65,8 +64,7 @@ public class ResourcesTask extends AbstractCatalinaTask {
super.execute();
if (type != null) {
try {
- execute("/resources?type=" +
- URLEncoder.encode(type, getCharset()));
+ execute("/resources?type=" + URLEncoder.encode(type,
getCharset()));
} catch (UnsupportedEncodingException e) {
throw new BuildException("Invalid 'charset' attribute: " +
getCharset());
}
diff --git a/java/org/apache/catalina/ant/ServerinfoTask.java
b/java/org/apache/catalina/ant/ServerinfoTask.java
index f8c2cedc9b..d15ac86cb2 100644
--- a/java/org/apache/catalina/ant/ServerinfoTask.java
+++ b/java/org/apache/catalina/ant/ServerinfoTask.java
@@ -21,8 +21,7 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/serverinfo</code> command
- * supported by the Tomcat manager application.
+ * Ant task that implements the <code>/serverinfo</code> command supported by
the Tomcat manager application.
*
* @author Vivek Chopra
*/
diff --git a/java/org/apache/catalina/ant/SessionsTask.java
b/java/org/apache/catalina/ant/SessionsTask.java
index 3649ceb75b..78f3ce5ece 100644
--- a/java/org/apache/catalina/ant/SessionsTask.java
+++ b/java/org/apache/catalina/ant/SessionsTask.java
@@ -21,8 +21,7 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/sessions</code> command
- * supported by the Tomcat manager application.
+ * Ant task that implements the <code>/sessions</code> command supported by
the Tomcat manager application.
*
* @author Vivek Chopra
*/
diff --git a/java/org/apache/catalina/ant/SslConnectorCiphersTask.java
b/java/org/apache/catalina/ant/SslConnectorCiphersTask.java
index 45826a85df..2a96fcffab 100644
--- a/java/org/apache/catalina/ant/SslConnectorCiphersTask.java
+++ b/java/org/apache/catalina/ant/SslConnectorCiphersTask.java
@@ -21,9 +21,7 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/sslConnectorCiphers</code> command
- * supported by the Tomcat manager application.
- *
+ * Ant task that implements the <code>/sslConnectorCiphers</code> command
supported by the Tomcat manager application.
*/
public class SslConnectorCiphersTask extends AbstractCatalinaTask {
diff --git a/java/org/apache/catalina/ant/StartTask.java
b/java/org/apache/catalina/ant/StartTask.java
index 5eb3c464f8..cbf68f1065 100644
--- a/java/org/apache/catalina/ant/StartTask.java
+++ b/java/org/apache/catalina/ant/StartTask.java
@@ -21,10 +21,10 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/start</code> command, supported by the
- * Tomcat manager application.
+ * Ant task that implements the <code>/start</code> command, supported by the
Tomcat manager application.
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public class StartTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/ant/StopTask.java
b/java/org/apache/catalina/ant/StopTask.java
index 0ce063303b..c0cf0c49dc 100644
--- a/java/org/apache/catalina/ant/StopTask.java
+++ b/java/org/apache/catalina/ant/StopTask.java
@@ -21,10 +21,10 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/stop</code> command, supported by the
- * Tomcat manager application.
+ * Ant task that implements the <code>/stop</code> command, supported by the
Tomcat manager application.
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public class StopTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/ant/ThreaddumpTask.java
b/java/org/apache/catalina/ant/ThreaddumpTask.java
index 007da3367f..cef554fefe 100644
--- a/java/org/apache/catalina/ant/ThreaddumpTask.java
+++ b/java/org/apache/catalina/ant/ThreaddumpTask.java
@@ -21,9 +21,7 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/threaddump</code> command
- * supported by the Tomcat manager application.
- *
+ * Ant task that implements the <code>/threaddump</code> command supported by
the Tomcat manager application.
*/
public class ThreaddumpTask extends AbstractCatalinaTask {
diff --git a/java/org/apache/catalina/ant/UndeployTask.java
b/java/org/apache/catalina/ant/UndeployTask.java
index 15e8991c49..fd44b0a71f 100644
--- a/java/org/apache/catalina/ant/UndeployTask.java
+++ b/java/org/apache/catalina/ant/UndeployTask.java
@@ -21,10 +21,10 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/undeploy</code> command, supported by
- * the Tomcat manager application.
+ * Ant task that implements the <code>/undeploy</code> command, supported by
the Tomcat manager application.
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public class UndeployTask extends AbstractCatalinaCommandTask {
diff --git a/java/org/apache/catalina/ant/ValidatorTask.java
b/java/org/apache/catalina/ant/ValidatorTask.java
index 81d3997bc4..0ef4056f76 100644
--- a/java/org/apache/catalina/ant/ValidatorTask.java
+++ b/java/org/apache/catalina/ant/ValidatorTask.java
@@ -30,10 +30,10 @@ import org.xml.sax.InputSource;
/**
- * Task for validating a web application deployment descriptor, using XML
- * schema validation.
+ * Task for validating a web application deployment descriptor, using XML
schema validation.
*
* @author Remy Maucherat
+ *
* @since 5.0
*/
public class ValidatorTask extends BaseRedirectorHelperTask {
@@ -62,9 +62,8 @@ public class ValidatorTask extends BaseRedirectorHelperTask {
// --------------------------------------------------------- Public Methods
/**
- * Execute the specified command. This logic only performs the common
- * attribute validation required by all subclasses; it does not perform
- * any functional logic directly.
+ * Execute the specified command. This logic only performs the common
attribute validation required by all
+ * subclasses; it does not perform any functional logic directly.
*
* @exception BuildException if a validation error occurs
*/
@@ -87,8 +86,7 @@ public class ValidatorTask extends BaseRedirectorHelperTask {
// Called through trusted manager interface. If running under a
// SecurityManager assume that untrusted applications may be deployed.
- Digester digester = DigesterFactory.newDigester(
- true, true, null, Globals.IS_SECURITY_ENABLED);
+ Digester digester = DigesterFactory.newDigester(true, true, null,
Globals.IS_SECURITY_ENABLED);
try (InputStream stream = new BufferedInputStream(new
FileInputStream(file.getCanonicalFile()))) {
InputSource is = new
InputSource(file.toURI().toURL().toExternalForm());
is.setByteStream(stream);
diff --git a/java/org/apache/catalina/ant/VminfoTask.java
b/java/org/apache/catalina/ant/VminfoTask.java
index 52394cca26..6fccbc9e90 100644
--- a/java/org/apache/catalina/ant/VminfoTask.java
+++ b/java/org/apache/catalina/ant/VminfoTask.java
@@ -21,9 +21,7 @@ import org.apache.tools.ant.BuildException;
/**
- * Ant task that implements the <code>/vminfo</code> command
- * supported by the Tomcat manager application.
- *
+ * Ant task that implements the <code>/vminfo</code> command supported by the
Tomcat manager application.
*/
public class VminfoTask extends AbstractCatalinaTask {
diff --git a/java/org/apache/catalina/ant/jmx/Arg.java
b/java/org/apache/catalina/ant/jmx/Arg.java
index dc47302f3a..ba9059cae8 100644
--- a/java/org/apache/catalina/ant/jmx/Arg.java
+++ b/java/org/apache/catalina/ant/jmx/Arg.java
@@ -21,12 +21,12 @@ public class Arg {
private String type;
private String value;
- public void setType( String type) {
- this.type=type;
+ public void setType(String type) {
+ this.type = type;
}
- public void setValue( String value ) {
- this.value=value;
+ public void setValue(String value) {
+ this.value = value;
}
public String getValue() {
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
index 37e2e6a762..9fe020b2ac 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
@@ -20,6 +20,7 @@ import org.apache.tools.ant.BuildException;
/**
* <b>Definition</b>:
+ *
* <pre>
* <path id="catalina_ant">
* <fileset dir="${catalina.home}/server/lib">
@@ -38,6 +39,7 @@ import org.apache.tools.ant.BuildException;
* </pre>
*
* <b>Usage</b>: Wait for start backup node
+ *
* <pre>
* <target name="wait">
* <jmxOpen
@@ -61,28 +63,30 @@ import org.apache.tools.ant.BuildException;
* <fail if="server.timeout" message="Server ${url} don't answer
inside ${maxwait} sec" />
* <echo message="Server ${url} alive" />
* </target>
- *
* </pre>
+ *
* Allowed operation between jmx attribute and reference value:
* <ul>
- * <li>== equals</li>
- * <li>!= not equals</li>
+ * <li>== equals</li>
+ * <li>!= not equals</li>
* <li>> greater than (&gt;)</li>
* <li>>= greater than or equals (&gt;=)</li>
* <li>< lesser than (&lt;)</li>
* <li><= lesser than or equals (&lt;=)</li>
* </ul>
- * <b>NOTE</b>: For numeric expressions the type must be set and use xml
entities as operations.<br>
+ * <b>NOTE</b>: For numeric expressions the type must be set and use xml
entities as operations.<br>
* As type we currently support <em>long</em> and <em>double</em>.
+ *
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorCondition extends JMXAccessorConditionBase {
// ----------------------------------------------------- Instance Variables
- private String operation = "==" ;
- private String type = "long" ;
+ private String operation = "==";
+ private String type = "long";
private String unlessCondition;
private String ifCondition;
@@ -95,6 +99,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getOperation() {
return operation;
}
+
/**
* @param operation The operation to set.
*/
@@ -108,6 +113,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getType() {
return type;
}
+
/**
* @param type The type to set.
*/
@@ -121,23 +127,26 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getIf() {
return ifCondition;
}
+
/**
* Only execute if a property of the given name exists in the current
project.
+ *
* @param c property name
*/
public void setIf(String c) {
ifCondition = c;
}
- /**
+ /**
* @return Returns the unlessCondition.
*/
public String getUnless() {
return unlessCondition;
}
+
/**
- * Only execute if a property of the given name does not
- * exist in the current project.
+ * Only execute if a property of the given name does not exist in the
current project.
+ *
* @param c property name
*/
public void setUnless(String c) {
@@ -146,6 +155,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
/**
* test the if condition
+ *
* @return true if there is no if condition, or the named property exists
*/
protected boolean testIfCondition() {
@@ -157,8 +167,8 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
/**
* test the unless condition
- * @return true if there is no unless condition,
- * or there is a named property but it doesn't exist
+ *
+ * @return true if there is no unless condition, or there is a named
property but it doesn't exist
*/
protected boolean testUnlessCondition() {
if (unlessCondition == null || "".equals(unlessCondition)) {
@@ -168,8 +178,9 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
}
/**
- * This method evaluates the condition
- * It support for operation ">,>=,<,<=" the types
<code>long</code> and <code>double</code>.
+ * This method evaluates the condition It support for operation
">,>=,<,<=" the types <code>long</code>
+ * and <code>double</code>.
+ *
* @return expression <em>jmxValue</em> <em>operation</em> <em>value</em>
*/
@Override
@@ -182,8 +193,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
throw new BuildException("value attribute is not set");
}
if ((getName() == null || getAttribute() == null)) {
- throw new BuildException(
- "Must specify an MBean name and attribute for condition");
+ throw new BuildException("Must specify an MBean name and attribute
for condition");
}
if (testIfCondition() && testUnlessCondition()) {
String jmxValue = accessJMXValue();
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
index 27e30e609c..1b355508a0 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
@@ -35,7 +35,7 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
private String name = null;
private String attribute;
private String value;
- private String ref = "jmx.server" ;
+ private String ref = "jmx.server";
/**
* @return Returns the attribute.
@@ -43,90 +43,105 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
public String getAttribute() {
return attribute;
}
+
/**
* @param attribute The attribute to set.
*/
public void setAttribute(String attribute) {
this.attribute = attribute;
}
+
/**
* @return Returns the host.
*/
public String getHost() {
return host;
}
+
/**
* @param host The host to set.
*/
public void setHost(String host) {
this.host = host;
}
+
/**
* @return Returns the name.
*/
public String getName() {
return name;
}
+
/**
* @param objectName The name to set.
*/
public void setName(String objectName) {
this.name = objectName;
}
+
/**
* @return Returns the password.
*/
public String getPassword() {
return password;
}
+
/**
* @param password The password to set.
*/
public void setPassword(String password) {
this.password = password;
}
+
/**
* @return Returns the port.
*/
public String getPort() {
return port;
}
+
/**
* @param port The port to set.
*/
public void setPort(String port) {
this.port = port;
}
+
/**
* @return Returns the url.
*/
public String getUrl() {
return url;
}
+
/**
* @param url The url to set.
*/
public void setUrl(String url) {
this.url = url;
}
+
/**
* @return Returns the username.
*/
public String getUsername() {
return username;
}
+
/**
* @param username The username to set.
*/
public void setUsername(String username) {
this.username = username;
}
+
/**
* @return Returns the value.
*/
public String getValue() {
return value;
}
+
// The setter for the "value" attribute
public void setValue(String value) {
this.value = value;
@@ -138,6 +153,7 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
public String getRef() {
return ref;
}
+
/**
* @param refId The ref to set.
*/
@@ -146,19 +162,16 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
}
/**
- * Get JMXConnection (default look at <em>jmx.server</em> project reference
- * from jmxOpen Task).
+ * Get JMXConnection (default look at <em>jmx.server</em> project
reference from jmxOpen Task).
*
* @return active JMXConnection
+ *
* @throws MalformedURLException Invalid URL for JMX server
- * @throws IOException Connection error
+ * @throws IOException Connection error
*/
- protected MBeanServerConnection getJMXConnection()
- throws MalformedURLException, IOException {
- return JMXAccessorTask.accessJMXConnection(
- getProject(),
- getUrl(), getHost(),
- getPort(), getUsername(), getPassword(), ref);
+ protected MBeanServerConnection getJMXConnection() throws
MalformedURLException, IOException {
+ return JMXAccessorTask.accessJMXConnection(getProject(), getUrl(),
getHost(), getPort(), getUsername(),
+ getPassword(), ref);
}
/**
@@ -168,8 +181,7 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
*/
protected String accessJMXValue() {
try {
- Object result = getJMXConnection().getAttribute(
- new ObjectName(name), attribute);
+ Object result = getJMXConnection().getAttribute(new
ObjectName(name), attribute);
if (result != null) {
return result.toString();
}
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index 9c5fc961a5..61668aaf27 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -32,10 +32,10 @@ import org.apache.tools.ant.BuildException;
* <li>Create remote Mbeans with different classloader</li>
* </ul>
* <p>
- * Examples:
- * <br>
+ * Examples: <br>
* create a new Mbean at jmx.server connection
* </p>
+ *
* <pre>
* <jmx:create
* ref="jmx.server"
@@ -46,8 +46,8 @@ import org.apache.tools.ant.BuildException;
* </jmxCreate/>
* </pre>
* <p>
- * <b>WARNING</b>Not all Tomcat MBeans can create remotely and autoregister by
its parents!
- * Please, use the MBeanFactory operation to generate valves and realms.
+ * <b>WARNING</b>Not all Tomcat MBeans can create remotely and autoregister by
its parents! Please, use the MBeanFactory
+ * operation to generate valves and realms.
* </p>
* <p>
* First call to a remote MBeanserver save the JMXConnection a reference
<em>jmx.server</em>
@@ -55,6 +55,7 @@ import org.apache.tools.ant.BuildException;
* These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
+ *
* @since 5.5.12
*/
public class JMXAccessorCreateTask extends JMXAccessorTask {
@@ -62,7 +63,7 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
private String className;
private String classLoader;
- private List<Arg> args=new ArrayList<>();
+ private List<Arg> args = new ArrayList<>();
// ------------------------------------------------------------- Properties
@@ -94,7 +95,7 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
this.className = className;
}
- public void addArg(Arg arg ) {
+ public void addArg(Arg arg) {
args.add(arg);
}
@@ -104,6 +105,7 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
public List<Arg> getArgs() {
return args;
}
+
/**
* @param args The args to set.
*/
@@ -114,15 +116,13 @@ public class JMXAccessorCreateTask extends
JMXAccessorTask {
// ------------------------------------------------------ protected Methods
@Override
- public String jmxExecute(MBeanServerConnection jmxServerConnection)
- throws Exception {
+ public String jmxExecute(MBeanServerConnection jmxServerConnection) throws
Exception {
if (getName() == null) {
throw new BuildException("Must specify a 'name'");
}
if ((className == null)) {
- throw new BuildException(
- "Must specify a 'className' for get");
+ throw new BuildException("Must specify a 'className' for get");
}
jmxCreate(jmxServerConnection, getName());
return null;
@@ -132,25 +132,25 @@ public class JMXAccessorCreateTask extends
JMXAccessorTask {
* Create new MBean from ClassLoader identified by an ObjectName.
*
* @param jmxServerConnection Connection to the JMX server
- * @param name MBean name
+ * @param name MBean name
+ *
* @throws Exception Error creating MBean
*/
- protected void jmxCreate(MBeanServerConnection jmxServerConnection,
- String name) throws Exception {
+ protected void jmxCreate(MBeanServerConnection jmxServerConnection, String
name) throws Exception {
Object argsA[] = null;
String sigA[] = null;
if (args != null) {
- argsA = new Object[ args.size()];
+ argsA = new Object[args.size()];
sigA = new String[args.size()];
- for( int i=0; i<args.size(); i++ ) {
- Arg arg=args.get(i);
+ for (int i = 0; i < args.size(); i++) {
+ Arg arg = args.get(i);
if (arg.getType() == null) {
arg.setType("java.lang.String");
- sigA[i]=arg.getType();
- argsA[i]=arg.getValue();
+ sigA[i] = arg.getType();
+ argsA[i] = arg.getValue();
} else {
- sigA[i]=arg.getType();
- argsA[i]=convertStringToType(arg.getValue(),arg.getType());
+ sigA[i] = arg.getType();
+ argsA[i] = convertStringToType(arg.getValue(),
arg.getType());
}
}
}
@@ -158,20 +158,21 @@ public class JMXAccessorCreateTask extends
JMXAccessorTask {
if (isEcho()) {
handleOutput("create MBean " + name + " from class " +
className + " with classLoader " + classLoader);
}
- if(args == null) {
+ if (args == null) {
jmxServerConnection.createMBean(className, new
ObjectName(name), new ObjectName(classLoader));
} else {
- jmxServerConnection.createMBean(className, new
ObjectName(name), new ObjectName(classLoader),argsA,sigA);
+ jmxServerConnection.createMBean(className, new
ObjectName(name), new ObjectName(classLoader), argsA,
+ sigA);
}
} else {
if (isEcho()) {
handleOutput("create MBean " + name + " from class " +
className);
}
- if(args == null) {
+ if (args == null) {
jmxServerConnection.createMBean(className, new
ObjectName(name));
} else {
- jmxServerConnection.createMBean(className, new
ObjectName(name),argsA,sigA);
+ jmxServerConnection.createMBean(className, new
ObjectName(name), argsA, sigA);
}
}
}
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
index 7fcccc6743..c46ee21483 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
@@ -20,6 +20,7 @@ import org.apache.tools.ant.BuildException;
/**
* Definition
+ *
* <pre>
* <path id="catalina_ant">
* <fileset dir="${catalina.home}/server/lib">
@@ -34,6 +35,7 @@ import org.apache.tools.ant.BuildException;
* </pre>
*
* usage: Wait for start backup node
+ *
* <pre>
* <target name="wait">
* <waitfor maxwait="${maxwait}" maxwaitunit="second"
timeoutproperty="server.timeout" >
@@ -50,10 +52,10 @@ import org.apache.tools.ant.BuildException;
* <fail if="server.timeout" message="Server ${url} don't answer
inside ${maxwait} sec" />
* <echo message="Server ${url} alive" />
* </target>
- *
* </pre>
*
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorEqualsCondition extends JMXAccessorConditionBase {
@@ -66,10 +68,9 @@ public class JMXAccessorEqualsCondition extends
JMXAccessorConditionBase {
throw new BuildException("value attribute is not set");
}
if (getName() == null || getAttribute() == null) {
- throw new BuildException(
- "Must specify an MBean name and attribute for equals
condition");
+ throw new BuildException("Must specify an MBean name and attribute
for equals condition");
}
- //FIXME check url or host/parameter
+ // FIXME check url or host/parameter
String jmxValue = accessJMXValue();
if (jmxValue != null) {
return jmxValue.equals(value);
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
index 541abf2b0b..a0d6e2a388 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
@@ -31,10 +31,10 @@ import org.apache.tools.ant.BuildException;
* <li>Bind Get result as Ant properties</li>
* </ul>
* <p>
- * Examples:
- * <br>
+ * Examples: <br>
* Get an Mbean IDataSender attribute nrOfRequests and create a new ant
property <em>IDataSender.9025.nrOfRequests</em>
* </p>
+ *
* <pre>
* <jmx:get
* ref="jmx.server"
@@ -50,6 +50,7 @@ import org.apache.tools.ant.BuildException;
* These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorGetTask extends JMXAccessorTask {
@@ -79,17 +80,15 @@ public class JMXAccessorGetTask extends JMXAccessorTask {
// ------------------------------------------------------ protected Methods
@Override
- public String jmxExecute(MBeanServerConnection jmxServerConnection)
- throws Exception {
+ public String jmxExecute(MBeanServerConnection jmxServerConnection) throws
Exception {
if (getName() == null) {
throw new BuildException("Must specify a 'name'");
}
if ((attribute == null)) {
- throw new BuildException(
- "Must specify a 'attribute' for get");
+ throw new BuildException("Must specify a 'attribute' for get");
}
- return jmxGet(jmxServerConnection, getName());
+ return jmxGet(jmxServerConnection, getName());
}
@@ -97,19 +96,20 @@ public class JMXAccessorGetTask extends JMXAccessorTask {
* Get property value.
*
* @param jmxServerConnection Connection to the JMX server
- * @param name The MBean name
+ * @param name The MBean name
+ *
* @return The error message if any
+ *
* @throws Exception An error occurred
*/
protected String jmxGet(MBeanServerConnection jmxServerConnection, String
name) throws Exception {
String error = null;
- if(isEcho()) {
- handleOutput("MBean " + name + " get attribute " + attribute );
+ if (isEcho()) {
+ handleOutput("MBean " + name + " get attribute " + attribute);
}
- Object result = jmxServerConnection.getAttribute(
- new ObjectName(name), attribute);
+ Object result = jmxServerConnection.getAttribute(new ObjectName(name),
attribute);
if (result != null) {
- echoResult(attribute,result);
+ echoResult(attribute, result);
createProperty(result);
} else {
error = "Attribute " + attribute + " is empty";
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
index daf5013743..50f2d65064 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
@@ -32,17 +32,16 @@ import org.apache.tools.ant.BuildException;
* <li>open more then one JSR 160 rmi connection</li>
* <li>Get/Set Mbeans attributes</li>
* <li>Call Mbean Operation with arguments</li>
- * <li>Argument values can be converted from string to
int,long,float,double,boolean,ObjectName or InetAddress </li>
+ * <li>Argument values can be converted from string to
int,long,float,double,boolean,ObjectName or InetAddress</li>
* <li>Query Mbeans</li>
* <li>Show Get, Call, Query result at Ant console log</li>
* <li>Bind Get, Call, Query result at Ant properties</li>
* </ul>
- *
* Examples:
* <ul>
- * <li>
- * Get a session attribute hello from session with ref <em>${sessionid.0}</em>
form
- * app <em>Catalina:type=Manager,context=/ClusterTest,host=localhost</em>
+ * <li>Get a session attribute hello from session with ref
<em>${sessionid.0}</em> form app
+ * <em>Catalina:type=Manager,context=/ClusterTest,host=localhost</em>
+ *
* <pre>
* <jmx:invoke
* name="Catalina:type=Manager,context=/ClusterTest,host=localhost"
@@ -52,10 +51,9 @@ import org.apache.tools.ant.BuildException;
* <arg value="Hello"/>
* </jmx:invoke>
* </pre>
+ *
* </li>
- * <li>
- * Create new AccessLogger at localhost
- * <code>
+ * <li>Create new AccessLogger at localhost <code>
* <jmx:invoke
* name="Catalina:type=MBeanFactory"
* operation="createAccessLoggerValve"
@@ -64,11 +62,8 @@ import org.apache.tools.ant.BuildException;
* <arg value="Catalina:type=Host,host=localhost"/>
* </jmx:invoke>
*
- * </code>
- * </li>
- * <li>
- * Remove existing AccessLogger at localhost
- * <code>
+ * </code></li>
+ * <li>Remove existing AccessLogger at localhost <code>
* <jmx:invoke
* name="Catalina:type=MBeanFactory"
* operation="removeValve"
@@ -76,8 +71,7 @@ import org.apache.tools.ant.BuildException;
* <arg
value="Catalina:type=Valve,name=AccessLogValve,host=localhost"/>
* </jmx:invoke>
*
- * </code>
- * </li>
+ * </code></li>
* </ul>
* <p>
* First call to a remote MBeanserver save the JMXConnection a referenz
<em>jmx.server</em>
@@ -85,6 +79,7 @@ import org.apache.tools.ant.BuildException;
* These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorInvokeTask extends JMXAccessorTask {
@@ -92,8 +87,8 @@ public class JMXAccessorInvokeTask extends JMXAccessorTask {
// ----------------------------------------------------- Instance Variables
- private String operation ;
- private List<Arg> args=new ArrayList<>();
+ private String operation;
+ private List<Arg> args = new ArrayList<>();
// ------------------------------------------------------------- Properties
@@ -103,6 +98,7 @@ public class JMXAccessorInvokeTask extends JMXAccessorTask {
public String getOperation() {
return operation;
}
+
/**
* @param operation The operation to set.
*/
@@ -110,7 +106,7 @@ public class JMXAccessorInvokeTask extends JMXAccessorTask {
this.operation = operation;
}
- public void addArg(Arg arg ) {
+ public void addArg(Arg arg) {
args.add(arg);
}
@@ -120,6 +116,7 @@ public class JMXAccessorInvokeTask extends JMXAccessorTask {
public List<Arg> getArgs() {
return args;
}
+
/**
* @param args The args to set.
*/
@@ -130,49 +127,49 @@ public class JMXAccessorInvokeTask extends
JMXAccessorTask {
// ------------------------------------------------------ protected Methods
@Override
- public String jmxExecute(MBeanServerConnection jmxServerConnection)
- throws Exception {
+ public String jmxExecute(MBeanServerConnection jmxServerConnection) throws
Exception {
if (getName() == null) {
throw new BuildException("Must specify a 'name'");
}
if ((operation == null)) {
- throw new BuildException(
- "Must specify a 'operation' for call");
+ throw new BuildException("Must specify a 'operation' for call");
}
- return jmxInvoke(jmxServerConnection, getName());
+ return jmxInvoke(jmxServerConnection, getName());
}
/**
* Invoke specified operation.
*
* @param jmxServerConnection Connection to the JMX server
- * @param name The MBean name
+ * @param name The MBean name
+ *
* @return null (no error message to report other than exception)
+ *
* @throws Exception An error occurred
*/
protected String jmxInvoke(MBeanServerConnection jmxServerConnection,
String name) throws Exception {
- Object result ;
+ Object result;
if (args == null) {
result = jmxServerConnection.invoke(new ObjectName(name),
operation, null, null);
} else {
- Object argsA[]=new Object[ args.size()];
- String sigA[]=new String[args.size()];
- for( int i=0; i<args.size(); i++ ) {
- Arg arg=args.get(i);
+ Object argsA[] = new Object[args.size()];
+ String sigA[] = new String[args.size()];
+ for (int i = 0; i < args.size(); i++) {
+ Arg arg = args.get(i);
if (arg.getType() == null) {
arg.setType("java.lang.String");
- sigA[i]=arg.getType();
- argsA[i]=arg.getValue();
+ sigA[i] = arg.getType();
+ argsA[i] = arg.getValue();
} else {
- sigA[i]=arg.getType();
- argsA[i]=convertStringToType(arg.getValue(),arg.getType());
+ sigA[i] = arg.getType();
+ argsA[i] = convertStringToType(arg.getValue(),
arg.getType());
}
}
result = jmxServerConnection.invoke(new ObjectName(name),
operation, argsA, sigA);
}
- if(result != null) {
- echoResult(operation,result);
+ if (result != null) {
+ echoResult(operation, result);
createProperty(result);
}
return null;
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index f0dd05f482..0098f6acb7 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -38,6 +38,7 @@ import org.apache.tools.ant.BuildException;
* </ul>
* <br>
* Query a list of Mbeans.
+ *
* <pre>
* <jmxQuery
* host="127.0.0.1"
@@ -45,14 +46,13 @@ import org.apache.tools.ant.BuildException;
* name="Catalina:type=Manager,*
* resultproperty="manager" />
* </pre>
- * with attribute <em>attributebinding="true"</em> you can get
- * all attributes also from result objects.<br>
- * The property manager.length show the size of the result
- * and with manager.[0..length].name the
- * resulted ObjectNames are saved.
- * These tasks require Ant 1.6 or later interface.
+ *
+ * with attribute <em>attributebinding="true"</em> you can get all attributes
also from result objects.<br>
+ * The property manager.length show the size of the result and with
manager.[0..length].name the resulted ObjectNames
+ * are saved. These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorQueryTask extends JMXAccessorTask {
@@ -69,6 +69,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
public boolean isAttributebinding() {
return attributebinding;
}
+
/**
* @param attributeBinding The attributebinding to set.
*/
@@ -80,8 +81,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
@Override
- public String jmxExecute(MBeanServerConnection jmxServerConnection)
- throws Exception {
+ public String jmxExecute(MBeanServerConnection jmxServerConnection) throws
Exception {
if (getName() == null) {
throw new BuildException("Must specify a 'name'");
@@ -92,11 +92,12 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
/**
- * Call Mbean server for some mbeans with same domain, attributes.
- * with <em>attributebinding=true</em> you can save all attributes from
all found objects
+ * Call Mbean server for some mbeans with same domain, attributes. with
<em>attributebinding=true</em> you can save
+ * all attributes from all found objects
*
* @param jmxServerConnection Connection to the JMX server
- * @param qry The query
+ * @param qry The query
+ *
* @return null (no error message to report other than exception)
*/
protected String jmxQuery(MBeanServerConnection jmxServerConnection,
String qry) {
@@ -106,7 +107,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
try {
names = jmxServerConnection.queryNames(new ObjectName(qry), null);
if (resultproperty != null) {
- setProperty(resultproperty +
".Length",Integer.toString(names.size()));
+ setProperty(resultproperty + ".Length",
Integer.toString(names.size()));
}
} catch (Exception e) {
if (isEcho()) {
@@ -154,7 +155,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
}
continue;
}
- if ((value == null) || "modelerType".equals(attName)) {
+ if (value == null || "modelerType".equals(attName)) {
continue;
}
createProperty(pname + attName, value);
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
index c870f92c24..fdb8270ca3 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
@@ -34,10 +34,10 @@ import org.apache.tools.ant.BuildException;
* <li>Bind Get result as Ant properties</li>
* </ul>
* <p>
- * Examples:
- * Set an Mbean Manager attribute maxActiveSessions.
- * Set this attribute with fresh jmx connection without save reference
+ * Examples: Set an Mbean Manager attribute maxActiveSessions. Set this
attribute with fresh jmx connection without save
+ * reference
* </p>
+ *
* <pre>
* <jmx:set
* host="127.0.0.1"
@@ -56,6 +56,7 @@ import org.apache.tools.ant.BuildException;
* These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorSetTask extends JMXAccessorTask {
@@ -65,7 +66,7 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
private String attribute;
private String value;
private String type;
- private boolean convert = false ;
+ private boolean convert = false;
// ------------------------------------------------------------- Properties
@@ -89,6 +90,7 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
public String getValue() {
return value;
}
+
/**
* @param value The value to set.
*/
@@ -118,6 +120,7 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
public boolean isConvert() {
return convert;
}
+
/**
* @param convert The convert to set.
*/
@@ -127,43 +130,40 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
// ------------------------------------------------------ protected Methods
@Override
- public String jmxExecute(MBeanServerConnection jmxServerConnection)
- throws Exception {
+ public String jmxExecute(MBeanServerConnection jmxServerConnection) throws
Exception {
if (getName() == null) {
throw new BuildException("Must specify a 'name'");
}
if ((attribute == null || value == null)) {
- throw new BuildException(
- "Must specify a 'attribute' and 'value' for set");
+ throw new BuildException("Must specify a 'attribute' and 'value'
for set");
}
- return jmxSet(jmxServerConnection, getName());
+ return jmxSet(jmxServerConnection, getName());
}
/**
* Set property value.
*
* @param jmxServerConnection Connection to the JMX server
- * @param name The MBean name
+ * @param name The MBean name
+ *
* @return null (no error message to report other than exception)
+ *
* @throws Exception An error occurred
*/
- protected String jmxSet(MBeanServerConnection jmxServerConnection,
- String name) throws Exception {
+ protected String jmxSet(MBeanServerConnection jmxServerConnection, String
name) throws Exception {
Object realValue;
if (type != null) {
realValue = convertStringToType(value, type);
} else {
if (isConvert()) {
- String mType = getMBeanAttributeType(jmxServerConnection, name,
- attribute);
+ String mType = getMBeanAttributeType(jmxServerConnection,
name, attribute);
realValue = convertStringToType(value, mType);
} else {
realValue = value;
}
}
- jmxServerConnection.setAttribute(new ObjectName(name), new Attribute(
- attribute, realValue));
+ jmxServerConnection.setAttribute(new ObjectName(name), new
Attribute(attribute, realValue));
return null;
}
@@ -172,15 +172,15 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
* Get MBean Attribute from Mbean Server
*
* @param jmxServerConnection The JMX connection name
- * @param name The MBean name
- * @param attribute The attribute name
+ * @param name The MBean name
+ * @param attribute The attribute name
+ *
* @return The type of the attribute
+ *
* @throws Exception An error occurred
*/
- protected String getMBeanAttributeType(
- MBeanServerConnection jmxServerConnection,
- String name,
- String attribute) throws Exception {
+ protected String getMBeanAttributeType(MBeanServerConnection
jmxServerConnection, String name, String attribute)
+ throws Exception {
ObjectName oname = new ObjectName(name);
String mattrType = null;
MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index c03d543ab0..585461470d 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -51,13 +51,11 @@ import org.apache.tools.ant.Project;
* <li>open more then one JSR 160 rmi connection</li>
* <li>Get/Set Mbeans attributes</li>
* <li>Call Mbean Operation with arguments</li>
- * <li>Argument values can be converted from string to
- * int,long,float,double,boolean,ObjectName or InetAddress</li>
+ * <li>Argument values can be converted from string to
int,long,float,double,boolean,ObjectName or InetAddress</li>
* <li>Query Mbeans</li>
* <li>Show Get, Call, Query result at Ant console log</li>
* <li>Bind Get, Call, Query result at Ant properties</li>
* </ul>
- *
* Examples: open server with reference and authorisation
*
* <pre>
@@ -69,20 +67,18 @@ import org.apache.tools.ant.Project;
* password="mysecret"
* ref="jmx.myserver"
* />
- *
* </pre>
*
* All calls after opening with same refid reuse the connection.
* <p>
- * First call to a remote MBeanserver save the JMXConnection a referenz
- * <em>jmx.server</em>
+ * First call to a remote MBeanserver save the JMXConnection a referenz
<em>jmx.server</em>
* </p>
- * All JMXAccessorXXXTask support the attribute <em>if</em> and
- * <em>unless</em>. With <em>if</em> the task is only execute when property
- * exist and with <em>unless</em> when property not exists. <br><b>NOTE
- * </b>: These tasks require Ant 1.6 or later interface.
+ * All JMXAccessorXXXTask support the attribute <em>if</em> and
<em>unless</em>. With <em>if</em> the task is only
+ * execute when property exist and with <em>unless</em> when property not
exists. <br>
+ * <b>NOTE </b>: These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorTask extends BaseRedirectorHelperTask {
@@ -172,8 +168,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
}
/**
- * @param echo
- * The echo to set.
+ * @param echo The echo to set.
*/
public void setEcho(boolean echo) {
this.echo = echo;
@@ -187,8 +182,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
}
/**
- * @param separateArrayResults
- * The separatearrayresults to set.
+ * @param separateArrayResults The separatearrayresults to set.
*/
public void setSeparatearrayresults(boolean separateArrayResults) {
this.separatearrayresults = separateArrayResults;
@@ -278,8 +272,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
}
/**
- * Only execute if a property of the given name exists in the current
- * project.
+ * Only execute if a property of the given name exists in the current
project.
*
* @param c property name
*/
@@ -295,8 +288,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
}
/**
- * Only execute if a property of the given name does not exist in the
- * current project.
+ * Only execute if a property of the given name does not exist in the
current project.
*
* @param c property name
*/
@@ -307,12 +299,10 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
// --------------------------------------------------------- Public Methods
/**
- * Execute the specified command. This logic only performs the common
- * attribute validation required by all subclasses; it does not perform any
- * functional logic directly.
+ * Execute the specified command. This logic only performs the common
attribute validation required by all
+ * subclasses; it does not perform any functional logic directly.
*
- * @exception BuildException
- * if a validation error occurs
+ * @exception BuildException if a validation error occurs
*/
@Override
public void execute() throws BuildException {
@@ -342,27 +332,27 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
/**
* Create a new JMX Connection with auth when username and password is set.
*
- * @param url URL to be used for the JMX connection
- * (if specified, it is a complete URL so host and port will not
- * be used)
- * @param host Host name of the JMX server
- * @param port Port number for the JMX server
+ * @param url URL to be used for the JMX connection (if specified, it
is a complete URL so host and port will
+ * not be used)
+ * @param host Host name of the JMX server
+ * @param port Port number for the JMX server
* @param username User name for the connection
* @param password Credentials corresponding to the specified user
+ *
* @throws MalformedURLException Invalid URL specified
- * @throws IOException Other connection error
+ * @throws IOException Other connection error
+ *
* @return the JMX connection
*/
- public static MBeanServerConnection createJMXConnection(String url,
- String host, String port, String username, String password)
- throws MalformedURLException, IOException {
+ public static MBeanServerConnection createJMXConnection(String url, String
host, String port, String username,
+ String password) throws MalformedURLException, IOException {
String urlForJMX;
if (url != null) {
urlForJMX = url;
} else {
urlForJMX = JMX_SERVICE_PREFIX + host + ":" + port +
JMX_SERVICE_SUFFIX;
}
- Map<String, String[]> environment = null;
+ Map<String,String[]> environment = null;
if (username != null && password != null) {
String[] credentials = new String[2];
credentials[0] = username;
@@ -370,8 +360,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
environment = new HashMap<>();
environment.put(JMXConnector.CREDENTIALS, credentials);
}
- return JMXConnectorFactory.connect(new JMXServiceURL(urlForJMX),
- environment).getMBeanServerConnection();
+ return JMXConnectorFactory.connect(new JMXServiceURL(urlForJMX),
environment).getMBeanServerConnection();
}
@@ -390,8 +379,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
/**
* test the unless condition
*
- * @return true if there is no unless condition, or there is a named
- * property but it doesn't exist
+ * @return true if there is no unless condition, or there is a named
property but it doesn't exist
*/
protected boolean testUnlessCondition() {
if (unlessCondition == null || "".equals(unlessCondition)) {
@@ -403,24 +391,23 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
/**
* Get Current Connection from <em>ref</em> parameter or create a new one!
*
- * @param project The Ant project
- * @param url URL to be used for the JMX connection
- * (if specified, it is a complete URL so host and port will not
- * be used)
- * @param host Host name of the JMX server
- * @param port Port number for the JMX server
+ * @param project The Ant project
+ * @param url URL to be used for the JMX connection (if specified, it
is a complete URL so host and port will
+ * not be used)
+ * @param host Host name of the JMX server
+ * @param port Port number for the JMX server
* @param username User name for the connection
* @param password Credentials corresponding to the specified user
- * @param refId The Id of the reference to retrieve in the project
+ * @param refId The Id of the reference to retrieve in the project
+ *
* @throws MalformedURLException Invalid URL specified
- * @throws IOException Other connection error
+ * @throws IOException Other connection error
+ *
* @return the JMX connection
*/
@SuppressWarnings("null")
- public static MBeanServerConnection accessJMXConnection(Project project,
- String url, String host, String port, String username,
- String password, String refId) throws MalformedURLException,
- IOException {
+ public static MBeanServerConnection accessJMXConnection(Project project,
String url, String host, String port,
+ String username, String password, String refId) throws
MalformedURLException, IOException {
MBeanServerConnection jmxServerConnection = null;
boolean isRef = project != null && refId != null && refId.length() > 0;
if (isRef) {
@@ -428,14 +415,12 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
try {
jmxServerConnection = (MBeanServerConnection) pref;
} catch (ClassCastException cce) {
- project.log("wrong object reference " + refId + " - "
- + pref.getClass());
+ project.log("wrong object reference " + refId + " - " +
pref.getClass());
return null;
}
}
if (jmxServerConnection == null) {
- jmxServerConnection = createJMXConnection(url, host, port,
- username, password);
+ jmxServerConnection = createJMXConnection(url, host, port,
username, password);
}
if (isRef && jmxServerConnection != null) {
project.addReference(refId, jmxServerConnection);
@@ -449,51 +434,48 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
* get JMXConnection
*
* @throws MalformedURLException Invalid URL specified
- * @throws IOException Other connection error
+ * @throws IOException Other connection error
+ *
* @return the JMX connection
*/
- protected MBeanServerConnection getJMXConnection()
- throws MalformedURLException, IOException {
+ protected MBeanServerConnection getJMXConnection() throws
MalformedURLException, IOException {
MBeanServerConnection jmxServerConnection = null;
if (isUseRef()) {
- Object pref = null ;
- if(getProject() != null) {
+ Object pref = null;
+ if (getProject() != null) {
pref = getProject().getReference(getRef());
if (pref != null) {
try {
jmxServerConnection = (MBeanServerConnection) pref;
} catch (ClassCastException cce) {
- getProject().log(
- "Wrong object reference " + getRef() + " - "
- + pref.getClass());
+ getProject().log("Wrong object reference " + getRef()
+ " - " + pref.getClass());
return null;
}
}
}
if (jmxServerConnection == null) {
- jmxServerConnection = accessJMXConnection(getProject(),
- getUrl(), getHost(), getPort(), getUsername(),
+ jmxServerConnection = accessJMXConnection(getProject(),
getUrl(), getHost(), getPort(), getUsername(),
getPassword(), getRef());
}
} else {
- jmxServerConnection = accessJMXConnection(getProject(), getUrl(),
- getHost(), getPort(), getUsername(), getPassword(), null);
+ jmxServerConnection = accessJMXConnection(getProject(), getUrl(),
getHost(), getPort(), getUsername(),
+ getPassword(), null);
}
return jmxServerConnection;
}
/**
- * Execute the specified command, based on the configured properties. The
- * input stream will be closed upon completion of this task, whether it was
- * executed successfully or not.
+ * Execute the specified command, based on the configured properties. The
input stream will be closed upon
+ * completion of this task, whether it was executed successfully or not.
*
* @param jmxServerConnection The JMX connection that should be used
+ *
* @return An error message string in some situations
+ *
* @exception Exception if an error occurs
*/
- public String jmxExecute(MBeanServerConnection jmxServerConnection)
- throws Exception {
+ public String jmxExecute(MBeanServerConnection jmxServerConnection) throws
Exception {
if ((jmxServerConnection == null)) {
throw new BuildException("Must open a connection!");
@@ -504,11 +486,11 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
}
/**
- * Convert string to datatype FIXME How we can transfer values from ant
- * project reference store (ref)?
+ * Convert string to datatype FIXME How we can transfer values from ant
project reference store (ref)?
*
- * @param value The value
+ * @param value The value
* @param valueType The type
+ *
* @return The converted object
*/
protected Object convertStringToType(String value, String valueType) {
@@ -525,8 +507,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
handleErrorOutput("Unable to convert to integer:" + value);
}
}
- } else if ("java.lang.Long".equals(valueType)
- || "long".equals(valueType)) {
+ } else if ("java.lang.Long".equals(valueType) ||
"long".equals(valueType)) {
try {
convertValue = Long.valueOf(value);
} catch (NumberFormatException ex) {
@@ -534,11 +515,9 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
handleErrorOutput("Unable to convert to long:" + value);
}
}
- } else if ("java.lang.Boolean".equals(valueType)
- || "boolean".equals(valueType)) {
+ } else if ("java.lang.Boolean".equals(valueType) ||
"boolean".equals(valueType)) {
convertValue = Boolean.valueOf(value);
- } else if ("java.lang.Float".equals(valueType)
- || "float".equals(valueType)) {
+ } else if ("java.lang.Float".equals(valueType) ||
"float".equals(valueType)) {
try {
convertValue = Float.valueOf(value);
} catch (NumberFormatException ex) {
@@ -546,8 +525,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
handleErrorOutput("Unable to convert to float:" + value);
}
}
- } else if ("java.lang.Double".equals(valueType)
- || "double".equals(valueType)) {
+ } else if ("java.lang.Double".equals(valueType) ||
"double".equals(valueType)) {
try {
convertValue = Double.valueOf(value);
} catch (NumberFormatException ex) {
@@ -555,8 +533,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
handleErrorOutput("Unable to convert to double:" + value);
}
}
- } else if ("javax.management.ObjectName".equals(valueType)
- || "name".equals(valueType)) {
+ } else if ("javax.management.ObjectName".equals(valueType) ||
"name".equals(valueType)) {
try {
convertValue = new ObjectName(value);
} catch (MalformedObjectNameException e) {
@@ -577,7 +554,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
}
/**
- * @param name context of result
+ * @param name context of result
* @param result The result
*/
protected void echoResult(String name, Object result) {
@@ -596,6 +573,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
* create result as property with name from attribute resultproperty
*
* @param result The result
+ *
* @see #createProperty(String, Object)
*/
protected void createProperty(Object result) {
@@ -605,15 +583,13 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
}
/**
- * create result as property with name from property prefix When result is
- * an array and isSeparateArrayResults is true, resultproperty used as
- * prefix (<code>resultproperty.0-array.length</code> and store the
- * result array length at <code>resultproperty.length</code>. Other
- * option is that you delimit your result with a delimiter
+ * create result as property with name from property prefix When result is
an array and isSeparateArrayResults is
+ * true, resultproperty used as prefix
(<code>resultproperty.0-array.length</code> and store the result array length
+ * at <code>resultproperty.length</code>. Other option is that you delimit
your result with a delimiter
* (java.util.StringTokenizer is used).
*
* @param propertyPrefix Prefix for the property
- * @param result The result
+ * @param result The result
*/
protected void createProperty(String propertyPrefix, Object result) {
if (propertyPrefix == null) {
@@ -638,8 +614,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
for (Object key1 : ((List<?>) key)) {
CompositeData valuedata = data.get(new Object[] { key1 });
Object value = valuedata.get("value");
- OpenType<?> type = valuedata.getCompositeType().getType(
- "value");
+ OpenType<?> type =
valuedata.getCompositeType().getType("value");
if (type instanceof SimpleType<?>) {
setProperty(propertyPrefix + "." + key1, value);
} else {
@@ -651,21 +626,18 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
if (isSeparatearrayresults()) {
int size = 0;
for (int i = 0; i < Array.getLength(result); i++) {
- if (setProperty(propertyPrefix + "." + size, Array.get(
- result, i))) {
+ if (setProperty(propertyPrefix + "." + size,
Array.get(result, i))) {
size++;
}
}
if (size > 0) {
- setProperty(propertyPrefix + ".Length", Integer
- .toString(size));
+ setProperty(propertyPrefix + ".Length",
Integer.toString(size));
}
}
} else {
String delim = getDelimiter();
if (delim != null) {
- StringTokenizer tokenizer = new StringTokenizer(result
- .toString(), delim);
+ StringTokenizer tokenizer = new
StringTokenizer(result.toString(), delim);
int size = 0;
for (; tokenizer.hasMoreTokens();) {
String token = tokenizer.nextToken();
@@ -684,7 +656,9 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
/**
* Get Property
+ *
* @param property name
+ *
* @return The property value
*/
public String getProperty(String property) {
@@ -698,7 +672,8 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
/**
* @param property The property
- * @param value The value
+ * @param value The value
+ *
* @return True if successful
*/
public boolean setProperty(String property, Object value) {
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
index 1226d5e9a9..4ae2aee5f5 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
@@ -27,19 +27,18 @@ import org.apache.tools.ant.BuildException;
* <li>unregister Mbeans</li>
* </ul>
* <p>
- * Examples:
- * <br>
+ * Examples: <br>
* unregister an existing Mbean at jmx.server connection
* </p>
+ *
* <pre>
* <jmx:unregister
* ref="jmx.server"
* name="Catalina:type=MBeanFactory" />
* </pre>
* <p>
- * <b>WARNING</b>Not all Tomcat MBeans can successfully unregister remotely.
The mbean
- * unregistration don't remove valves, realm, .. from parent class.
- * Please, use the MBeanFactory operation to remove valves and realms.
+ * <b>WARNING</b>Not all Tomcat MBeans can successfully unregister remotely.
The mbean unregistration don't remove
+ * valves, realm, .. from parent class. Please, use the MBeanFactory operation
to remove valves and realms.
* </p>
* <p>
* First call to a remote MBeanserver save the JMXConnection a reference
<em>jmx.server</em>
@@ -47,6 +46,7 @@ import org.apache.tools.ant.BuildException;
* These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
+ *
* @since 5.5.12
*/
public class JMXAccessorUnregisterTask extends JMXAccessorTask {
@@ -54,13 +54,12 @@ public class JMXAccessorUnregisterTask extends
JMXAccessorTask {
// ------------------------------------------------------ protected Methods
@Override
- public String jmxExecute(MBeanServerConnection jmxServerConnection)
- throws Exception {
+ public String jmxExecute(MBeanServerConnection jmxServerConnection) throws
Exception {
if (getName() == null) {
throw new BuildException("Must specify a 'name'");
}
- return jmxUuregister(jmxServerConnection, getName());
+ return jmxUuregister(jmxServerConnection, getName());
}
@@ -68,17 +67,18 @@ public class JMXAccessorUnregisterTask extends
JMXAccessorTask {
* Unregister MBean.
*
* @param jmxServerConnection Connection to the JMX server
- * @param name The MBean name
+ * @param name The MBean name
+ *
* @return null (no error message to report other than exception)
+ *
* @throws Exception An error occurred
*/
- protected String jmxUuregister(MBeanServerConnection
jmxServerConnection,String name) throws Exception {
+ protected String jmxUuregister(MBeanServerConnection jmxServerConnection,
String name) throws Exception {
String error = null;
- if(isEcho()) {
- handleOutput("Unregister MBean " + name );
+ if (isEcho()) {
+ handleOutput("Unregister MBean " + name);
}
- jmxServerConnection.unregisterMBean(
- new ObjectName(name));
+ jmxServerConnection.unregisterMBean(new ObjectName(name));
return error;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
