You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/22 23:07:42 UTC
svn commit: r1187783 - in /tomcat/trunk/java/org/apache/catalina/ant: ./ jmx/
Author: markt
Date: Sat Oct 22 21:07:41 2011
New Revision: 1187783
URL: http://svn.apache.org/viewvc?rev=1187783&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/ant
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
tomcat/trunk/java/org/apache/catalina/ant/FindLeaksTask.java
tomcat/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java
tomcat/trunk/java/org/apache/catalina/ant/JMXGetTask.java
tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java
tomcat/trunk/java/org/apache/catalina/ant/JMXSetTask.java
tomcat/trunk/java/org/apache/catalina/ant/ListTask.java
tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java
tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java
tomcat/trunk/java/org/apache/catalina/ant/ServerinfoTask.java
tomcat/trunk/java/org/apache/catalina/ant/SessionsTask.java
tomcat/trunk/java/org/apache/catalina/ant/StartTask.java
tomcat/trunk/java/org/apache/catalina/ant/StopTask.java
tomcat/trunk/java/org/apache/catalina/ant/UndeployTask.java
tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/trunk/java/org/apache/catalina/ant/antlib.xml
tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html
tomcat/trunk/java/org/apache/catalina/ant/package.html
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,12 +49,12 @@ public abstract class AbstractCatalinaCo
public void setVersion(String version) {
this.version = version;
}
-
+
// --------------------------------------------------------- Public Methods
/**
* Create query string for the specified command.
- *
+ *
* @param command Command to be executed
*
* @exception BuildException if an error occurs
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@ public abstract class AbstractCatalinaTa
/**
* manager webapp's encoding.
- */
+ */
private static String CHARSET = "utf-8";
@@ -189,7 +189,7 @@ public abstract class AbstractCatalinaTa
if (contentLength >= 0) {
hconn.setRequestProperty("Content-Length",
"" + contentLength);
-
+
hconn.setFixedLengthStreamingMode(contentLength);
}
} else {
Modified: tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,16 +35,16 @@ import org.apache.tools.ant.types.Redire
* Abstract base class to add output redirection support for Catalina
* Ant tasks. These tasks require Ant 1.5 or later.
* <br>
- * <strong>WARNING:</strong> due to depends chain, Ant could call a Task
+ * <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
+ * 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
* @version $Id$
@@ -68,7 +68,7 @@ public abstract class BaseRedirectorHelp
PrintStream redirectOutPrintStream = null;
/** The print stream for error output */
PrintStream redirectErrPrintStream = null;
-
+
/**
* Whether to fail (with a BuildException) if
* ManagerServlet returns an error. The default behavior is
@@ -77,23 +77,23 @@ public abstract class BaseRedirectorHelp
* 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.
- */
+ */
protected boolean failOnError = true;
-
- /**
+
+ /**
* <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.
- */
+ */
protected boolean redirectorConfigured = false;
- /**
- * Flag which indicates that, if redirected, output should also be
+ /**
+ * 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.
*/
@@ -115,7 +115,7 @@ public abstract class BaseRedirectorHelp
public boolean isFailOnError() {
return failOnError;
}
-
+
/**
* File the output of the task is redirected to.
@@ -257,7 +257,7 @@ public abstract class BaseRedirectorHelp
/**
* 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
+ * 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.
*/
@@ -272,7 +272,7 @@ public abstract class BaseRedirectorHelp
}
/*
* Due to depends chain, Ant could call the Task more than once,
- * this is to prevent that we attempt to reuse the previously
+ * this is to prevent that we attempt to reuse the previously
* closed Streams.
*/
redirectOutStream = null;
@@ -280,7 +280,7 @@ public abstract class BaseRedirectorHelp
redirectErrStream = null;
redirectErrPrintStream = null;
}
-
+
/**
* Handles output with the INFO priority.
*
@@ -296,7 +296,7 @@ public abstract class BaseRedirectorHelp
if (alwaysLog) {
log(output, Project.MSG_INFO);
}
- } else {
+ } else {
log(output, Project.MSG_INFO);
}
}
@@ -328,7 +328,7 @@ public abstract class BaseRedirectorHelp
if (alwaysLog) {
log(output, Project.MSG_ERR);
}
- } else {
+ } else {
log(output, Project.MSG_ERR);
}
}
@@ -344,7 +344,7 @@ public abstract class BaseRedirectorHelp
handleErrorOutput(output);
redirectErrPrintStream.flush();
}
-
+
/**
* Handles output with ERR priority to error stream and all other
* priorities to output stream.
Modified: tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,7 +59,7 @@ public class DeployTask extends Abstract
/**
- * URL of the server local web application archive (WAR) file
+ * URL of the server local web application archive (WAR) file
* to be deployed.
*/
protected String localWar = null;
Modified: tomcat/trunk/java/org/apache/catalina/ant/FindLeaksTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/FindLeaksTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/FindLeaksTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/FindLeaksTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import org.apache.tools.ant.BuildExcepti
/**
* Ant task that implements the <code>/status</code> command, supported by the
* mod_jk status (1.2.9) application.
- *
+ *
* @author Peter Rossbach
* @version $Revision$
* @since 5.5.9
@@ -55,13 +55,13 @@ public class JKStatusUpdateTask extends
private Boolean workerDisabled = Boolean.FALSE;
private Boolean workerStopped = Boolean.FALSE;
-
+
private boolean isLBMode = true;
private String workerLb;
/**
- *
+ *
*/
public JKStatusUpdateTask() {
super();
@@ -224,14 +224,14 @@ public class JKStatusUpdateTask extends
public Boolean getWorkerStopped() {
return workerStopped;
}
-
+
/**
* @param workerStopped The workerStopped to set.
*/
public void setWorkerStopped(Boolean workerStopped) {
this.workerStopped = workerStopped;
}
-
+
/**
* @return Returns the workerLoadFactor.
*/
@@ -264,7 +264,7 @@ public class JKStatusUpdateTask extends
/**
* Execute the requested operation.
- *
+ *
* @exception BuildException
* if an error occurs
*/
@@ -287,7 +287,7 @@ public class JKStatusUpdateTask extends
* </b>http://localhost/status?cmd=update&mime=txt&w=node1&l=lb&wf=1&wd=false&ws=false
* </li>
* </ul>
- *
+ *
* @return create jkstatus link
*/
private StringBuilder createLink() {
Modified: tomcat/trunk/java/org/apache/catalina/ant/JMXGetTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/JMXGetTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JMXGetTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JMXGetTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,7 +47,7 @@ public class JMXGetTask extends Abstract
protected String attribute = null;
// Public Methods
-
+
/**
* Get method for the bean name
* @return Bean name
@@ -95,7 +95,7 @@ public class JMXGetTask extends Abstract
log("Getting attribute " + attribute +
" in bean " + bean );
try {
- execute("/jmxproxy/?get=" + URLEncoder.encode(bean, getCharset())
+ execute("/jmxproxy/?get=" + URLEncoder.encode(bean, getCharset())
+ "&att=" + URLEncoder.encode(attribute, getCharset()));
} catch (UnsupportedEncodingException e) {
throw new BuildException
Modified: tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ import org.apache.tools.ant.BuildExcepti
/**
- * Ant task that implements the JMX Query command
+ * Ant task that implements the JMX Query command
* (<code>/jmxproxy/?qry</code>) supported by the Tomcat manager application.
*
* @author Vivek Chopra
@@ -37,13 +37,13 @@ public class JMXQueryTask extends Abstra
// Properties
/**
- * The JMX query string
+ * The JMX query string
* @see #setQuery(String)
*/
protected String query = null;
// Public Methods
-
+
/**
* Get method for the JMX query string
* @return Query string
@@ -61,7 +61,7 @@ public class JMXQueryTask extends Abstra
* <LI>*:j2eeType=Servlet,*</LI>
* <LI>Catalina:type=Environment,resourcetype=Global,name=simpleValue</LI>
* </UL>
- * </P>
+ * </P>
* @param query JMX Query string
*/
public void setQuery (String query) {
@@ -87,7 +87,7 @@ public class JMXQueryTask extends Abstra
("Invalid 'charset' attribute: " + getCharset());
}
}
- log("Query string is " + queryString);
+ log("Query string is " + queryString);
execute ("/jmxproxy/" + queryString);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/ant/JMXSetTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/JMXSetTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JMXSetTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JMXSetTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,7 +52,7 @@ public class JMXSetTask extends Abstract
protected String value = null;
// Public Methods
-
+
/**
* Get method for the bean name
* @return Bean name
@@ -115,10 +115,10 @@ public class JMXSetTask extends Abstract
}
log("Setting attribute " + attribute +
" in bean " + bean +
- " to " + value);
+ " to " + value);
try {
- execute("/jmxproxy/?set=" + URLEncoder.encode(bean, getCharset())
- + "&att=" + URLEncoder.encode(attribute, getCharset())
+ execute("/jmxproxy/?set=" + URLEncoder.encode(bean, getCharset())
+ + "&att=" + URLEncoder.encode(attribute, getCharset())
+ "&val=" + URLEncoder.encode(value, getCharset()));
} catch (UnsupportedEncodingException e) {
throw new BuildException
Modified: tomcat/trunk/java/org/apache/catalina/ant/ListTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ListTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ListTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ListTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/ant/ServerinfoTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ServerinfoTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ServerinfoTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ServerinfoTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/ant/SessionsTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/SessionsTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/SessionsTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/SessionsTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,15 +33,15 @@ public class SessionsTask extends Abstra
protected String idle = null;
-
+
public String getIdle() {
return this.idle;
}
-
+
public void setIdle(String idle) {
this.idle = idle;
}
-
+
@Override
public StringBuilder createQueryString(String command) {
StringBuilder buffer = super.createQueryString(command);
@@ -51,7 +51,7 @@ public class SessionsTask extends Abstra
}
return buffer;
}
-
+
/**
* Execute the requested operation.
*
@@ -62,7 +62,7 @@ public class SessionsTask extends Abstra
super.execute();
execute(createQueryString("/sessions").toString());
-
+
}
}
Modified: tomcat/trunk/java/org/apache/catalina/ant/StartTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/StartTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/StartTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/StartTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/ant/StopTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/StopTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/StopTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/StopTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,5 +45,5 @@ public class StopTask extends AbstractCa
}
-
+
}
Modified: tomcat/trunk/java/org/apache/catalina/ant/UndeployTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/UndeployTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/UndeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/UndeployTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@ import org.xml.sax.InputSource;
/**
- * Task for validating a web application deployment descriptor, using XML
+ * Task for validating a web application deployment descriptor, using XML
* schema validation.
*
* @author Remy Maucherat
@@ -93,7 +93,7 @@ public class ValidatorTask extends BaseR
Digester digester = DigesterFactory.newDigester(true, true, null);
try {
file = file.getCanonicalFile();
- InputStream stream =
+ InputStream stream =
new BufferedInputStream(new FileInputStream(file));
InputSource is =
new InputSource(file.toURI().toURL().toExternalForm());
Modified: tomcat/trunk/java/org/apache/catalina/ant/antlib.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/antlib.xml?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/antlib.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/antlib.xml Sat Oct 22 21:07:41 2011
@@ -30,7 +30,7 @@
classname="org.apache.catalina.ant.ReloadTask" />
<typedef
name="stop"
- classname="org.apache.catalina.ant.StopTask" />
+ classname="org.apache.catalina.ant.StopTask" />
<typedef
name="undeploy"
classname="org.apache.catalina.ant.UndeployTask" />
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ import org.apache.tools.ant.taskdefs.con
/**
*
* <b>Definition</b>:
- * <pre>
+ * <pre>
* <path id="catalina_ant">
* <fileset dir="${catalina.home}/server/lib">
* <include name="catalina-ant.jar"/>
@@ -46,7 +46,7 @@ import org.apache.tools.ant.taskdefs.con
* classname="org.apache.catalina.ant.jmx.JMXAccessorTask"
* classpathref="catalina_ant"/>
* </pre>
- *
+ *
* <b>Usage</b>: Wait for start backup node
* <pre>
* <target name="wait">
@@ -58,7 +58,7 @@ import org.apache.tools.ant.taskdefs.con
* <http url="${url}"/>
* <jmxCondition
* name="Catalina:type=IDataSender,host=localhost,senderAddress=192.168.111.1,senderPort=9025"
- * operation="=="
+ * operation="=="
* attribute="connected" value="true"
* />
* <jmxCondition
@@ -81,7 +81,7 @@ import org.apache.tools.ant.taskdefs.con
* <li>>= greater than or equals (&gt;=)</li>
* <li>< lesser than (&lt;)</li>
* <li><= lesser than or equals (&lt;=)</li>
- * </ul>
+ * </ul>
* <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
@@ -106,7 +106,7 @@ public class JMXAccessorCondition extend
private String ref = "jmx.server";
private String unlessCondition;
private String ifCondition;
-
+
// ----------------------------------------------------- Properties
/**
@@ -228,7 +228,7 @@ public class JMXAccessorCondition extend
public void setValue(String value) {
this.value = value;
}
-
+
/**
* @return Returns the ref.
*/
@@ -260,7 +260,7 @@ public class JMXAccessorCondition extend
public String getUnless() {
return unlessCondition;
}
-
+
/**
* Only execute if a property of the given name does not
* exist in the current project.
@@ -285,7 +285,7 @@ public class JMXAccessorCondition extend
}
/**
- * Get value from MBeans attribute
+ * Get value from MBeans attribute
* @return The value
*/
protected String accessJMXValue() {
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import javax.management.ObjectName;
import org.apache.tools.ant.BuildException;
/**
- * Create new MBean at <em>JMX</em> JSR 160 MBeans Server.
+ * Create new MBean at <em>JMX</em> JSR 160 MBeans Server.
* <ul>
* <li>Create Mbeans</li>
* <li>Create Mbeans with parameter</li>
@@ -34,7 +34,7 @@ import org.apache.tools.ant.BuildExcepti
* <p>
* Examples:
* <br/>
- * create a new Mbean at jmx.server connection
+ * create a new Mbean at jmx.server connection
* <pre>
* <jmx:create
* ref="jmx.server"
@@ -73,28 +73,28 @@ public class JMXAccessorCreateTask exten
public String getClassLoader() {
return classLoader;
}
-
+
/**
* @param classLoaderName The classLoader to set.
*/
public void setClassLoader(String classLoaderName) {
this.classLoader = classLoaderName;
}
-
+
/**
* @return Returns the className.
*/
public String getClassName() {
return className;
}
-
+
/**
* @param className The className to set.
*/
public void setClassName(String className) {
this.className = className;
}
-
+
public void addArg(Arg arg ) {
args.add(arg);
}
@@ -113,12 +113,12 @@ public class JMXAccessorCreateTask exten
}
// ------------------------------------------------------ protected Methods
-
+
/**
* 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.
- *
+ *
* @exception Exception
* if an error occurs
*/
@@ -135,7 +135,7 @@ public class JMXAccessorCreateTask exten
}
return jmxCreate(jmxServerConnection, getName());
}
-
+
/**
* create new Mbean and when set from ClassLoader Objectname
* @param jmxServerConnection
@@ -160,7 +160,7 @@ public class JMXAccessorCreateTask exten
} else {
sigA[i]=arg.getType();
argsA[i]=convertStringToType(arg.getValue(),arg.getType());
- }
+ }
}
}
if (classLoader != null && !"".equals(classLoader)) {
@@ -172,7 +172,7 @@ public class JMXAccessorCreateTask exten
jmxServerConnection.createMBean(className, new ObjectName(name), new ObjectName(classLoader));
else
jmxServerConnection.createMBean(className, new ObjectName(name), new ObjectName(classLoader),argsA,sigA);
-
+
} else {
if (isEcho()) {
handleOutput("create MBean " + name + " from class "
@@ -185,5 +185,5 @@ public class JMXAccessorCreateTask exten
}
return error;
}
-
+
}
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ import org.apache.tools.ant.taskdefs.con
/**
*
* Definition
- * <pre>
+ * <pre>
* <path id="catalina_ant">
* <fileset dir="${catalina.home}/server/lib">
* <include name="catalina-ant.jar"/>
@@ -42,7 +42,7 @@ import org.apache.tools.ant.taskdefs.con
* classname="org.apache.catalina.ant.jmx.JMXAccessorEqualsCondition"
* classpathref="catalina_ant"/>
* </pre>
- *
+ *
* usage: Wait for start backup node
* <pre>
* <target name="wait">
@@ -50,7 +50,7 @@ import org.apache.tools.ant.taskdefs.con
* <and>
* <socket server="${server.name}" port="${server.port}"/>
* <http url="${url}"/>
- * <jmxEquals
+ * <jmxEquals
* host="localhost" port="9014" username="controlRole" password="tomcat"
* name="Catalina:type=IDataSender,host=localhost,senderAddress=192.168.111.1,senderPort=9025"
* attribute="connected" value="true"
@@ -62,7 +62,7 @@ import org.apache.tools.ant.taskdefs.con
* </target>
*
* </pre>
- *
+ *
* @author Peter Rossbach
* @version $Id$
* @since 5.5.10
@@ -191,7 +191,7 @@ public class JMXAccessorEqualsCondition
public void setRef(String refId) {
this.ref = refId;
}
-
+
protected MBeanServerConnection getJMXConnection()
throws MalformedURLException, IOException {
return JMXAccessorTask.accessJMXConnection(
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ import org.apache.tools.ant.BuildExcepti
/**
- * Access <em>JMX</em> JSR 160 MBeans Server.
+ * Access <em>JMX</em> JSR 160 MBeans Server.
* <ul>
* <li>Get Mbeans attributes</li>
* <li>Show Get result as Ant console log</li>
@@ -35,11 +35,11 @@ import org.apache.tools.ant.BuildExcepti
* <p>
* Examples:
* <br/>
- * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em>
+ * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em>
* <pre>
* <jmx:get
* ref="jmx.server"
- * name="Catalina:type=IDataSender,host=localhost,senderAddress=192.168.1.2,senderPort=9025"
+ * name="Catalina:type=IDataSender,host=localhost,senderAddress=192.168.1.2,senderPort=9025"
* attribute="nrOfRequests"
* resultproperty="IDataSender.9025.nrOfRequests"
* echo="false">
@@ -64,29 +64,29 @@ public class JMXAccessorGetTask extends
private String attribute;
// ------------------------------------------------------------- Properties
-
+
/**
* @return Returns the attribute.
*/
public String getAttribute() {
return attribute;
}
-
+
/**
* @param attribute The attribute to set.
*/
public void setAttribute(String attribute) {
this.attribute = attribute;
}
-
-
+
+
// ------------------------------------------------------ protected Methods
-
+
/**
* 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.
- *
+ *
* @exception BuildException
* if an error occurs
*/
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ import org.apache.tools.ant.BuildExcepti
/**
- * Access <em>JMX</em> JSR 160 MBeans Server.
+ * Access <em>JMX</em> JSR 160 MBeans Server.
* <ul>
* <li>open more then one JSR 160 rmi connection</li>
* <li>Get/Set Mbeans attributes</li>
@@ -43,11 +43,11 @@ import org.apache.tools.ant.BuildExcepti
* 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>
+ * 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"
+ * name="Catalina:type=Manager,context=/ClusterTest,host=localhost"
* operation="getSessionAttribute"
* resultproperty="hello">
* <arg value="${sessionid.0}"/>
@@ -56,10 +56,10 @@ import org.apache.tools.ant.BuildExcepti
* </pre>
* </li>
* <li>
- * Create new AccessLogger at localhost
+ * Create new AccessLogger at localhost
* <code>
* <jmx:invoke
- * name="Catalina:type=MBeanFactory"
+ * name="Catalina:type=MBeanFactory"
* operation="createAccessLoggerValve"
* resultproperty="accessLoggerObjectName"
* >
@@ -69,10 +69,10 @@ import org.apache.tools.ant.BuildExcepti
* </code>
* </li>
* <li>
- * Remove existing AccessLogger at localhost
+ * Remove existing AccessLogger at localhost
* <code>
* <jmx:invoke
- * name="Catalina:type=MBeanFactory"
+ * name="Catalina:type=MBeanFactory"
* operation="removeValve"
* >
* <arg value="Catalina:type=Valve,name=AccessLogValve,host=localhost"/>
@@ -100,7 +100,7 @@ public class JMXAccessorInvokeTask exten
private List<Arg> args=new ArrayList<Arg>();
// ------------------------------------------------------------- Properties
-
+
/**
* @return Returns the operation.
*/
@@ -130,14 +130,14 @@ public class JMXAccessorInvokeTask exten
public void setArgs(List<Arg> args) {
this.args = args;
}
-
+
// ------------------------------------------------------ protected Methods
-
+
/**
* 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.
- *
+ *
* @exception BuildException
* if an error occurs
*/
@@ -176,7 +176,7 @@ public class JMXAccessorInvokeTask exten
} else {
sigA[i]=arg.getType();
argsA[i]=convertStringToType(arg.getValue(),arg.getType());
- }
+ }
}
result = jmxServerConnection.invoke(new ObjectName(name), operation, argsA, sigA);
}
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@ import org.apache.tools.ant.BuildExcepti
/**
- * Query for Mbeans.
+ * Query for Mbeans.
* <ul>
* <li>open no existing JSR 160 rmi jmx connection</li>
* <li>Get all Mbeans attributes</li>
@@ -45,14 +45,14 @@ import org.apache.tools.ant.BuildExcepti
* <jmxQuery
* host="127.0.0.1"
* port="9014"
- * name="Catalina:type=Manager,*
+ * name="Catalina:type=Manager,*
* resultproperty="manager" />
* </pre>
- * with attribute <em>attributebinding="true"</em> you can get
+ * with attribute <em>attributebinding="true"</em> you can get
* all attributes also from result objects.<br/>
- * The property manager.lenght show the size of the result
- * and with manager.[0..length].name the
- * resulted ObjectNames are saved.
+ * The property manager.lenght 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
@@ -67,7 +67,7 @@ public class JMXAccessorQueryTask extend
private boolean attributebinding = false;
// ------------------------------------------------------------- Properties
-
+
/**
* @return Returns the attributebinding.
*/
@@ -80,15 +80,15 @@ public class JMXAccessorQueryTask extend
public void setAttributebinding(boolean attributeBinding) {
this.attributebinding = attributeBinding;
}
-
+
// ------------------------------------------------------ protected Methods
-
+
/**
* 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.
- *
+ *
* @exception Exception
* if an error occurs
*/
@@ -103,7 +103,7 @@ public class JMXAccessorQueryTask extend
}
-
+
/**
* Call Mbean server for some mbeans with same domain, attributes.
* with <em>attributebinding=true</em> you can save all attributes from all found objects
@@ -139,7 +139,7 @@ public class JMXAccessorQueryTask extend
setProperty(pname + "Name", oname.toString());
if (isAttributebinding()) {
bindAttributes(jmxServerConnection, resultproperty, pname, oname);
-
+
}
}
}
@@ -153,7 +153,7 @@ public class JMXAccessorQueryTask extend
* @param oname
*/
protected void bindAttributes(MBeanServerConnection jmxServerConnection, String resultproperty, String pname, ObjectName oname) {
- if (jmxServerConnection != null && resultproperty != null
+ if (jmxServerConnection != null && resultproperty != null
&& pname != null && oname != null ) {
try {
MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ import org.apache.tools.ant.BuildExcepti
/**
- * Access <em>JMX</em> JSR 160 MBeans Server.
+ * Access <em>JMX</em> JSR 160 MBeans Server.
* <ul>
* <li>Get Mbeans attributes</li>
* <li>Show Get result as Ant console log</li>
@@ -38,13 +38,13 @@ import org.apache.tools.ant.BuildExcepti
* <p>
* Examples:
* Set a Mbean Manager attribute maxActiveSessions.
- * Set this attribute with fresh jmx connection without save reference
+ * Set this attribute with fresh jmx connection without save reference
* <pre>
* <jmx:set
* host="127.0.0.1"
* port="9014"
* ref=""
- * name="Catalina:type=Manager,context="/ClusterTest",host=localhost"
+ * name="Catalina:type=Manager,context="/ClusterTest",host=localhost"
* attribute="maxActiveSessions"
* value="100"
* type="int"
@@ -70,23 +70,23 @@ public class JMXAccessorSetTask extends
private String value;
private String type;
private boolean convert = false ;
-
+
// ------------------------------------------------------------- Properties
-
+
/**
* @return Returns the attribute.
*/
public String getAttribute() {
return attribute;
}
-
+
/**
* @param attribute The attribute to set.
*/
public void setAttribute(String attribute) {
this.attribute = attribute;
}
-
+
/**
* @return Returns the value.
*/
@@ -99,23 +99,23 @@ public class JMXAccessorSetTask extends
public void setValue(String value) {
this.value = value;
}
-
-
+
+
/**
* @return Returns the type.
*/
public String getType() {
return type;
}
-
+
/**
* @param valueType The type to set.
*/
public void setType(String valueType) {
this.type = valueType;
}
-
-
+
+
/**
* @return Returns the convert.
*/
@@ -129,12 +129,12 @@ public class JMXAccessorSetTask extends
this.convert = convert;
}
// ------------------------------------------------------ protected Methods
-
+
/**
* 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.
- *
+ *
* @exception Exception
* if an error occurs
*/
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,21 +59,21 @@ import org.apache.tools.ant.Project;
* <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 autorisation
- *
+ *
* <pre>
- *
+ *
* <jmxOpen
* host="127.0.0.1"
* port="9014"
* username="monitorRole"
* password="mysecret"
- * ref="jmx.myserver"
+ * 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
@@ -83,7 +83,7 @@ import org.apache.tools.ant.Project;
* <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
* @version $Id$
* @since 5.5.10
@@ -286,7 +286,7 @@ public class JMXAccessorTask extends Bas
/**
* Only execute if a property of the given name exists in the current
* project.
- *
+ *
* @param c property name
*/
public void setIf(String c) {
@@ -303,7 +303,7 @@ public class JMXAccessorTask extends Bas
/**
* 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) {
@@ -316,7 +316,7 @@ public class JMXAccessorTask extends Bas
* 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
*/
@@ -372,7 +372,7 @@ public class JMXAccessorTask extends Bas
/**
* test the if condition
- *
+ *
* @return true if there is no if condition, or the named property exists
*/
protected boolean testIfCondition() {
@@ -384,7 +384,7 @@ public class JMXAccessorTask extends Bas
/**
* test the unless condition
- *
+ *
* @return true if there is no unless condition, or there is a named
* property but it doesn't exist
*/
@@ -397,7 +397,7 @@ public class JMXAccessorTask extends Bas
/**
* Get Current Connection from <em>ref</em> parameter or create a new one!
- *
+ *
* @return The server connection
* @throws MalformedURLException
* @throws IOException
@@ -433,7 +433,7 @@ public class JMXAccessorTask extends Bas
/**
* get JMXConnection
- *
+ *
* @return The connection
* @throws MalformedURLException
* @throws IOException
@@ -473,7 +473,7 @@ public class JMXAccessorTask extends Bas
* 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.
- *
+ *
* @exception Exception
* if an error occurs
*/
@@ -491,7 +491,7 @@ public class JMXAccessorTask extends Bas
/**
* Convert string to datatype FIXME How we can transfer values from ant
* project reference store (ref)?
- *
+ *
* @param value The value
* @param valueType The type
* @return The converted object
@@ -572,7 +572,7 @@ public class JMXAccessorTask extends Bas
/**
* create result as property with name from attribute resultproperty
- *
+ *
* @param result The result
* @see #createProperty(String, Object)
*/
@@ -589,7 +589,7 @@ public class JMXAccessorTask extends Bas
* 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
* @param result
*/
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java Sat Oct 22 21:07:41 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,14 +22,14 @@ import javax.management.ObjectName;
import org.apache.tools.ant.BuildException;
/**
- * unregister a MBean at <em>JMX</em> JSR 160 MBeans Server.
+ * unregister a MBean at <em>JMX</em> JSR 160 MBeans Server.
* <ul>
* <li>unregister Mbeans</li>
* </ul>
* <p>
* Examples:
* <br/>
- * unregister an existing Mbean at jmx.server connection
+ * unregister an existing Mbean at jmx.server connection
* <pre>
* <jmx:unregister
* ref="jmx.server"
@@ -53,12 +53,12 @@ import org.apache.tools.ant.BuildExcepti
public class JMXAccessorUnregisterTask extends JMXAccessorTask {
// ------------------------------------------------------ protected Methods
-
+
/**
* 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.
- *
+ *
* @exception Exception
* if an error occurs
*/
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html Sat Oct 22 21:07:41 2011
@@ -70,7 +70,7 @@ existing one. The following attribute ar
</table>
-<p><strong>NOTE</strong> - This Tasks only work,
+<p><strong>NOTE</strong> - This Tasks only work,
when JSR 160 MBean Adaptor as remote jvm is configured.</p>
</body>
Modified: tomcat/trunk/java/org/apache/catalina/ant/package.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/package.html?rev=1187783&r1=1187782&r2=1187783&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/package.html Sat Oct 22 21:07:41 2011
@@ -18,7 +18,7 @@
<p>This package contains a set of <code>Task</code> implementations for
<em>Ant (version 1.6.x or later)</em> that can be used to interact with the
-Manager application to deploy, undeploy, list, reload, start and stop web applications
+Manager application to deploy, undeploy, list, reload, start and stop web applications
from a running instance of Tomcat. For more information, see
<a href="http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html">
http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html</a>.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org