tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r832945 [2/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
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java Thu Nov  5 00:58:58 2009
@@ -100,6 +100,7 @@
     /**
      * Return a String representation of this object.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("ApplicationParameter[");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java Thu Nov  5 00:58:58 2009
@@ -93,6 +93,7 @@
                 event, chain);        
     }
 
+    @Override
     protected Log getLogger() {
         return log;
     }

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java Thu Nov  5 00:58:58 2009
@@ -94,6 +94,7 @@
                 event, chain);        
     }
 
+    @Override
     protected Log getLogger() {
         return log;
     }

Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Thu Nov  5 00:58:58 2009
@@ -59,6 +59,7 @@
 
     private static final ThreadLocal<Timestamp> timestamp =
             new ThreadLocal<Timestamp>() {
+        @Override
         protected Timestamp initialValue() {
             return new Timestamp();
         }

Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java Thu Nov  5 00:58:58 2009
@@ -70,10 +70,12 @@
         this.cluster = cluster;
     }
 
+    @Override
     public boolean equals(Object listener) {
         return super.equals(listener);
     }
 
+    @Override
     public int hashCode() {
         return super.hashCode();
     }

Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Thu Nov  5 00:58:58 2009
@@ -84,6 +84,7 @@
      * @param digester Digester instance to which the new Rule instances
      *  should be added.
      */
+    @Override
     public void addRuleInstances(Digester digester) {
         //Cluster configuration start
         digester.addObjectCreate(prefix + "Manager",

Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.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);
@@ -111,6 +112,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();
@@ -165,6 +167,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public void stop() throws LifecycleException {
 
 	super.stop();
@@ -182,6 +185,7 @@
     /**
      * Return a String rendering of this object.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("ClusterSingleSignOn[");
@@ -207,6 +211,7 @@
      * @param ssoId Single sign on identifier
      * @param session Session to be associated
      */
+    @Override
     protected void associate(String ssoId, Session session) {
 
 	if (cluster != null) {
@@ -246,6 +251,7 @@
      * @param ssoId Single sign on identifier
      * @param session Session to be deregistered
      */
+    @Override
     protected void deregister(String ssoId, Session session) {
 
 	if (cluster != null) {
@@ -283,6 +289,7 @@
      *
      * @param ssoId Single sign on identifier to deregister
      */
+    @Override
     protected void deregister(String ssoId) {
 
 	if (cluster != null) {
@@ -320,6 +327,7 @@
      * @param username Username used to authenticate this user
      * @param password Password used to authenticate this user
      */
+    @Override
     protected void register(String ssoId, Principal principal, String authType,
                   String username, String password) {
 
@@ -377,6 +385,7 @@
      * @param username  the username (if any) used for the authentication
      * @param password  the password (if any) used for the authentication
      */
+    @Override
     protected void update(String ssoId, Principal principal, String authType,
                           String username, String password) {
 
@@ -415,6 +424,7 @@
      * @param ssoId Single sign on identifier from which to remove the session.
      * @param session the session to be removed.
      */
+    @Override
     protected void removeSession(String ssoId, Session session) {
 
 	if (cluster != null) {

Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java Thu Nov  5 00:58:58 2009
@@ -78,6 +78,7 @@
      * @param myobj
      *            ClusterMessage - the message received from the cluster
      */
+    @Override
     public void messageReceived(ClusterMessage myobj) {
         if (myobj != null && myobj instanceof SingleSignOnMessage) {
             SingleSignOnMessage msg = (SingleSignOnMessage) myobj;
@@ -131,6 +132,7 @@
      *         invoked. If false is returned, the messageReceived method will
      *         not be invoked.
      */
+    @Override
     public boolean accept(ClusterMessage msg) {
         return (msg instanceof SingleSignOnMessage);
     }

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

Modified: tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Thu Nov  5 00:58:58 2009
@@ -113,6 +113,7 @@
         }
     }
     
+    @Override
     public ServletContext getServletContext() {
         if (context == null) {
             context = new ReplApplContext(getBasePath(), this);
@@ -137,6 +138,7 @@
             return (ReplicatedContext)getContext();
         }
         
+        @Override
         protected ServletContext getFacade() {
              return super.getFacade();
         }
@@ -148,12 +150,14 @@
             this.attributes = map;
         }
         
+        @Override
         public void removeAttribute(String name) {
             tomcatAttributes.remove(name);
             //do nothing
             super.removeAttribute(name);
         }
         
+        @Override
         public void setAttribute(String name, Object value) {
             if ( (!getParent().startComplete) || "org.apache.jasper.runtime.JspApplicationContextImpl".equals(name) ){
                 tomcatAttributes.put(name,value);
@@ -161,6 +165,7 @@
                 super.setAttribute(name,value);
         }
         
+        @Override
         public Object getAttribute(String name) {
             if (tomcatAttributes.containsKey(name) )
                 return tomcatAttributes.get(name);
@@ -168,6 +173,7 @@
                 return super.getAttribute(name);
         }
         
+        @Override
         public Enumeration<String> getAttributeNames() {
             return new MultiEnumeration<String>(new Enumeration[] {super.getAttributeNames(),new Enumerator<String>(tomcatAttributes.keySet(), true)});
         }

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Thu Nov  5 00:58:58 2009
@@ -221,6 +221,7 @@
      * @param msg
      *            ClusterMessage - the message received from the cluster
      */
+    @Override
     public void messageReceived(ClusterMessage msg) {
         try {
             if (msg instanceof FileMessage) {
@@ -330,6 +331,7 @@
      *         invoked. If false is returned, the messageReceived method will
      *         not be invoked.
      */
+    @Override
     public boolean accept(ClusterMessage msg) {
         return (msg instanceof FileMessage) || (msg instanceof UndeployMessage);
     }
@@ -653,18 +655,22 @@
     }
 
     /*--Instance Getters/Setters--------------------------------*/
+    @Override
     public CatalinaCluster getCluster() {
         return cluster;
     }
 
+    @Override
     public void setCluster(CatalinaCluster cluster) {
         this.cluster = cluster;
     }
 
+    @Override
     public boolean equals(Object listener) {
         return super.equals(listener);
     }
 
+    @Override
     public int hashCode() {
         return super.hashCode();
     }

Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java Thu Nov  5 00:58:58 2009
@@ -90,6 +90,7 @@
         this.totalLength = totalLength;
     }
 
+    @Override
     public String getUniqueId() {
         StringBuilder result = new StringBuilder(getFileName());
         result.append("#-#");

Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Thu Nov  5 00:58:58 2009
@@ -219,10 +219,12 @@
             return war;
         }
 
+        @Override
         public int hashCode() {
             return war.getAbsolutePath().hashCode();
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other instanceof WarInfo) {
                 WarInfo wo = (WarInfo) other;

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Thu Nov  5 00:58:58 2009
@@ -121,6 +121,7 @@
     /**
      * Override persistence since they don't go hand in hand with replication for now.
      */
+    @Override
     public void unload() throws IOException {
     }
     
@@ -145,6 +146,7 @@
         }
     }
 
+    @Override
     public Session createEmptySession() {
         return new DeltaSession(this);
     }
@@ -173,6 +175,7 @@
 
 
 
+    @Override
     public String getName() {
         return this.name;
     }
@@ -187,6 +190,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
      */
+    @Override
     public void start() throws LifecycleException {
         if ( this.started ) return;
         
@@ -224,6 +228,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public void stop() throws LifecycleException
     {
         
@@ -243,10 +248,12 @@
 
     }
 
+    @Override
     public void setDistributable(boolean dist) {
         this.distributable = dist;
     }
 
+    @Override
     public boolean getDistributable() {
         return distributable;
     }

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java Thu Nov  5 00:58:58 2009
@@ -58,6 +58,7 @@
      * @param myobj
      *            ClusterMessage - the message received from the cluster
      */
+    @Override
     public void messageReceived(ClusterMessage myobj) {
         if (myobj != null && myobj instanceof SessionMessage) {
             SessionMessage msg = (SessionMessage) myobj;
@@ -100,6 +101,7 @@
      *         invoked. If false is returned, the messageReceived method will
      *         not be invoked.
      */
+    @Override
     public boolean accept(ClusterMessage msg) {
         return (msg instanceof SessionMessage);
     }

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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Nov  5 00:58:58 2009
@@ -162,6 +162,7 @@
      * corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
         return info;
     }
@@ -173,6 +174,7 @@
     /**
      * Return the descriptive short name of this Manager implementation.
      */
+    @Override
     public String getName() {
         return name;
     }
@@ -279,6 +281,7 @@
     /**
      * @return Returns the processingTime.
      */
+    @Override
     public long getProcessingTime() {
         return processingTime;
     }
@@ -494,6 +497,7 @@
      * @param container
      *            The associated Container
      */
+    @Override
     public void setContainer(Container container) {
         // De-register from the old Container (if any)
         if ((this.container != null) && (this.container instanceof Context))
@@ -531,6 +535,7 @@
      * @exception IllegalStateException
      *                if a new session cannot be instantiated for any reason
      */
+    @Override
     public Session createSession(String sessionId) {
         return createSession(sessionId, true);
     }
@@ -594,6 +599,7 @@
      * Create DeltaSession
      * @see org.apache.catalina.Manager#createEmptySession()
      */
+    @Override
     public Session createEmptySession() {
         return getNewDeltaSession() ;
     }

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java Thu Nov  5 00:58:58 2009
@@ -328,6 +328,7 @@
         public Object getValue() {
             return value;
         }
+        @Override
         public int hashCode() {
             return name.hashCode();
         }
@@ -343,6 +344,7 @@
             action=-1;
         }
 
+        @Override
         public boolean equals(Object o) {
             if ( ! (o instanceof AttributeInfo ) ) return false;
             AttributeInfo other =  (AttributeInfo)o;
@@ -375,6 +377,7 @@
             if (getValue()!=null) out.writeObject(getValue());
         }
         
+        @Override
         public String toString() {
             StringBuilder buf = new StringBuilder("AttributeInfo[type=");
             buf.append(getType()).append(", action=").append(getAction());

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu Nov  5 00:58:58 2009
@@ -255,12 +255,14 @@
      * @param id
      *            The new session identifier
      */
+    @Override
     public void setId(String id) {
         super.setId(id);
         resetDeltaRequest();
     }
 
 
+    @Override
     public void setMaxInactiveInterval(int interval) {
         this.setMaxInactiveInterval(interval,true);
     }
@@ -288,6 +290,7 @@
      * @param isNew
      *            The new value for the <code>isNew</code> flag
      */
+    @Override
     public void setNew(boolean isNew) {
         setNew(isNew, true);
     }
@@ -313,6 +316,7 @@
      * @param principal
      *            The new Principal, or <code>null</code> if none
      */
+    @Override
     public void setPrincipal(Principal principal) {
         setPrincipal(principal, true);
     }
@@ -331,6 +335,7 @@
     /**
      * Return the <code>isValid</code> flag for this session.
      */
+    @Override
     public boolean isValid() {
         if (this.expiring) {
             return true;
@@ -364,6 +369,7 @@
     /**
      * End the access and register to ReplicationValve (crossContext support)
      */
+    @Override
     public void endAccess() {
     	super.endAccess() ;
     	if(manager instanceof DeltaManager) {
@@ -380,6 +386,7 @@
      * @param notify
      *            Should we notify listeners about the demise of this session?
      */
+    @Override
     public void expire(boolean notify) {
         expire(notify, true);
     }
@@ -421,6 +428,7 @@
      * Release all object references, and initialize instance variables, in
      * preparation for reuse of this object.
      */
+    @Override
     public void recycle() {
         try {
             lock();
@@ -435,6 +443,7 @@
     /**
      * Return a string representation of this object.
      */
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("DeltaSession[");
@@ -538,6 +547,7 @@
      * @exception IllegalStateException
      *                if this method is called on an invalidated session
      */
+    @Override
     public void removeAttribute(String name, boolean notify) {
         removeAttribute(name, notify, true);
     }
@@ -567,6 +577,7 @@
      * @exception IllegalStateException
      *                if this method is called on an invalidated session
      */
+    @Override
     public void setAttribute(String name, Object value) {
         setAttribute(name, value, true, true);
     }
@@ -691,6 +702,7 @@
      * @exception IOException
      *                if an input/output error occurs
      */
+    @Override
     protected void writeObject(ObjectOutputStream stream) throws IOException {
         writeObject((ObjectOutput)stream);
     }

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Thu Nov  5 00:58:58 2009
@@ -152,6 +152,7 @@
     /**
      * Return descriptive information about this implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -211,6 +212,7 @@
      * @exception ServletException
      *                if a servlet error has occurred
      */
+    @Override
     public void invoke(Request request, Response response) throws IOException,
             ServletException {
 

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java Thu Nov  5 00:58:58 2009
@@ -108,6 +108,7 @@
      * @param msg
      *            ClusterMessage - the message received from the cluster
      */
+    @Override
     public void messageReceived(ClusterMessage msg) {
         if (msg instanceof SessionIDMessage) {
             SessionIDMessage sessionmsg = (SessionIDMessage) msg;
@@ -160,6 +161,7 @@
      *         invoked. If false is returned, the messageReceived method will
      *         not be invoked.
      */
+    @Override
     public boolean accept(ClusterMessage msg) {
         return (msg instanceof SessionIDMessage);
     }

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java Thu Nov  5 00:58:58 2009
@@ -81,6 +81,7 @@
     }
 
 
+    @Override
     public void removeAttribute(String name) {
         setIsDirty(true);
         super.removeAttribute(name);
@@ -90,6 +91,7 @@
      * see parent description,
      * plus we also notify other nodes in the cluster
      */
+    @Override
     public void removeAttribute(String name, boolean notify) {
         setIsDirty(true);
         super.removeAttribute(name,notify);
@@ -99,6 +101,7 @@
     /**
      * Sets an attribute and notifies the other nodes in the cluster
      */
+    @Override
     public void setAttribute(String name, Object value)
     {
         if ( value == null ) {
@@ -111,6 +114,7 @@
         super.setAttribute(name,value);
     }
 
+    @Override
     public void setMaxInactiveInterval(int interval) {
         setIsDirty(true);
         super.setMaxInactiveInterval(interval);
@@ -136,11 +140,13 @@
      *
      * @param principal The new Principal, or <code>null</code> if none
      */
+    @Override
     public void setPrincipal(Principal principal) {
         super.setPrincipal(principal);
         setIsDirty(true);
     }
 
+    @Override
     public void expire() {
         SimpleTcpReplicationManager mgr =(SimpleTcpReplicationManager)getManager();
         mgr.sessionInvalidated(getIdInternal());
@@ -148,6 +154,7 @@
         super.expire();
     }
 
+    @Override
     public void invalidate() {
         SimpleTcpReplicationManager mgr =(SimpleTcpReplicationManager)getManager();
         mgr.sessionInvalidated(getIdInternal());
@@ -166,6 +173,7 @@
      * @exception ClassNotFoundException if an unknown class is specified
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public void readObjectData(ObjectInputStream stream)
         throws ClassNotFoundException, IOException {
 
@@ -183,6 +191,7 @@
      *
      * @exception IOException if an input/output error occurs
      */
+    @Override
     public void writeObjectData(ObjectOutputStream stream)
         throws IOException {
 
@@ -252,6 +261,7 @@
 
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder("ReplicatedSession id=");
         buf.append(getIdInternal()).append(" ref=").append(super.toString()).append("\n");
@@ -270,12 +280,14 @@
     public void setAccessCount(int accessCount) {
         this.accessCount.set(accessCount);
     }
+    @Override
     public long getLastAccessedTime() {
         return lastAccessedTime;
     }
     public void setLastAccessedTime(long lastAccessedTime) {
         this.lastAccessedTime = lastAccessedTime;
     }
+    @Override
     public long getThisAccessedTime() {
         return thisAccessedTime;
     }

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

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java Thu Nov  5 00:58:58 2009
@@ -37,7 +37,8 @@
 	private String host ;
 	private String contextPath;
 
-	public String getUniqueId() {
+	@Override
+    public String getUniqueId() {
 		StringBuilder result = new StringBuilder(getOrignalSessionID());
 		result.append("#-#");
 		result.append(getHost());
@@ -122,7 +123,8 @@
 		this.orignalSessionID = orignalSessionID;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 	    return "SESSIONID-UPDATE#" + getHost() + "." + getContextPath() + "#" + getOrignalSessionID() + ":" + getBackupSessionID();
 	}
 

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java Thu Nov  5 00:58:58 2009
@@ -113,6 +113,7 @@
     /**
      * set message send time but only the first setting works (one shot)
      */
+    @Override
     public void setTimestamp(long time) {
         synchronized(this) {
             if(!timestampSet) {
@@ -122,6 +123,7 @@
         }
     }
     
+    @Override
     public long getTimestamp() { return serializationTimestamp;}
     
     /**
@@ -146,13 +148,16 @@
     public String getContextName() {
        return mContextName;
     }
+    @Override
     public String getUniqueId() {
         return uniqueId;
     }
+    @Override
     public void setUniqueId(String uniqueId) {
         this.uniqueId = uniqueId;
     }
     
+    @Override
     public String toString() {
         return getEventTypeString() + "#" + getContextName() + "#" + getSessionID() ;
     }

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java Thu Nov  5 00:58:58 2009
@@ -179,6 +179,7 @@
     /**
      * Override persistence since they don't go hand in hand with replication for now.
      */
+    @Override
     public void unload() throws IOException {
         if ( !getDistributable() ) {
             super.unload();
@@ -238,6 +239,7 @@
      * @exception IllegalStateException if a new session cannot be
      *  instantiated for any reason
      */
+    @Override
     public Session createSession(String sessionId)
     {
         //create a session and notify the other nodes in the cluster
@@ -459,6 +461,7 @@
         return null;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
@@ -473,6 +476,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
      */
+    @Override
     public void start() throws LifecycleException {
         mManagerRunning = true;
         super.start();
@@ -535,6 +539,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public void stop() throws LifecycleException
     {
         mManagerRunning = false;
@@ -551,10 +556,12 @@
         }
     }
 
+    @Override
     public void setDistributable(boolean dist) {
         this.distributable = dist;
     }
 
+    @Override
     public boolean getDistributable() {
         return distributable;
     }

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Thu Nov  5 00:58:58 2009
@@ -131,6 +131,7 @@
     /**
      * Return descriptive information about this Valve implementation.
      */
+    @Override
     public String getInfo() {
 
         return (info);
@@ -323,6 +324,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
     {
@@ -398,6 +400,7 @@
     /**
      * Return a String rendering of this object.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("ReplicationValve[");

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

Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu Nov  5 00:58:58 2009
@@ -109,6 +109,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     public void doGet(HttpServletRequest request,
                       HttpServletResponse response)
         throws IOException, ServletException {
@@ -161,6 +162,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     public void doPost(HttpServletRequest request,
                       HttpServletResponse response)
         throws IOException, ServletException {
@@ -729,6 +731,7 @@
     /**
      * @see javax.servlet.Servlet#getServletInfo()
      */
+    @Override
     public String getServletInfo() {
         return "HTMLManagerServlet, Copyright (c) The Apache Software Foundation";
     }   
@@ -736,6 +739,7 @@
     /**
      * @see javax.servlet.GenericServlet#init()
      */
+    @Override
     public void init() throws ServletException {
         super.init();
     }   
@@ -986,60 +990,70 @@
         Comparator<Session> comparator = null;
         if ("CreationTime".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<Date>() {
+                @Override
                 public Comparable<Date> getComparableObject(Session session) {
                     return new Date(session.getCreationTime());
                 }
             };
         } else if ("id".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<String>() {
+                @Override
                 public Comparable<String> getComparableObject(Session session) {
                     return session.getId();
                 }
             };
         } else if ("LastAccessedTime".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<Date>() {
+                @Override
                 public Comparable<Date> getComparableObject(Session session) {
                     return new Date(session.getLastAccessedTime());
                 }
             };
         } else if ("MaxInactiveInterval".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<Date>() {
+                @Override
                 public Comparable<Date> getComparableObject(Session session) {
                     return new Date(session.getMaxInactiveInterval());
                 }
             };
         } else if ("new".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<Boolean>() {
+                @Override
                 public Comparable<Boolean> getComparableObject(Session session) {
                     return Boolean.valueOf(session.getSession().isNew());
                 }
             };
         } else if ("locale".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<String>() {
+                @Override
                 public Comparable<String> getComparableObject(Session session) {
                     return JspHelper.guessDisplayLocaleFromSession(session);
                 }
             };
         } else if ("user".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<String>() {
+                @Override
                 public Comparable<String> getComparableObject(Session session) {
                     return JspHelper.guessDisplayUserFromSession(session);
                 }
             };
         } else if ("UsedTime".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<Date>() {
+                @Override
                 public Comparable<Date> getComparableObject(Session session) {
                     return new Date(SessionUtils.getUsedTimeForSession(session));
                 }
             };
         } else if ("InactiveTime".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<Date>() {
+                @Override
                 public Comparable<Date> getComparableObject(Session session) {
                     return new Date(SessionUtils.getInactiveTimeForSession(session));
                 }
             };
         } else if ("TTL".equalsIgnoreCase(sortBy)) {
             comparator = new BaseSessionComparator<Date>() {
+                @Override
                 public Comparable<Date> getComparableObject(Session session) {
                     return new Date(SessionUtils.getTTLForSession(session));
                 }

Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Thu Nov  5 00:58:58 2009
@@ -55,6 +55,7 @@
     /**
      * Initialize this servlet.
      */
+    @Override
     public void init() throws ServletException {
         // Retrieve the MBean server
         registry = Registry.getRegistry(null, null);
@@ -71,6 +72,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     public void doGet(HttpServletRequest request,
                       HttpServletResponse response)
         throws IOException, ServletException

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Nov  5 00:58:58 2009
@@ -292,6 +292,7 @@
     /**
      * Finalize this servlet.
      */
+    @Override
     public void destroy() {
 
         // No actions necessary
@@ -308,6 +309,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     public void doGet(HttpServletRequest request,
                       HttpServletResponse response)
         throws IOException, ServletException {
@@ -389,6 +391,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     public void doPut(HttpServletRequest request,
                       HttpServletResponse response)
         throws IOException, ServletException {
@@ -429,6 +432,7 @@
     /**
      * Initialize this servlet.
      */
+    @Override
     public void init() throws ServletException {
 
         // Ensure that our ContainerServlet properties have been set

Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Thu Nov  5 00:58:58 2009
@@ -98,6 +98,7 @@
     /**
      * Initialize this servlet.
      */
+    @Override
     public void init() throws ServletException {
 
         // Retrieve the MBean server
@@ -160,6 +161,7 @@
     /**
      * Finalize this servlet.
      */
+    @Override
     public void destroy() {
 
         // No actions necessary
@@ -176,6 +178,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     public void doGet(HttpServletRequest request,
                       HttpServletResponse response)
         throws IOException, ServletException {

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Thu Nov  5 00:58:58 2009
@@ -82,6 +82,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     public void doGet(HttpServletRequest request,
                       HttpServletResponse response)
         throws IOException, ServletException {

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Thu Nov  5 00:58:58 2009
@@ -191,6 +191,7 @@
     /**
      * Finalize this servlet.
      */
+    @Override
     public void destroy() {
 
         // No actions necessary
@@ -207,6 +208,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     public void doGet(HttpServletRequest request,
                       HttpServletResponse response)
         throws IOException, ServletException {
@@ -307,6 +309,7 @@
     /**
      * Initialize this servlet.
      */
+    @Override
     public void init() throws ServletException {
 
         // Ensure that our ContainerServlet properties have been set

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java Thu Nov  5 00:58:58 2009
@@ -67,7 +67,8 @@
       * Return the fully qualified Java class name of the managed object
       * for this MBean.
       */
-     public String getClassName() {
+     @Override
+    public String getClassName() {
 
          return (this.resource.getClass().getName());
 

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java Thu Nov  5 00:58:58 2009
@@ -75,6 +75,7 @@
      * @exception ReflectionException if a Java reflection exception
      *  occurs when invoking the getter
      */
+    @Override
     public Object getAttribute(String name) throws AttributeNotFoundException,
             MBeanException, ReflectionException {
 
@@ -111,7 +112,8 @@
      * @exception ReflectionException if a Java reflection exception
      *  occurs when invoking the getter
      */
-     public void setAttribute(Attribute attribute)
+     @Override
+    public void setAttribute(Attribute attribute)
             throws AttributeNotFoundException, MBeanException,
             ReflectionException {
 

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java Thu Nov  5 00:58:58 2009
@@ -81,7 +81,8 @@
      * @exception ReflectionException if a Java reflection exception
      *  occurs when invoking the getter
      */
-     public void setAttribute(Attribute attribute)
+     @Override
+    public void setAttribute(Attribute attribute)
         throws AttributeNotFoundException, MBeanException,
         ReflectionException {
 

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java Thu Nov  5 00:58:58 2009
@@ -81,7 +81,8 @@
      * @exception ReflectionException if a Java reflection exception
      *  occurs when invoking the getter
      */
-     public void setAttribute(Attribute attribute)
+     @Override
+    public void setAttribute(Attribute attribute)
         throws AttributeNotFoundException, MBeanException,
         ReflectionException {
 

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java Thu Nov  5 00:58:58 2009
@@ -80,6 +80,7 @@
      * @exception ReflectionException if a Java reflection exception
      *  occurs when invoking the getter
      */
+    @Override
     public Object getAttribute(String name)
         throws AttributeNotFoundException, MBeanException,
         ReflectionException {
@@ -136,7 +137,8 @@
      * @exception ReflectionException if a Java reflection exception
      *  occurs when invoking the getter
      */
-     public void setAttribute(Attribute attribute)
+     @Override
+    public void setAttribute(Attribute attribute)
         throws AttributeNotFoundException, MBeanException,
         ReflectionException {
 

Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Thu Nov  5 00:58:58 2009
@@ -92,6 +92,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public Principal authenticate(String username, byte[] credentials) {
         Principal authenticatedUser = null;
         
@@ -130,6 +131,7 @@
      * @param md5a2 Second MD5 digest used to calculate the digest :
      * MD5(Method + ":" + uri)
      */
+    @Override
     public Principal authenticate(String username, String clientDigest,
             String once, String nc, String cnonce, String qop,
             String realmName, String md5a2) {
@@ -166,6 +168,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public Principal authenticate(String username, String credentials) {
         Principal authenticatedUser = null;
         
@@ -196,6 +199,7 @@
      *
      * @param container The associated Container
      */
+    @Override
     public void setContainer(Container container) {
         for(Realm realm : realms) {
             // Set the realmPath for JMX naming
@@ -220,6 +224,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
      */
+    @Override
     public void start() throws LifecycleException {
         // Start 'sub-realms' then this one
         for (Realm realm : realms) {
@@ -240,7 +245,8 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
-     public void stop() throws LifecycleException {
+     @Override
+    public void stop() throws LifecycleException {
         // Stop this realm, then the sub-realms (reverse order to start)
         super.stop();
         for (Realm realm : realms) {
@@ -258,6 +264,7 @@
      * @param certs Array of client certificates, with the first one in
      *  the array being the certificate of the client itself.
      */
+    @Override
     public Principal authenticate(X509Certificate[] certs) {
         Principal authenticatedUser = null;
         String username = null;

Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Thu Nov  5 00:58:58 2009
@@ -267,6 +267,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public Principal authenticate(String username, String credentials) {
     	
     	// No user or no credentials
@@ -400,6 +401,7 @@
     /**
      * Return a short name for this Realm implementation.
      */
+    @Override
     protected String getName() {
 
         return (name);
@@ -409,6 +411,7 @@
     /**
      * Return the password associated with the given principal's user name.
      */
+    @Override
     protected String getPassword(String username) {
 
         Connection dbConnection = null;
@@ -474,6 +477,7 @@
     /**
      * Return the Principal associated with the given user name.
      */
+    @Override
     protected Principal getPrincipal(String username) {
     	Connection dbConnection = open();
         if (dbConnection == null) {
@@ -607,6 +611,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents it from being started
      */
+    @Override
     public void start() throws LifecycleException {
 
         // Perform normal superclass initialization
@@ -640,6 +645,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public void stop() throws LifecycleException {
 
         // Perform normal superclass finalization

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

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Thu Nov  5 00:58:58 2009
@@ -216,6 +216,7 @@
      * @param request Request we are processing
      * @param context Context the Request is mapped to
      */
+    @Override
     public SecurityConstraint [] findSecurityConstraints(Request request,
                                                      Context context) {
         ArrayList<SecurityConstraint> results = null;

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Thu Nov  5 00:58:58 2009
@@ -220,6 +220,7 @@
         return useContextClassLoader;
     } 
 
+    @Override
     public void setContainer(Container container) {
         super.setContainer(container);
 
@@ -320,6 +321,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public Principal authenticate(String username, String credentials) {
         return authenticate(username,
                 new JAASCallbackHandler(this, username, credentials));
@@ -340,6 +342,7 @@
      * @param md5a2         Second MD5 digest used to calculate the digest
      *                          MD5(Method + ":" + uri)
      */
+    @Override
     public Principal authenticate(String username, String clientDigest,
             String nonce, String nc, String cnonce, String qop,
             String realmName, String md5a2) {
@@ -446,6 +449,7 @@
     /**
      * Return a short name for this <code>Realm</code> implementation.
      */
+    @Override
     protected String getName() {
 
         return (name);
@@ -458,6 +462,7 @@
      * always returns null as the JAASRealm has no way of obtaining this
      * information.
      */
+    @Override
     protected String getPassword(String username) {
 
         return (null);
@@ -468,6 +473,7 @@
     /**
      * Return the <code>Principal</code> associated with the given user name.
      */
+    @Override
     protected Principal getPrincipal(String username) {
 
         return authenticate(username,
@@ -580,6 +586,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents it from being started
      */
+    @Override
     public void start() throws LifecycleException {
 
         // Perform normal superclass initialization
@@ -598,6 +605,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public void stop() throws LifecycleException {
 
         // Perform normal superclass finalization

Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Nov  5 00:58:58 2009
@@ -329,6 +329,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public synchronized Principal authenticate(String username, String credentials) {
 
         // Number of tries is the numebr of attempts to connect to the database
@@ -513,6 +514,7 @@
     /**
      * Return a short name for this Realm implementation.
      */
+    @Override
     protected String getName() {
 
         return (name);
@@ -523,6 +525,7 @@
     /**
      * Return the password associated with the given principal's user name.
      */
+    @Override
     protected synchronized String getPassword(String username) {
 
         // Look up the user's credentials
@@ -593,6 +596,7 @@
     /**
      * Return the Principal associated with the given user name.
      */
+    @Override
     protected synchronized Principal getPrincipal(String username) {
 
         return (new GenericPrincipal(username,
@@ -763,6 +767,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents it from being started
      */
+    @Override
     public void start() throws LifecycleException {
 
         // Perform normal superclass initialization
@@ -785,6 +790,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public void stop() throws LifecycleException {
 
         // Perform normal superclass finalization

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Thu Nov  5 00:58:58 2009
@@ -886,6 +886,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public Principal authenticate(String username, String credentials) {
 
         DirContext context = null;
@@ -1782,6 +1783,7 @@
     /**
      * Return a short name for this Realm implementation.
      */
+    @Override
     protected String getName() {
 
         return (name);
@@ -1792,6 +1794,7 @@
     /**
      * Return the password associated with the given principal's user name.
      */
+    @Override
     protected String getPassword(String username) {
 
         return (null);
@@ -1801,6 +1804,7 @@
     /**
      * Return the Principal associated with the given user name.
      */
+    @Override
     protected Principal getPrincipal(String username) {
 
         DirContext context = null;
@@ -1985,6 +1989,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents it from being started
      */
+    @Override
     public void start() throws LifecycleException {
 
         // Perform normal superclass initialization
@@ -2006,6 +2011,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public void stop() throws LifecycleException {
 
         // Perform normal superclass finalization

Modified: tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java Thu Nov  5 00:58:58 2009
@@ -85,11 +85,13 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
      */
+    @Override
     public void start() throws LifecycleException {
         // Configure the list of failed users to delete the oldest entry once it
         // exceeds the specified size
         failedUsers = new LinkedHashMap<String, LockRecord>(cacheSize, 0.75f,
                 true) {
+            @Override
             protected boolean removeEldestEntry(
                     Map.Entry<String, LockRecord> eldest) {
                 if (size() > cacheSize) {
@@ -119,6 +121,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public Principal authenticate(String username, byte[] credentials) {
         if (isLocked(username)) {
             // Trying to authenticate a locked user is an automatic failure
@@ -152,6 +155,7 @@
      * @param md5a2 Second MD5 digest used to calculate the digest :
      * MD5(Method + ":" + uri)
      */
+    @Override
     public Principal authenticate(String username, String clientDigest,
             String once, String nc, String cnonce, String qop,
             String realmName, String md5a2) {
@@ -184,6 +188,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public Principal authenticate(String username, String credentials) {
         if (isLocked(username)) {
             // Trying to authenticate a locked user is an automatic failure
@@ -211,6 +216,7 @@
      * @param certs Array of client certificates, with the first one in
      *  the array being the certificate of the client itself.
      */
+    @Override
     public Principal authenticate(X509Certificate[] certs) {
         String username = null;
         if (certs != null && certs.length >0) {

Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Thu Nov  5 00:58:58 2009
@@ -101,6 +101,7 @@
      * the corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return info;
@@ -142,6 +143,7 @@
      * @param credentials Password or other credentials to use in
      *  authenticating this username
      */
+    @Override
     public Principal authenticate(String username, String credentials) {
 
         GenericPrincipal principal = principals.get(username);
@@ -232,6 +234,7 @@
     /**
      * Return a short name for this Realm implementation.
      */
+    @Override
     protected String getName() {
 
         return (name);
@@ -242,6 +245,7 @@
     /**
      * Return the password associated with the given principal's user name.
      */
+    @Override
     protected String getPassword(String username) {
 
         GenericPrincipal principal = principals.get(username);
@@ -257,6 +261,7 @@
     /**
      * Return the Principal associated with the given user name.
      */
+    @Override
     protected Principal getPrincipal(String username) {
 
         return principals.get(username);
@@ -282,6 +287,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents it from being started
      */
+    @Override
     public synchronized void start() throws LifecycleException {
 
         // Perform normal superclass initialization
@@ -322,6 +328,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public synchronized void stop() throws LifecycleException {
 
         // Perform normal superclass finalization

Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java Thu Nov  5 00:58:58 2009
@@ -87,6 +87,7 @@
      * @param digester Digester instance to which the new Rule instances
      *  should be added.
      */
+    @Override
     public void addRuleInstances(Digester digester) {
 
         digester.addRule(prefix + "user", new MemoryUserRule());
@@ -116,6 +117,7 @@
      *
      * @param attributes The attribute list for this element
      */
+    @Override
     public void begin(String namespace, String name, Attributes attributes)
         throws Exception {
 

Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Nov  5 00:58:58 2009
@@ -1463,6 +1463,7 @@
             this.name = name;
         }
         
+        @Override
         public boolean equals(Object o)
         {
             boolean equals = false;
@@ -1473,10 +1474,12 @@
             }
             return equals;
         }
+        @Override
         public int hashCode()
         {
             return name.hashCode();
         }
+        @Override
         public String toString()
         {
             return name;

Modified: tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Thu Nov  5 00:58:58 2009
@@ -96,6 +96,7 @@
      * the corresponding version number, in the format
      * <code>&lt;description&gt;/&lt;version&gt;</code>.
      */
+    @Override
     public String getInfo() {
 
         return info;
@@ -140,6 +141,7 @@
      * @param principal Principal for whom the role is to be checked
      * @param role Security role to be checked
      */
+    @Override
     public boolean hasRole(Principal principal, String role) {
         if( principal instanceof GenericPrincipal) {
             GenericPrincipal gp = (GenericPrincipal)principal;
@@ -180,6 +182,7 @@
     /**
      * Return a short name for this Realm implementation.
      */
+    @Override
     protected String getName() {
 
         return (name);
@@ -190,6 +193,7 @@
     /**
      * Return the password associated with the given principal's user name.
      */
+    @Override
     protected String getPassword(String username) {
 
         User user = database.findUser(username);
@@ -206,6 +210,7 @@
     /**
      * Return the Principal associated with the given user name.
      */
+    @Override
     protected Principal getPrincipal(String username) {
 
         User user = database.findUser(username);
@@ -241,6 +246,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents it from being started
      */
+    @Override
     public synchronized void start() throws LifecycleException {
 
         // Perform normal superclass initialization
@@ -270,6 +276,7 @@
      * @exception LifecycleException if this component detects a fatal error
      *  that needs to be reported
      */
+    @Override
     public synchronized void stop() throws LifecycleException {
 
         // Perform normal superclass finalization

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Nov  5 00:58:58 2009
@@ -283,6 +283,7 @@
      *                                  interferes with the servlet's normal
      *                                  operation
      */
+    @Override
     public void init(ServletConfig config) throws ServletException {
 
         super.init(config);
@@ -529,6 +530,7 @@
      * @see javax.servlet.http.HttpServlet
      *
      */
+    @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse res)
         throws IOException, ServletException {
         doGet(req, res);
@@ -548,6 +550,7 @@
      * @see javax.servlet.http.HttpServlet
      *
      */
+    @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse res)
         throws ServletException, IOException {
 
@@ -1168,6 +1171,7 @@
          * @return  HTML string containing CGI environment info
          *
          */
+        @Override
         public String toString() {
 
             StringBuilder sb = new StringBuilder();
@@ -1638,6 +1642,7 @@
                 final BufferedReader stdErrRdr = commandsStdErr ;
 
                 new Thread() {
+                    @Override
                     public void run () {
                         sendToLog(stdErrRdr) ;
                     }
@@ -1849,6 +1854,7 @@
         /**
          * @see java.io.InputStream#read()
          */
+        @Override
         public int read() throws IOException {
             if (state == STATE_HEADER_END) {
                 return -1;

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Thu Nov  5 00:58:58 2009
@@ -213,6 +213,7 @@
     /**
      * Finalize this servlet.
      */
+    @Override
     public void destroy() {
         // NOOP
     }
@@ -221,6 +222,7 @@
     /**
      * Initialize this servlet.
      */
+    @Override
     public void init() throws ServletException {
 
         if (getServletConfig().getInitParameter("debug") != null)
@@ -326,6 +328,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     protected void doGet(HttpServletRequest request,
                          HttpServletResponse response)
         throws IOException, ServletException {
@@ -345,6 +348,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     protected void doHead(HttpServletRequest request,
                           HttpServletResponse response)
         throws IOException, ServletException {
@@ -374,6 +378,7 @@
      * @exception ServletException  if the request for the
      *                                  OPTIONS cannot be handled
      */
+    @Override
     protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
 
@@ -407,6 +412,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     protected void doPost(HttpServletRequest request,
                           HttpServletResponse response)
         throws IOException, ServletException {
@@ -423,6 +429,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     protected void doPut(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
 
@@ -562,6 +569,7 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
+    @Override
     protected void doDelete(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
 



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


Mime
View raw message