tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r832945 [1/4] - in /tomcat/trunk/java/org/apache/catalina: ./ ant/ ant/jmx/ authenticator/ connector/ core/ deploy/ filters/ ha/ ha/authenticator/ ha/context/ ha/deploy/ ha/session/ ha/tcp/ loader/ manager/ manager/host/ mbeans/ realm/ serv...
Date Thu, 05 Nov 2009 00:59:05 GMT
Author: markt
Date: Thu Nov  5 00:58:58 2009
New Revision: 832945

URL: http://svn.apache.org/viewvc?rev=832945&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb

Modified:
    tomcat/trunk/java/org/apache/catalina/ContainerEvent.java
    tomcat/trunk/java/org/apache/catalina/LifecycleException.java
    tomcat/trunk/java/org/apache/catalina/SessionEvent.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/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/RolesTask.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/jmx/JMXAccessorCreateTask.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/JMXAccessorUnregisterTask.java
    tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
    tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
    tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java
    tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
    tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
    tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
    tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
    tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
    tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
    tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
    tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
    tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java
    tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
    tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.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/core/StandardWrapper.java
    tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
    tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextEjb.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextEnvironment.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextLocalEjb.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceEnvRef.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
    tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
    tomcat/trunk/java/org/apache/catalina/deploy/ErrorPage.java
    tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
    tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
    tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java
    tomcat/trunk/java/org/apache/catalina/deploy/MessageDestination.java
    tomcat/trunk/java/org/apache/catalina/deploy/MessageDestinationRef.java
    tomcat/trunk/java/org/apache/catalina/deploy/SecurityCollection.java
    tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java
    tomcat/trunk/java/org/apache/catalina/deploy/SecurityRoleRef.java
    tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
    tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java
    tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
    tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
    tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
    tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
    tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
    tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
    tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java
    tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
    tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
    tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
    tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
    tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
    tomcat/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java
    tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
    tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java
    tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
    tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
    tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
    tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
    tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
    tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java
    tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
    tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
    tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
    tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
    tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
    tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
    tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
    tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
    tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
    tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
    tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
    tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
    tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
    tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
    tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
    tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
    tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
    tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
    tomcat/trunk/java/org/apache/catalina/session/FileStore.java
    tomcat/trunk/java/org/apache/catalina/session/JDBCStore.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/session/StandardManager.java
    tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
    tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
    tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
    tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
    tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
    tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
    tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
    tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
    tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
    tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
    tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
    tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java
    tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java
    tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
    tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
    tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
    tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
    tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
    tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
    tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
    tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
    tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
    tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
    tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
    tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java
    tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java
    tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
    tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
    tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
    tomcat/trunk/java/org/apache/catalina/util/Extension.java
    tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
    tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java
    tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java
    tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java
    tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
    tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
    tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
    tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
    tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
    tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
    tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
    tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
    tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
    tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
    tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java

Modified: tomcat/trunk/java/org/apache/catalina/ContainerEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ContainerEvent.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ContainerEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ContainerEvent.java Thu Nov  5 00:58:58 2009
@@ -101,6 +101,7 @@
     /**
      * Return a string representation of this event.
      */
+    @Override
     public String toString() {
 
         return ("ContainerEvent['" + getContainer() + "','" +

Modified: tomcat/trunk/java/org/apache/catalina/LifecycleException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleException.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/LifecycleException.java (original)
+++ tomcat/trunk/java/org/apache/catalina/LifecycleException.java Thu Nov  5 00:58:58 2009
@@ -105,6 +105,7 @@
     /**
      * Returns the message associated with this exception, if any.
      */
+    @Override
     public String getMessage() {
 
         return (message);
@@ -125,6 +126,7 @@
     /**
      * Return a formatted string that describes this exception.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("LifecycleException:  ");

Modified: tomcat/trunk/java/org/apache/catalina/SessionEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/SessionEvent.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/SessionEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/SessionEvent.java Thu Nov  5 00:58:58 2009
@@ -101,6 +101,7 @@
     /**
      * Return a string representation of this event.
      */
+    @Override
     public String toString() {
 
         return ("SessionEvent['" + getSession() + "','" +

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Nov  5 00:58:58 2009
@@ -121,6 +121,7 @@
      *
      * @exception BuildException if a validation error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         if ((username == null) || (password == null) || (url == null)) {

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java Thu Nov  5 00:58:58 2009
@@ -285,6 +285,7 @@
      *
      * @param output The output to log. Should not be <code>null</code>.
      */
+    @Override
     protected void handleOutput(String output) {
         if (redirectOutput) {
             if (redirectOutPrintStream == null) {
@@ -305,6 +306,7 @@
      * @param output The output to log. Should not be <code>null</code>.
      *
      */
+    @Override
     protected void handleFlush(String output) {
         handleOutput(output);
         redirectOutPrintStream.flush();
@@ -315,6 +317,7 @@
      *
      * @param output The error output to log. Should not be <code>null</code>.
      */
+    @Override
     protected void handleErrorOutput(String output) {
         if (redirectOutput) {
             if (redirectErrPrintStream == null) {
@@ -335,6 +338,7 @@
      * @param output The error output to log. Should not be <code>null</code>.
      *
      */
+    @Override
     protected void handleErrorFlush(String output) {
         handleErrorOutput(output);
         redirectErrPrintStream.flush();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java Thu Nov  5 00:58:58 2009
@@ -137,6 +137,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java Thu Nov  5 00:58:58 2009
@@ -268,6 +268,7 @@
      * @exception BuildException
      *                if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JMXGetTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JMXGetTask.java Thu Nov  5 00:58:58 2009
@@ -82,6 +82,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
         super.execute();
         if (bean == null || attribute == null) {

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java Thu Nov  5 00:58:58 2009
@@ -70,6 +70,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
         super.execute();
         String queryString = (query == null) ? "":("?qry="+query);

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JMXSetTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JMXSetTask.java Thu Nov  5 00:58:58 2009
@@ -103,6 +103,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
         super.execute();
         if (bean == null || attribute == null || value == null) {

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ListTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ListTask.java Thu Nov  5 00:58:58 2009
@@ -44,6 +44,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java Thu Nov  5 00:58:58 2009
@@ -61,6 +61,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java Thu Nov  5 00:58:58 2009
@@ -59,6 +59,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

Modified: tomcat/trunk/java/org/apache/catalina/ant/RolesTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/RolesTask.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/RolesTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/RolesTask.java Thu Nov  5 00:58:58 2009
@@ -44,6 +44,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ServerinfoTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ServerinfoTask.java Thu Nov  5 00:58:58 2009
@@ -38,6 +38,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/SessionsTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/SessionsTask.java Thu Nov  5 00:58:58 2009
@@ -56,6 +56,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/StartTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/StartTask.java Thu Nov  5 00:58:58 2009
@@ -61,6 +61,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/StopTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/StopTask.java Thu Nov  5 00:58:58 2009
@@ -61,6 +61,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/UndeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/UndeployTask.java Thu Nov  5 00:58:58 2009
@@ -57,6 +57,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         super.execute();

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java Thu Nov  5 00:58:58 2009
@@ -73,6 +73,7 @@
      *
      * @exception BuildException if a validation error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         if (path == null) {

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java Thu Nov  5 00:58:58 2009
@@ -78,6 +78,7 @@
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      * @return Returns the class info.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -141,6 +142,7 @@
      * @exception Exception
      *                if an error occurs
      */
+    @Override
     public String jmxExecute(MBeanServerConnection jmxServerConnection)
         throws Exception {
 

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java Thu Nov  5 00:58:58 2009
@@ -75,6 +75,7 @@
      * corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -108,6 +109,7 @@
      * @exception BuildException
      *                if an error occurs
      */
+    @Override
     public String jmxExecute(MBeanServerConnection jmxServerConnection)
         throws Exception {
 

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java Thu Nov  5 00:58:58 2009
@@ -111,6 +111,7 @@
      * corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -159,6 +160,7 @@
      * @exception BuildException
      *                if an error occurs
      */
+    @Override
     public String jmxExecute(MBeanServerConnection jmxServerConnection)
         throws Exception {
 

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Thu Nov  5 00:58:58 2009
@@ -78,6 +78,7 @@
      * corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -110,6 +111,7 @@
      * @exception Exception
      *                if an error occurs
      */
+    @Override
     public String jmxExecute(MBeanServerConnection jmxServerConnection)
         throws Exception {
 

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java Thu Nov  5 00:58:58 2009
@@ -83,6 +83,7 @@
      * corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -156,6 +157,7 @@
      * @exception Exception
      *                if an error occurs
      */
+    @Override
     public String jmxExecute(MBeanServerConnection jmxServerConnection)
         throws Exception {
 

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java Thu Nov  5 00:58:58 2009
@@ -65,6 +65,7 @@
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      * @return Returns the class info.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -80,6 +81,7 @@
      * @exception Exception
      *                if an error occurs
      */
+    @Override
     public String jmxExecute(MBeanServerConnection jmxServerConnection)
         throws Exception {
 

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java Thu Nov  5 00:58:58 2009
@@ -252,6 +252,7 @@
     /**
      * Return the Container to which this Valve is attached.
      */
+    @Override
     public Container getContainer() {
 
         return (this.context);
@@ -264,6 +265,7 @@
      *
      * @param container The container to which we are attached
      */
+    @Override
     public void setContainer(Container container) {
 
         if (!(container instanceof Context))
@@ -306,6 +308,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -384,6 +387,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if thrown by a processing element
      */
+    @Override
     public void invoke(Request request, Response response)
         throws IOException, ServletException {
 

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java Thu Nov  5 00:58:58 2009
@@ -90,6 +90,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -113,6 +114,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public boolean authenticate(Request request,
                                 Response response,
                                 LoginConfig config)

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java Thu Nov  5 00:58:58 2009
@@ -103,6 +103,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -126,6 +127,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public boolean authenticate(Request request,
                                 Response response,
                                 LoginConfig config)

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Thu Nov  5 00:58:58 2009
@@ -81,6 +81,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -120,6 +121,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public boolean authenticate(Request request,
                                 Response response,
                                 LoginConfig config)

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java Thu Nov  5 00:58:58 2009
@@ -55,6 +55,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -78,6 +79,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public boolean authenticate(Request request,
                                 Response response,
                                 LoginConfig config)

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java Thu Nov  5 00:58:58 2009
@@ -59,6 +59,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -81,6 +82,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public boolean authenticate(Request request,
                                 Response response,
                                 LoginConfig config)
@@ -173,6 +175,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
      */
+    @Override
     public void start() throws LifecycleException {
 
         super.start();
@@ -187,6 +190,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
      */
+    @Override
     public void stop() throws LifecycleException {
 
         super.stop();

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Thu Nov  5 00:58:58 2009
@@ -347,6 +347,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -363,6 +364,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet error occurs
      */
+    @Override
     public void invoke(Request request, Response response)
         throws IOException, ServletException {
 
@@ -433,6 +435,7 @@
     /**
      * Return a String rendering of this object.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("SingleSignOn[");

Modified: tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java Thu Nov  5 00:58:58 2009
@@ -105,6 +105,7 @@
     /**
      * Returns the message associated with this exception, if any.
      */
+    @Override
     public String getMessage() {
 
         return (message);
@@ -115,6 +116,7 @@
     /**
      * Returns the cause that caused this exception, if any.
      */
+    @Override
     public Throwable getCause() {
         
         return (throwable);
@@ -125,6 +127,7 @@
     /**
      * Return a formatted string that describes this exception.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("ClientAbortException:  ");

Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Thu Nov  5 00:58:58 2009
@@ -124,6 +124,7 @@
         }
     }
     
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
         buf.append(super.toString());

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java Thu Nov  5 00:58:58 2009
@@ -68,6 +68,7 @@
     /**
      * Prevent cloning the facade.
      */
+    @Override
     protected Object clone()
         throws CloneNotSupportedException {
         throw new CloneNotSupportedException();
@@ -77,6 +78,7 @@
     // --------------------------------------------- ServletInputStream Methods
 
 
+    @Override
     public int read()
         throws IOException {    
         if (SecurityUtil.isPackageProtectionEnabled()){
@@ -106,6 +108,7 @@
         }
     }
 
+    @Override
     public int available() throws IOException {
         
         if (SecurityUtil.isPackageProtectionEnabled()){
@@ -134,6 +137,7 @@
         }    
     }
 
+    @Override
     public int read(final byte[] b) throws IOException {
         
         if (SecurityUtil.isPackageProtectionEnabled()){
@@ -164,6 +168,7 @@
     }
 
 
+    @Override
     public int read(final byte[] b, final int off, final int len)
         throws IOException {
             
@@ -195,6 +200,7 @@
     }
 
 
+    @Override
     public int readLine(byte[] b, int off, int len) throws IOException {
         return super.readLine(b, off, len);
     }
@@ -205,6 +211,7 @@
      * Since we re-cycle, we can't allow the call to super.close()
      * which would permantely disable us.
      */
+    @Override
     public void close() throws IOException {
         
         if (SecurityUtil.isPackageProtectionEnabled()){

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java Thu Nov  5 00:58:58 2009
@@ -52,6 +52,7 @@
     /**
      * Prevent cloning the facade.
      */
+    @Override
     protected Object clone()
         throws CloneNotSupportedException {
         throw new CloneNotSupportedException();
@@ -72,18 +73,21 @@
     // --------------------------------------------------- OutputStream Methods
 
 
+    @Override
     public void write(int i)
         throws IOException {
         ob.writeByte(i);
     }
 
 
+    @Override
     public void write(byte[] b)
         throws IOException {
         write(b, 0, b.length);
     }
 
 
+    @Override
     public void write(byte[] b, int off, int len)
         throws IOException {
         ob.write(b, off, len);
@@ -93,12 +97,14 @@
     /**
      * Will send the buffer to the client.
      */
+    @Override
     public void flush()
         throws IOException {
         ob.flush();
     }
 
 
+    @Override
     public void close()
         throws IOException {
         ob.close();

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java Thu Nov  5 00:58:58 2009
@@ -62,6 +62,7 @@
      * Return a String representation of this object, which exposes only
      * information that should be public.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("CoyotePrincipal[");

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java Thu Nov  5 00:58:58 2009
@@ -62,6 +62,7 @@
     /**
      * Prevent cloning the facade.
      */
+    @Override
     protected Object clone()
         throws CloneNotSupportedException {
         throw new CloneNotSupportedException();
@@ -82,59 +83,69 @@
     // --------------------------------------------------------- Reader Methods
 
 
+    @Override
     public void close()
         throws IOException {
         ib.close();
     }
 
 
+    @Override
     public int read()
         throws IOException {
         return ib.read();
     }
 
 
+    @Override
     public int read(char[] cbuf)
         throws IOException {
         return ib.read(cbuf, 0, cbuf.length);
     }
 
 
+    @Override
     public int read(char[] cbuf, int off, int len)
         throws IOException {
         return ib.read(cbuf, off, len);
     }
 
 
+    @Override
     public long skip(long n)
         throws IOException {
         return ib.skip(n);
     }
 
 
+    @Override
     public boolean ready()
         throws IOException {
         return ib.ready();
     }
 
 
+    @Override
     public boolean markSupported() {
         return true;
     }
 
 
+    @Override
     public void mark(int readAheadLimit)
         throws IOException {
         ib.mark(readAheadLimit);
     }
 
 
+    @Override
     public void reset()
         throws IOException {
         ib.reset();
     }
 
 
+    @Override
     public String readLine()
         throws IOException {
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java Thu Nov  5 00:58:58 2009
@@ -60,6 +60,7 @@
     /**
      * Prevent cloning the facade.
      */
+    @Override
     protected Object clone()
         throws CloneNotSupportedException {
         throw new CloneNotSupportedException();
@@ -88,6 +89,7 @@
     // --------------------------------------------------------- Writer Methods
 
 
+    @Override
     public void flush() {
 
         if (error)
@@ -102,6 +104,7 @@
     }
 
 
+    @Override
     public void close() {
 
         // We don't close the PrintWriter - super() is not called,
@@ -116,12 +119,14 @@
     }
 
 
+    @Override
     public boolean checkError() {
         flush();
         return error;
     }
 
 
+    @Override
     public void write(int c) {
 
         if (error)
@@ -136,6 +141,7 @@
     }
 
 
+    @Override
     public void write(char buf[], int off, int len) {
 
         if (error)
@@ -150,11 +156,13 @@
     }
 
 
+    @Override
     public void write(char buf[]) {
 	write(buf, 0, buf.length);
     }
 
 
+    @Override
     public void write(String s, int off, int len) {
 
         if (error)
@@ -169,6 +177,7 @@
     }
 
 
+    @Override
     public void write(String s) {
         write(s, 0, s.length());
     }
@@ -177,6 +186,7 @@
     // ---------------------------------------------------- PrintWriter Methods
 
 
+    @Override
     public void print(boolean b) {
         if (b) {
             write("true");
@@ -186,36 +196,43 @@
     }
 
 
+    @Override
     public void print(char c) {
         write(c);
     }
 
 
+    @Override
     public void print(int i) {
         write(String.valueOf(i));
     }
 
 
+    @Override
     public void print(long l) {
         write(String.valueOf(l));
     }
 
 
+    @Override
     public void print(float f) {
         write(String.valueOf(f));
     }
 
 
+    @Override
     public void print(double d) {
         write(String.valueOf(d));
     }
 
 
+    @Override
     public void print(char s[]) {
         write(s);
     }
 
 
+    @Override
     public void print(String s) {
         if (s == null) {
             s = "null";
@@ -224,64 +241,75 @@
     }
 
 
+    @Override
     public void print(Object obj) {
         write(String.valueOf(obj));
     }
 
 
+    @Override
     public void println() {
         write(LINE_SEP);
     }
 
 
+    @Override
     public void println(boolean b) {
         print(b);
         println();
     }
 
 
+    @Override
     public void println(char c) {
         print(c);
         println();
     }
 
 
+    @Override
     public void println(int i) {
         print(i);
         println();
     }
 
 
+    @Override
     public void println(long l) {
         print(l);
         println();
     }
 
 
+    @Override
     public void println(float f) {
         print(f);
         println();
     }
 
 
+    @Override
     public void println(double d) {
         print(d);
         println();
     }
 
 
+    @Override
     public void println(char c[]) {
         print(c);
         println();
     }
 
 
+    @Override
     public void println(String s) {
         print(s);
         println();
     }
 
 
+    @Override
     public void println(Object o) {
         print(o);
         println();

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu Nov  5 00:58:58 2009
@@ -238,6 +238,7 @@
      * 
      * @throws IOException An underlying IOException occurred
      */
+    @Override
     public void close()
         throws IOException {
         closed = true;
@@ -360,6 +361,7 @@
     }
 
 
+    @Override
     public int read()
         throws IOException {
 
@@ -370,6 +372,7 @@
     }
 
 
+    @Override
     public int read(char[] cbuf)
         throws IOException {
 
@@ -380,6 +383,7 @@
     }
 
 
+    @Override
     public int read(char[] cbuf, int off, int len)
         throws IOException {
 
@@ -390,6 +394,7 @@
     }
 
 
+    @Override
     public long skip(long n)
         throws IOException {
 
@@ -426,6 +431,7 @@
     }
 
 
+    @Override
     public boolean ready()
         throws IOException {
 
@@ -436,11 +442,13 @@
     }
 
 
+    @Override
     public boolean markSupported() {
         return true;
     }
 
 
+    @Override
     public void mark(int readAheadLimit)
         throws IOException {
 
@@ -464,6 +472,7 @@
     }
 
 
+    @Override
     public void reset()
         throws IOException {
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu Nov  5 00:58:58 2009
@@ -254,6 +254,7 @@
      * 
      * @throws IOException An underlying IOException occurred
      */
+    @Override
     public void close()
         throws IOException {
 
@@ -284,6 +285,7 @@
      * 
      * @throws IOException An underlying IOException occurred
      */
+    @Override
     public void flush()
         throws IOException {
         doFlush(true);
@@ -406,6 +408,7 @@
     // ------------------------------------------------- Chars Handling Methods
 
 
+    @Override
     public void write(int c)
         throws IOException {
 
@@ -419,6 +422,7 @@
     }
 
 
+    @Override
     public void write(char c[])
         throws IOException {
 
@@ -430,6 +434,7 @@
     }
 
 
+    @Override
     public void write(char c[], int off, int len)
         throws IOException {
 
@@ -446,6 +451,7 @@
     /**
      * Append a string to the buffer
      */
+    @Override
     public void write(String s, int off, int len)
         throws IOException {
 
@@ -461,6 +467,7 @@
     }
 
 
+    @Override
     public void write(String s)
         throws IOException {
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Thu Nov  5 00:58:58 2009
@@ -253,6 +253,7 @@
     /**
      * Prevent cloning the facade.
      */
+    @Override
     protected Object clone()
         throws CloneNotSupportedException {
         throw new CloneNotSupportedException();

Modified: tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java Thu Nov  5 00:58:58 2009
@@ -132,6 +132,7 @@
     /**
      * Prevent cloning the facade.
      */
+    @Override
     protected Object clone()
         throws CloneNotSupportedException {
         throw new CloneNotSupportedException();

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Thu Nov  5 00:58:58 2009
@@ -192,6 +192,7 @@
     /**
      * Return a String representation of this object.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("ApplicationFilterConfig[");

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Thu Nov  5 00:58:58 2009
@@ -206,6 +206,7 @@
      *
      * @param name Name of the attribute to retrieve
      */
+    @Override
     public Object getAttribute(String name) {
 
         if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
@@ -240,6 +241,7 @@
      * Override the <code>getAttributeNames()</code> method of the wrapped
      * request.
      */
+    @Override
     public Enumeration<String> getAttributeNames() {
         return (new AttributeNamesEnumerator());
     }
@@ -251,6 +253,7 @@
      *
      * @param name Name of the attribute to remove
      */
+    @Override
     public void removeAttribute(String name) {
 
         if (!removeSpecial(name))
@@ -266,6 +269,7 @@
      * @param name Name of the attribute to set
      * @param value Value of the attribute to set
      */
+    @Override
     public void setAttribute(String name, Object value) {
 
         if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
@@ -289,6 +293,7 @@
      *
      * @param path Path of the resource to be wrapped
      */
+    @Override
     public RequestDispatcher getRequestDispatcher(String path) {
 
         if (context == null)
@@ -336,6 +341,7 @@
      * Override the <code>getContextPath()</code> method of the wrapped
      * request.
      */
+    @Override
     public String getContextPath() {
 
         return (this.contextPath);
@@ -348,6 +354,7 @@
      *
      * @param name Name of the requested parameter
      */
+    @Override
     public String getParameter(String name) {
 
 	parseParameters();
@@ -369,6 +376,7 @@
      * Override the <code>getParameterMap()</code> method of the
      * wrapped request.
      */
+    @Override
     public Map<String, String[]> getParameterMap() {
 
 	parseParameters();
@@ -381,6 +389,7 @@
      * Override the <code>getParameterNames()</code> method of the
      * wrapped request.
      */
+    @Override
     public Enumeration<String> getParameterNames() {
 
 	parseParameters();
@@ -395,6 +404,7 @@
      *
      * @param name Name of the requested parameter
      */
+    @Override
     public String[] getParameterValues(String name) {
 
 	parseParameters();
@@ -419,6 +429,7 @@
     /**
      * Override the <code>getPathInfo()</code> method of the wrapped request.
      */
+    @Override
     public String getPathInfo() {
 
         return (this.pathInfo);
@@ -430,6 +441,7 @@
      * Override the <code>getQueryString()</code> method of the wrapped
      * request.
      */
+    @Override
     public String getQueryString() {
 
         return (this.queryString);
@@ -441,6 +453,7 @@
      * Override the <code>getRequestURI()</code> method of the wrapped
      * request.
      */
+    @Override
     public String getRequestURI() {
 
         return (this.requestURI);
@@ -452,6 +465,7 @@
      * Override the <code>getRequestURL()</code> method of the wrapped
      * request.
      */
+    @Override
     public StringBuffer getRequestURL() {
 
         StringBuffer url = new StringBuffer();
@@ -479,6 +493,7 @@
      * Override the <code>getServletPath()</code> method of the wrapped
      * request.
      */
+    @Override
     public String getServletPath() {
 
         return (this.servletPath);
@@ -490,6 +505,7 @@
      * Return the session associated with this Request, creating one
      * if necessary.
      */
+    @Override
     public HttpSession getSession() {
         return (getSession(true));
     }
@@ -501,6 +517,7 @@
      *
      * @param create Create a new session if one does not exist
      */
+    @Override
     public HttpSession getSession(boolean create) {
 
         if (crossContext) {
@@ -555,6 +572,7 @@
      * @return true if the request specifies a JSESSIONID that is valid within
      * the context of this ApplicationHttpRequest, false otherwise.
      */
+    @Override
     public boolean isRequestedSessionIdValid() {
 
         if (crossContext) {

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Thu Nov  5 00:58:58 2009
@@ -112,6 +112,7 @@
      * @exception IllegalStateException if the response has already
      *  been committed
      */
+    @Override
     public void reset() {
 
         // If already committed, the wrapped response will throw ISE
@@ -126,6 +127,7 @@
      *
      * @param len The new content length
      */
+    @Override
     public void setContentLength(int len) {
 
         if (!included)
@@ -139,6 +141,7 @@
      *
      * @param type The new content type
      */
+    @Override
     public void setContentType(String type) {
 
         if (!included)
@@ -152,6 +155,7 @@
      *
      * @param loc The new locale
      */
+    @Override
     public void setLocale(Locale loc) {
 
         if (!included)
@@ -165,6 +169,7 @@
      *
      * @param size The buffer size
      */
+    @Override
     public void setBufferSize(int size) {
         if (!included)
             getResponse().setBufferSize(size);
@@ -179,6 +184,7 @@
      *
      * @param cookie The new cookie
      */
+    @Override
     public void addCookie(Cookie cookie) {
 
         if (!included)
@@ -193,6 +199,7 @@
      * @param name The new header name
      * @param value The new header value
      */
+    @Override
     public void addDateHeader(String name, long value) {
 
         if (!included)
@@ -207,6 +214,7 @@
      * @param name The new header name
      * @param value The new header value
      */
+    @Override
     public void addHeader(String name, String value) {
 
         if (!included)
@@ -221,6 +229,7 @@
      * @param name The new header name
      * @param value The new header value
      */
+    @Override
     public void addIntHeader(String name, int value) {
 
         if (!included)
@@ -236,6 +245,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public void sendError(int sc) throws IOException {
 
         if (!included)
@@ -252,6 +262,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public void sendError(int sc, String msg) throws IOException {
 
         if (!included)
@@ -267,6 +278,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public void sendRedirect(String location) throws IOException {
 
         if (!included)
@@ -281,6 +293,7 @@
      * @param name The new header name
      * @param value The new header value
      */
+    @Override
     public void setDateHeader(String name, long value) {
 
         if (!included)
@@ -295,6 +308,7 @@
      * @param name The new header name
      * @param value The new header value
      */
+    @Override
     public void setHeader(String name, String value) {
 
         if (!included)
@@ -309,6 +323,7 @@
      * @param name The new header name
      * @param value The new header value
      */
+    @Override
     public void setIntHeader(String name, int value) {
 
         if (!included)
@@ -322,6 +337,7 @@
      *
      * @param sc The new status code
      */
+    @Override
     public void setStatus(int sc) {
 
         if (!included)

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java Thu Nov  5 00:58:58 2009
@@ -105,6 +105,7 @@
      *
      * @param name Name of the attribute to retrieve
      */
+    @Override
     public Object getAttribute(String name) {
 
         synchronized (attributes) {
@@ -118,6 +119,7 @@
      * Override the <code>getAttributeNames()</code> method of the wrapped
      * request.
      */
+    @Override
     public Enumeration<String> getAttributeNames() {
 
         synchronized (attributes) {
@@ -133,6 +135,7 @@
      *
      * @param name Name of the attribute to remove
      */
+    @Override
     public void removeAttribute(String name) {
 
         synchronized (attributes) {
@@ -151,6 +154,7 @@
      * @param name Name of the attribute to set
      * @param value Value of the attribute to set
      */
+    @Override
     public void setAttribute(String name, Object value) {
 
         synchronized (attributes) {
@@ -170,6 +174,7 @@
      *
      * @param request The new wrapped request
      */
+    @Override
     public void setRequest(ServletRequest request) {
 
         super.setRequest(request);

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java Thu Nov  5 00:58:58 2009
@@ -102,6 +102,7 @@
      * @exception IllegalStateException if the response has already
      *  been committed
      */
+    @Override
     public void reset() {
 
         // If already committed, the wrapped response will throw ISE
@@ -116,6 +117,7 @@
      *
      * @param len The new content length
      */
+    @Override
     public void setContentLength(int len) {
 
         if (!included)
@@ -129,6 +131,7 @@
      *
      * @param type The new content type
      */
+    @Override
     public void setContentType(String type) {
 
         if (!included)
@@ -142,6 +145,7 @@
      *
      * @param loc The new locale
      */
+    @Override
     public void setLocale(Locale loc) {
         if (!included)
             getResponse().setLocale(loc);
@@ -153,6 +157,7 @@
      *
      * @param size The buffer size
      */
+    @Override
     public void setBufferSize(int size) {
         if (!included)
             getResponse().setBufferSize(size);
@@ -167,6 +172,7 @@
      *
      * @param response The new wrapped response
      */
+    @Override
     public void setResponse(ServletResponse response) {
 
         super.setResponse(response);

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Nov  5 00:58:58 2009
@@ -766,6 +766,7 @@
     }
 
 
+    @Override
     public void setName( String name ) {
         super.setName( name );
         encodedPath = urlEncoder.encode(name);
@@ -1388,6 +1389,7 @@
      * the corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -1425,6 +1427,7 @@
      *
      * @param loader The newly associated loader
      */
+    @Override
     public synchronized void setLoader(Loader loader) {
 
         super.setLoader(loader);
@@ -1652,6 +1655,7 @@
      * This call is meaningful only <strong>after</strong> a Loader has
      * been configured.
      */
+    @Override
     public ClassLoader getParentClassLoader() {
         if (parentClassLoader != null)
             return (parentClassLoader);
@@ -1915,6 +1919,7 @@
      *
      * @param resources The newly associated DirContext
      */
+    @Override
     public synchronized void setResources(DirContext resources) {
 
         if (started) {
@@ -2109,6 +2114,7 @@
      * @exception IllegalArgumentException if the proposed container is
      *  not an implementation of Wrapper
      */
+    @Override
     public void addChild(Container child) {
 
         // Global JspServlet
@@ -3347,6 +3353,7 @@
      * @exception IllegalArgumentException if the proposed container is
      *  not an implementation of Wrapper
      */
+    @Override
     public void removeChild(Container child) {
 
         if (!(child instanceof Wrapper)) {
@@ -4231,6 +4238,7 @@
      *
      * @exception LifecycleException if a startup error occurs
      */
+    @Override
     public synchronized void start() throws LifecycleException {
         //if (lazy ) return;
         if (started) {
@@ -4620,6 +4628,7 @@
      *
      * @exception LifecycleException if a shutdown error occurs
      */
+    @Override
     public synchronized void stop() throws LifecycleException {
 
         // Validate and update our current component state
@@ -4751,6 +4760,7 @@
      * XXX Should this be done in stop() ?
      * 
      */ 
+    @Override
     public void destroy() throws Exception {
         if( oname != null ) { 
             // Send j2ee.object.deleted notification 
@@ -4792,6 +4802,7 @@
     /**
      * Return a String representation of this component.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder();
@@ -5272,6 +5283,7 @@
     }
     
 
+    @Override
     public ObjectName createObjectName(String hostDomain, ObjectName parentName)
             throws MalformedObjectNameException
     {
@@ -5353,6 +5365,7 @@
      * @return ObjectName The name of the object
      * @throws Exception If an error occurs
      */
+    @Override
     public ObjectName preRegister(MBeanServer server,
                                   ObjectName name)
             throws Exception
@@ -5365,6 +5378,7 @@
         return super.preRegister(server,name);
     }
 
+    @Override
     public void preDeregister() throws Exception {
         if( started ) {
             try {
@@ -5375,6 +5389,7 @@
         }
     }
 
+    @Override
     public void init() throws Exception {
 
         if( this.getParent() == null ) {
@@ -5449,6 +5464,7 @@
         
     }
 
+    @Override
     public ObjectName getParentName() throws MalformedObjectNameException {
         // "Life" update
         String path=oname.getKeyProperty("name");

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java Thu Nov  5 00:58:58 2009
@@ -82,6 +82,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -97,6 +98,7 @@
      * 
      * @see org.apache.catalina.Contained#setContainer(org.apache.catalina.Container)
      */
+    @Override
     public void setContainer(Container container) {
         super.setContainer(container);
         context = (StandardContext) container;
@@ -115,6 +117,7 @@
      * @exception IOException if an input/output error occurred
      * @exception ServletException if a servlet error occurred
      */
+    @Override
     public final void invoke(Request request, Response response)
         throws IOException, ServletException {
 
@@ -232,6 +235,7 @@
      * @exception IOException if an input/output error occurred
      * @exception ServletException if a servlet error occurred
      */
+    @Override
     public final void event(Request request, Response response, CometEvent event)
         throws IOException, ServletException {
 

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Thu Nov  5 00:58:58 2009
@@ -131,6 +131,7 @@
      *
      * @return configured realm, or a JAAS realm by default
      */
+    @Override
     public Realm getRealm() {
         Realm configured=super.getRealm();
         // If no set realm has been called - default to JAAS
@@ -171,6 +172,7 @@
 
     }
     
+    @Override
     public void setName(String name ) {
         if( domain != null ) {
             // keep name==domain, ignore override
@@ -254,6 +256,7 @@
      *
      * @param child Child container to be added
      */
+    @Override
     public void addChild(Container child) {
 
         if (!(child instanceof Host))
@@ -269,6 +272,7 @@
      * the corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -281,6 +285,7 @@
      *
      * @param container Proposed parent Container
      */
+    @Override
     public void setParent(Container container) {
 
         throw new IllegalArgumentException
@@ -291,6 +296,7 @@
 
     private boolean initialized=false;
     
+    @Override
     public void init() {
         if( initialized ) return;
         initialized=true;
@@ -361,6 +367,7 @@
         
     }
     
+    @Override
     public void destroy() throws LifecycleException {
         if( ! initialized ) return;
         initialized=false;
@@ -401,6 +408,7 @@
      *
      * @exception LifecycleException if a startup error occurs
      */
+    @Override
     public void start() throws LifecycleException {
         if( started ) {
             return;
@@ -444,6 +452,7 @@
 
     }
     
+    @Override
     public void stop() throws LifecycleException {
         super.stop();
         if( mbeans != null ) {
@@ -459,6 +468,7 @@
     /**
      * Return a String representation of this component.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("StandardEngine[");
@@ -474,6 +484,7 @@
 
     // -------------------- JMX registration  --------------------
 
+    @Override
     public ObjectName preRegister(MBeanServer server,
                                   ObjectName name) throws Exception
     {
@@ -485,6 +496,7 @@
     }
 
     // FIXME Remove -- not used 
+    @Override
     public ObjectName getParentName() throws MalformedObjectNameException {
         if (getService()==null) {
             return null;
@@ -495,6 +507,7 @@
         return serviceName;                
     }
     
+    @Override
     public ObjectName createObjectName(String domain, ObjectName parent)
         throws Exception
     {
@@ -523,6 +536,7 @@
         
     }
     
+    @Override
     public String getDomain() {
         if (domain!=null) {
             return domain;
@@ -531,6 +545,7 @@
         }
     }
     
+    @Override
     public void setDomain(String domain) {
         this.domain = domain;
     }

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java Thu Nov  5 00:58:58 2009
@@ -75,6 +75,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -97,6 +98,7 @@
      * @exception IOException if an input/output error occurred
      * @exception ServletException if a servlet error occurred
      */
+    @Override
     public final void invoke(Request request, Response response)
         throws IOException, ServletException {
 
@@ -129,6 +131,7 @@
      * @exception IOException if an input/output error occurred
      * @exception ServletException if a servlet error occurred
      */
+    @Override
     public final void event(Request request, Response response, CometEvent event)
         throws IOException, ServletException {
 

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Thu Nov  5 00:58:58 2009
@@ -418,6 +418,7 @@
      * Return the canonical, fully qualified, name of the virtual host
      * this Container represents.
      */
+    @Override
     public String getName() {
 
         return (name);
@@ -433,6 +434,7 @@
      *
      * @exception IllegalArgumentException if name is null
      */
+    @Override
     public void setName(String name) {
 
         if (name == null)
@@ -561,6 +563,7 @@
      *
      * @param child Child container to be added
      */
+    @Override
     public void addChild(Container child) {
 
         if (!(child instanceof Context))
@@ -589,6 +592,7 @@
      * the corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -687,6 +691,7 @@
     /**
      * Return a String representation of this component.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder();
@@ -707,6 +712,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents it from being started
      */
+    @Override
     public synchronized void start() throws LifecycleException {
         if( started ) {
             return;
@@ -795,6 +801,7 @@
 
     private boolean initialized=false;
     
+    @Override
     public void init() {
         if( initialized ) return;
         initialized=true;
@@ -838,6 +845,7 @@
         }
     }
 
+    @Override
     public void destroy() throws Exception {
         // destroy our child containers, if any
         Container children[] = findChildren();
@@ -849,6 +857,7 @@
       
     }
     
+    @Override
     public ObjectName preRegister(MBeanServer server, ObjectName oname ) 
         throws Exception
     {
@@ -859,6 +868,7 @@
         return res;        
     }
     
+    @Override
     public ObjectName createObjectName(String domain, ObjectName parent)
         throws Exception
     {

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Thu Nov  5 00:58:58 2009
@@ -87,6 +87,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -109,6 +110,7 @@
      * @exception IOException if an input/output error occurred
      * @exception ServletException if a servlet error occurred
      */
+    @Override
     public final void invoke(Request request, Response response)
         throws IOException, ServletException {
 
@@ -170,6 +172,7 @@
      * @exception IOException if an input/output error occurred
      * @exception ServletException if a servlet error occurred
      */
+    @Override
     public final void event(Request request, Response response, CometEvent event)
         throws IOException, ServletException {
 

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Thu Nov  5 00:58:58 2009
@@ -576,6 +576,7 @@
     /**
      * Return a String representation of this component.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("StandardServer[");

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Thu Nov  5 00:58:58 2009
@@ -372,6 +372,7 @@
     /**
      * Return a String representation of this component.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("StandardService[");

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Thu Nov  5 00:58:58 2009
@@ -330,6 +330,7 @@
      * the corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -467,6 +468,7 @@
      *
      * @param container Proposed parent Container
      */
+    @Override
     public void setParent(Container container) {
 
         if ((container != null) &&
@@ -633,6 +635,7 @@
      * invoked inside the classloading context of this container. Unexpected
      * throwables will be caught and logged.
      */
+    @Override
     public void backgroundProcess() {
         super.backgroundProcess();
         
@@ -671,6 +674,7 @@
      *
      * @param child Child container to be added
      */
+    @Override
     public void addChild(Container child) {
 
         throw new IllegalStateException
@@ -1193,6 +1197,7 @@
     /**
      * Return a String representation of this component.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder();
@@ -1550,6 +1555,7 @@
      *
      * @exception LifecycleException if a fatal error occurs during startup
      */
+    @Override
     public void start() throws LifecycleException {
     
         // Send j2ee.state.starting notification 
@@ -1588,6 +1594,7 @@
      *
      * @exception LifecycleException if a fatal error occurs during shutdown
      */
+    @Override
     public void stop() throws LifecycleException {
 
         setAvailable(Long.MAX_VALUE);

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Thu Nov  5 00:58:58 2009
@@ -91,6 +91,7 @@
      * @exception IOException if an input/output error occurred
      * @exception ServletException if a servlet error occurred
      */
+    @Override
     public final void invoke(Request request, Response response)
         throws IOException, ServletException {
 
@@ -362,6 +363,7 @@
      * @exception ServletException if a servlet error occurs, or is thrown
      *  by a subsequently invoked Valve, Filter, or Servlet
      */
+    @Override
     public void event(Request request, Response response, CometEvent event)
         throws IOException, ServletException {
         
@@ -576,6 +578,7 @@
 
     // Don't register in JMX
 
+    @Override
     public ObjectName createObjectName(String domain, ObjectName parent)
             throws MalformedObjectNameException
     {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message