Author: markt
Date: Sat Oct 22 19:31:29 2011
New Revision: 1187759
URL: http://svn.apache.org/viewvc?rev=1187759&view=rev
Log:
info / getInfo() cleanup part 3
Modified:
tomcat/trunk/java/org/apache/catalina/Container.java
tomcat/trunk/java/org/apache/catalina/Loader.java
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/Server.java
tomcat/trunk/java/org/apache/catalina/Service.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/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Sat Oct 22 19:31:29
2011
@@ -133,15 +133,6 @@ public interface Container extends Lifec
// ------------------------------------------------------------- Properties
-
- /**
- * Return descriptive information about this Container implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
-
/**
* Return the Loader with which this Container is associated. If there is
* no associated Loader, return the Loader associated with our parent
Modified: tomcat/trunk/java/org/apache/catalina/Loader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Loader.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Loader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Loader.java Sat Oct 22 19:31:29 2011
@@ -104,14 +104,6 @@ public interface Loader {
/**
- * Return descriptive information about this Loader implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
-
- /**
* Return the reloadable flag for this Loader.
*/
public boolean getReloadable();
Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Sat Oct 22 19:31:29 2011
@@ -81,14 +81,6 @@ public interface Manager {
/**
- * Return descriptive information about this Manager implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
-
- /**
* Return the default maximum inactive interval (in seconds)
* for Sessions created by this Manager.
*/
Modified: tomcat/trunk/java/org/apache/catalina/Server.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Server.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Server.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Server.java Sat Oct 22 19:31:29 2011
@@ -48,18 +48,8 @@ import org.apache.catalina.startup.Catal
public interface Server extends Lifecycle {
-
// ------------------------------------------------------------- Properties
-
- /**
- * Return descriptive information about this Server implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
-
/**
* Return the global naming resources.
*/
Modified: tomcat/trunk/java/org/apache/catalina/Service.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Service.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Service.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Service.java Sat Oct 22 19:31:29 2011
@@ -54,13 +54,6 @@ public interface Service extends Lifecyc
public void setContainer(Container container);
/**
- * Return descriptive information about this Service implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
- /**
* Return the name of this Service.
*/
public String getName();
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -107,23 +107,6 @@ public class JMXAccessorCondition extend
private String unlessCondition;
private String ifCondition;
- // ----------------------------------------------------- Instance Info
-
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorCondition/1.1";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
-
- return (info);
-
- }
// ----------------------------------------------------- Properties
/**
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -65,26 +65,6 @@ public class JMXAccessorCreateTask exten
private String classLoader;
private List<Arg> args=new ArrayList<Arg>();
- // ----------------------------------------------------- Instance Info
-
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorCreateTask/1.0";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- * @return Returns the class info.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
// ------------------------------------------------------------- Properties
/**
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -81,23 +81,7 @@ public class JMXAccessorEqualsCondition
private String attribute;
private String value;
private String ref = "jmx.server" ;
- // ----------------------------------------------------- Instance Info
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorEqualsCondition/1.1";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
-
- return (info);
-
- }
// ----------------------------------------------------- Properties
/**
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -63,25 +63,6 @@ public class JMXAccessorGetTask extends
private String attribute;
- // ----------------------------------------------------- Instance Info
-
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorGetTask/1.0";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
// ------------------------------------------------------------- Properties
/**
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -99,25 +99,6 @@ public class JMXAccessorInvokeTask exten
private String operation ;
private List<Arg> args=new ArrayList<Arg>();
- // ----------------------------------------------------- Instance Info
-
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorInvokeTask/1.0";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
// ------------------------------------------------------------- Properties
/**
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -66,25 +66,6 @@ public class JMXAccessorQueryTask extend
private boolean attributebinding = false;
- // ----------------------------------------------------- Instance Info
-
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorQueryTask/1.0";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
// ------------------------------------------------------------- Properties
/**
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -71,25 +71,6 @@ public class JMXAccessorSetTask extends
private String type;
private boolean convert = false ;
- // ----------------------------------------------------- Instance Info
-
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorSetTask/1.0";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
// ------------------------------------------------------------- Properties
/**
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -125,24 +125,6 @@ public class JMXAccessorTask extends Bas
private Properties properties = new Properties();
- // ----------------------------------------------------- Instance Info
-
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorTask/1.1";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
// ------------------------------------------------------------- Properties
/**
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=1187759&r1=1187758&r2=1187759&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 19:31:29 2011
@@ -52,25 +52,6 @@ import org.apache.tools.ant.BuildExcepti
*/
public class JMXAccessorUnregisterTask extends JMXAccessorTask {
- // ----------------------------------------------------- Instance Info
-
- /**
- * Descriptive information describing this implementation.
- */
- private static final String info =
"org.apache.catalina.ant.JMXAccessorUnregisterTask/1.0";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- * @return Returns the class info.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
// ------------------------------------------------------ protected Methods
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Sat
Oct 22 19:31:29 2011
@@ -227,13 +227,6 @@ final class ApplicationDispatcher
/**
- * Descriptive information about this implementation.
- */
- private static final String info =
- "org.apache.catalina.core.ApplicationDispatcher/1.0";
-
-
- /**
* The servlet name for a named dispatcher.
*/
private String name = null;
@@ -284,19 +277,6 @@ final class ApplicationDispatcher
private Wrapper wrapper = null;
- // ------------------------------------------------------------- Properties
-
-
- /**
- * Return the descriptive information about this implementation.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
-
// --------------------------------------------------------- Public Methods
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Sat Oct 22
19:31:29 2011
@@ -306,17 +306,6 @@ public abstract class ContainerBase exte
/**
- * Return descriptive information about this Container implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
- return this.getClass().getName();
- }
-
-
- /**
* Return the Loader with which this Container is associated. If there is
* no associated Loader, return the Loader associated with our parent
* Container (if any); otherwise, return <code>null</code>.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sat Oct 22
19:31:29 2011
@@ -160,13 +160,6 @@ public class StandardContext extends Con
/**
- * The descriptive information string for this implementation.
- */
- private static final String info =
- "org.apache.catalina.core.StandardContext/1.0";
-
-
- /**
* Array containing the safe characters set.
*/
protected static URLEncoder urlEncoder;
@@ -1874,18 +1867,6 @@ public class StandardContext extends Con
}
- /**
- * Return descriptive information about this Container implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
public String getJ2EEApplication() {
return j2EEApplication;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Sat Oct 22
19:31:29 2011
@@ -89,13 +89,6 @@ public class StandardEngine extends Cont
/**
- * The descriptive information string for this implementation.
- */
- private static final String info =
- "org.apache.catalina.core.StandardEngine/1.0";
-
-
- /**
* The <code>Service</code> that owns this Engine, if any.
*/
private Service service = null;
@@ -247,18 +240,6 @@ public class StandardEngine extends Cont
/**
- * Return descriptive information about this Container implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
- /**
* Disallow any attempt to set a parent for this Container, since an
* Engine is supposed to be at the top of the Container hierarchy.
*
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Sat Oct 22
19:31:29 2011
@@ -140,12 +140,6 @@ public class StandardHost extends Contai
private String errorReportValveClass =
"org.apache.catalina.valves.ErrorReportValve";
- /**
- * The descriptive information string for this implementation.
- */
- private static final String info =
- "org.apache.catalina.core.StandardHost/1.0";
-
/**
* Unpack WARs property.
@@ -704,19 +698,6 @@ public class StandardHost extends Contai
/**
- * Return descriptive information about this Container implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
-
- /**
* Remove the specified alias name from the aliases for this Host.
*
* @param alias Alias name to be removed
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Sat Oct 22
19:31:29 2011
@@ -97,13 +97,6 @@ public final class StandardServer extend
/**
- * Descriptive information about this Server implementation.
- */
- private static final String info =
- "org.apache.catalina.core.StandardServer/1.0";
-
-
- /**
* The naming context listener for this web application.
*/
private NamingContextListener namingContextListener = null;
@@ -226,18 +219,6 @@ public final class StandardServer extend
/**
- * Return descriptive information about this Server implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
- /**
* Report the current Tomcat Server Release number
* @return Tomcat release identifier
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Sat Oct 22
19:31:29 2011
@@ -55,14 +55,6 @@ public class StandardService extends Lif
// ----------------------------------------------------- Instance Variables
-
- /**
- * Descriptive information about this component implementation.
- */
- private static final String info =
- "org.apache.catalina.core.StandardService/1.0";
-
-
/**
* The name of this service.
*/
@@ -157,19 +149,6 @@ public class StandardService extends Lif
/**
- * Return descriptive information about this Service implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
-
- /**
* Return the name of this Service.
*/
@Override
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java Sat Oct 22
19:31:29 2011
@@ -31,10 +31,7 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.tribes.ChannelListener;
public interface ClusterDeployer extends ChannelListener {
- /**
- * Descriptive information about this component implementation.
- */
- public String info = "ClusterDeployer/1.0";
+
/**
* Start the cluster deployer, the owning container will invoke this
* @throws Exception - if failure to start cluster
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Sat
Oct 22 19:31:29 2011
@@ -67,11 +67,6 @@ public class FarmWarDeployer extends Clu
private static final StringManager sm =
StringManager.getManager(Constants.Package);
- /**
- * The descriptive information about this implementation.
- */
- private static final String info = "FarmWarDeployer/1.2";
-
/*--Instance Variables--------------------------------------*/
protected boolean started = false; //default 5 seconds
@@ -129,17 +124,6 @@ public class FarmWarDeployer extends Clu
public FarmWarDeployer() {
}
- /**
- * Return descriptive information about this deployer implementation and
the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
/*--Logic---------------------------------------------------*/
@Override
public void start() throws Exception {
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Sat Oct
22 19:31:29 2011
@@ -78,11 +78,6 @@ public class DeltaManager extends Cluste
// ----------------------------------------------------- Instance Variables
/**
- * The descriptive information about this implementation.
- */
- private static final String info = "DeltaManager/2.1";
-
- /**
* The descriptive name of this Manager implementation (for logging).
*/
protected static String managerName = "DeltaManager";
@@ -139,16 +134,6 @@ public class DeltaManager extends Cluste
// ------------------------------------------------------------- Properties
- /**
- * Return descriptive information about this Manager implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
- return info;
- }
-
@Override
public void setName(String name) {
this.name = name;
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sat Oct 22
19:31:29 2011
@@ -138,13 +138,6 @@ public class WebappLoader extends Lifecy
/**
- * The descriptive information about this Loader implementation.
- */
- private static final String info =
- "org.apache.catalina.loader.WebappLoader/1.0";
-
-
- /**
* The Java class name of the ClassLoader implementation to be used.
* This class should extend WebappClassLoader, otherwise, a different
* loader implementation must be used.
@@ -283,19 +276,6 @@ public class WebappLoader extends Lifecy
/**
- * Return descriptive information about this Loader implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
-
- /**
* Return the ClassLoader class name.
*/
public String getLoaderClass() {
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Sat Oct 22
19:31:29 2011
@@ -80,12 +80,6 @@ public abstract class ManagerBase extend
/**
- * The descriptive information string for this implementation.
- */
- private static final String info = "ManagerBase/1.0";
-
-
- /**
* The descriptive name of this Manager implementation (for logging).
*/
private static final String name = "ManagerBase";
@@ -291,19 +285,6 @@ public abstract class ManagerBase extend
/**
- * Return descriptive information about this Manager implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
-
- /**
* Return the default maximum inactive interval (in seconds)
* for Sessions created by this Manager.
*/
Modified: tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java Sat
Oct 22 19:31:29 2011
@@ -35,16 +35,8 @@ package org.apache.catalina.session;
public final class PersistentManager extends PersistentManagerBase {
-
// ----------------------------------------------------- Instance Variables
-
- /**
- * The descriptive information about this implementation.
- */
- private static final String info = "PersistentManager/1.0";
-
-
/**
* The descriptive name of this Manager implementation (for logging).
*/
@@ -53,27 +45,12 @@ public final class PersistentManager ext
// ------------------------------------------------------------- Properties
-
- /**
- * Return descriptive information about this Manager implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
/**
* Return the descriptive short name of this Manager implementation.
*/
@Override
public String getName() {
-
return (name);
-
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Sat Oct 22 19:31:29 2011
@@ -129,13 +129,6 @@ public abstract class PersistentManagerB
// ----------------------------------------------------- Instance Variables
-
- /**
- * The descriptive information about this implementation.
- */
- private static final String info = "PersistentManagerBase/1.1";
-
-
/**
* The descriptive name of this Manager implementation (for logging).
*/
@@ -291,19 +284,6 @@ public abstract class PersistentManagerB
/**
- * Return descriptive information about this Manager implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
-
- /**
* Return true, if the session id is loaded in memory
* otherwise false is returned
*
Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Sat Oct 22
19:31:29 2011
@@ -164,13 +164,6 @@ public class Embedded extends StandardS
/**
- * Descriptive information about this server implementation.
- */
- protected static final String info =
- "org.apache.catalina.startup.Embedded/1.0";
-
-
- /**
* The default realm to be used by all containers associated with
* this component.
*/
@@ -331,7 +324,7 @@ public class Embedded extends StandardS
public synchronized void addEngine(Engine engine) {
if( log.isDebugEnabled() )
- log.debug("Adding engine (" + engine.getInfo() + ")");
+ log.debug("Adding engine (" + engine.getClass().getName() + ")");
// Add this Engine to our set of defined Engines
Engine results[] = new Engine[engines.length + 1];
@@ -566,18 +559,6 @@ public class Embedded extends StandardS
}
- /**
- * Return descriptive information about this Server implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
/**
* Remove the specified Context from the set of defined Contexts for its
@@ -630,7 +611,7 @@ public class Embedded extends StandardS
public synchronized void removeEngine(Engine engine) {
if( log.isDebugEnabled() )
- log.debug("Removing engine (" + engine.getInfo() + ")");
+ log.debug("Removing engine (" + engine.getClass().getName() + ")");
// Is the specified Engine actually defined?
int j = -1;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Sat Oct 22 19:31:29 2011
@@ -56,11 +56,6 @@ public class McastService implements Mem
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
/**
- * The descriptive information about this implementation.
- */
- private static final String info = "McastService/2.1";
-
- /**
* The implementation specific properties
*/
protected Properties properties = new Properties();
@@ -100,15 +95,6 @@ public class McastService implements Mem
}
/**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
- return (info);
- }
-
- /**
*
* @param properties
* <BR/>All are required<BR />
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
Sat Oct 22 19:31:29 2011
@@ -35,11 +35,6 @@ import org.apache.catalina.tribes.util.S
public class ReplicationTransmitter implements ChannelSender {
/**
- * The descriptive information about this implementation.
- */
- private static final String info = "ReplicationTransmitter/3.0";
-
- /**
* The string manager for this package.
*/
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
@@ -50,15 +45,6 @@ public class ReplicationTransmitter impl
private MultiPointSender transport = new PooledParallelSender();
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
- return (info);
- }
-
public MultiPointSender getTransport() {
return transport;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
Sat Oct 22 19:31:29 2011
@@ -52,12 +52,6 @@ public class BioSender extends AbstractS
// ----------------------------------------------------- Instance Variables
/**
- * The descriptive information about this implementation.
- */
- private static final String info = "DataSender/3.0";
-
-
- /**
* current sender socket
*/
private Socket socket = null;
@@ -74,17 +68,6 @@ public class BioSender extends AbstractS
}
- // ------------------------------------------------------------- Properties
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
- return (info);
- }
-
// --------------------------------------------------------- Public Methods
/**
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Sat Oct 22 19:31:29 2011
@@ -53,34 +53,15 @@ public class NioReceiver extends Receive
*/
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
- /**
- * The descriptive information about this implementation.
- */
- private static final String info = "NioReceiver/1.0";
-
private Selector selector = null;
private ServerSocketChannel serverChannel = null;
private DatagramChannel datagramChannel = null;
protected LinkedList<Runnable> events = new LinkedList<Runnable>();
-// private Object interestOpsMutex = new Object();
public NioReceiver() {
}
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
- return (info);
- }
-
-// public Object getInterestOpsMutex() {
-// return interestOpsMutex;
-// }
-
@Override
public void stop() {
this.stopListening();
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
Sat Oct 22 19:31:29 2011
@@ -334,8 +334,6 @@ public class TestContextConfigAnnotation
@Override
public void setDelegate(boolean delegate) {}
@Override
- public String getInfo() { return null; }
- @Override
public boolean getReloadable() { return false; }
@Override
public void setReloadable(boolean reloadable) {}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
