Fixing JDK5 build abort due to bad javadocs

2 files changed, 11 insertions, 9 deletions

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
index e36ee95331..b503dd60ba 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
@@ -18,6 +18,7 @@ import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.concurrent.atomic.AtomicLong;
+
 import javax.servlet.ServletRequest;
 
 import org.eclipse.jetty.http.HttpBuffers;
@@ -30,7 +31,6 @@ import org.eclipse.jetty.io.Buffers.Type;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.EofException;
-import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.util.component.AggregateLifeCycle;
 import org.eclipse.jetty.util.component.Dumpable;
 import org.eclipse.jetty.util.log.Log;
@@ -49,8 +49,6 @@ import org.eclipse.jetty.util.thread.ThreadPool;
  * <li>Base acceptor thread</li>
  * <li>Optional reverse proxy headers checking</li>
  * </ul>
- *
- *
  */
 public abstract class AbstractConnector extends AggregateLifeCycle implements HttpBuffers, Connector, Dumpable
 {
@@ -130,7 +128,7 @@ public abstract class AbstractConnector extends AggregateLifeCycle implements Ht
     /** Set the ThreadPool.
      * The threadpool passed is added via {@link #addBean(Object)} so that 
      * it's lifecycle may be managed as a {@link AggregateLifeCycle}.
-     * @param threadPool the threadPool to set
+     * @param pool the threadPool to set
      */
     public void setThreadPool(ThreadPool pool)
     {
@@ -225,6 +223,7 @@ public abstract class AbstractConnector extends AggregateLifeCycle implements Ht
      * @return Returns the maxIdleTime when resources are low.
      * @deprecated
      */
+    @Deprecated
     public final int getLowResourceMaxIdleTime()
     {
         return getLowResourcesMaxIdleTime();
@@ -236,6 +235,7 @@ public abstract class AbstractConnector extends AggregateLifeCycle implements Ht
      *            The maxIdleTime to set when resources are low.
      * @deprecated
      */
+    @Deprecated
     public final void setLowResourceMaxIdleTime(int maxIdleTime)
     {
         setLowResourcesMaxIdleTime(maxIdleTime);
@@ -639,10 +639,10 @@ public abstract class AbstractConnector extends AggregateLifeCycle implements Ht
      *
      * @param check
      *            true if this connector is checking the x-forwarded-for/host/server headers
-     * @set {@link #setForwardedForHeader(String)}
-     * @set {@link #setForwardedHostHeader(String)}
-     * @set {@link #setForwardedProtoHeader(String)}
-     * @set {@link #setForwardedServerHeader(String)}
+     * @see #setForwardedForHeader(String)
+     * @see #setForwardedHostHeader(String)
+     * @see #setForwardedProtoHeader(String)
+     * @see #setForwardedServerHeader(String)
      */
     public void setForwarded(boolean check)
     {
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
index 949f641e5e..e3742bc25e 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.eclipse.jetty.http.HttpContent;
+import org.eclipse.jetty.http.HttpContent.ResourceAsHttpContent;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.io.Buffer;
@@ -172,7 +173,7 @@ public class ResourceCache
      * @param pathInContext The key into the cache
      * @return The entry matching <code>pathInContext</code>, or a new entry 
      * if no matching entry was found. If the content exists but is not cachable, 
-     * then a {@link HttpContent.ResourceAsHttpContent} instance is return. If 
+     * then a {@link ResourceAsHttpContent} instance is return. If 
      * the resource does not exist, then null is returned.
      * @throws IOException Problem loading the resource
      */
@@ -337,6 +338,7 @@ public class ResourceCache
     }
 
     /* ------------------------------------------------------------ */
+    @Override
     public String toString()
     {
         return "ResourceCache["+_parent+","+_factory+"]@"+hashCode();