From 9207423ca084f3ca74cf9668aaea52291d6881da Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 6 Feb 2012 10:01:44 -0700 Subject: [PATCH] Fixing JDK5 build abort due to bad javadocs --- jetty-aggregate/jetty-all/pom.xml | 8 +++++++- .../eclipse/jetty/server/AbstractConnector.java | 16 ++++++++-------- .../org/eclipse/jetty/server/ResourceCache.java | 4 +++- .../java/org/eclipse/jetty/util/UrlEncoded.java | 2 -- .../jetty/util/component/AggregateLifeCycle.java | 8 ++++---- .../java/org/eclipse/jetty/webapp/Ordering.java | 6 +++--- .../jetty/websocket/DeflateFrameExtension.java | 2 +- pom.xml | 15 +++++++++++++-- 8 files changed, 39 insertions(+), 22 deletions(-) diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index 58b44b51659..f8f62fd9e52 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -38,7 +38,7 @@ sources **/* - META-INF/** + META-INF/**,**/Servlet3Continuation*,**/Jetty6Continuation* org.eclipse.jetty javax javax,org.eclipse.jetty.orbit @@ -171,5 +171,11 @@ ${project.version} provided + + org.slf4j + slf4j-api + provided + true + 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 e36ee95331b..b503dd60ba2 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; *
  • Base acceptor thread
    • *
  • Optional reverse proxy headers checking
    • * - * - * */ 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 949f641e5ef..e3742bc25e1 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 pathInContext, 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(); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java b/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java index 87b2f2e4a28..efa536bf9e3 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java @@ -358,7 +358,6 @@ public class UrlEncoded extends MultiMap implements Cloneable /** Decoded parameters to Map. * @param in InputSteam to read * @param map MultiMap to add parameters to - * @param maxLength maximum length of content to read or -1 for no limit * @param maxLength maximum number of keys to read or -1 for no limit */ public static void decode88591To(InputStream in, MultiMap map, int maxLength, int maxKeys) @@ -444,7 +443,6 @@ public class UrlEncoded extends MultiMap implements Cloneable /** Decoded parameters to Map. * @param in InputSteam to read * @param map MultiMap to add parameters to - * @param maxLength maximum length of content to read or -1 for no limit * @param maxLength maximum number of keys to read or -1 for no limit */ public static void decodeUtf8To(InputStream in, MultiMap map, int maxLength, int maxKeys) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java index 33796a2ba7c..38d2aa641b0 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java @@ -15,13 +15,13 @@ import org.eclipse.jetty.util.log.Logger; * An AggregateLifeCycle is an {@link LifeCycle} implementation for a collection of contained beans. *

    * Beans can be added the AggregateLifeCycle either as managed beans or as unmanaged beans. A managed bean is started, stopped and destroyed with the aggregate. - * An umanaged bean is associated with the aggregate for the purposes of {@link #dump()}, but it's lifecycle must be managed externally. + * An unmanaged bean is associated with the aggregate for the purposes of {@link #dump()}, but it's lifecycle must be managed externally. *

    * When a bean is added, if it is a {@link LifeCycle} and it is already started, then it is assumed to be an unmanaged bean. - * Otherwise the methods {@link #addBean(LifeCycle, boolean)}, {@link #manage(LifeCycle)} and {@link #unmanage(LifeCycle)} can be used to + * Otherwise the methods {@link #addBean(Object, boolean)}, {@link #manage(Object)} and {@link #unmanage(Object)} can be used to * explicitly control the life cycle relationship. *

    - * If adding a bean that is shared between multiple {@link AggregateLifeCycle} instances, then it should be started before being added, so it is unmanged, or + * If adding a bean that is shared between multiple {@link AggregateLifeCycle} instances, then it should be started before being added, so it is unmanaged, or * the API must be used to explicitly set it as unmanaged. *

    */ @@ -154,7 +154,7 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable /** Add an associated lifecycle. * @param o The lifecycle to add * @param managed True if the LifeCycle is to be joined, otherwise it will be disjoint. - * @return + * @return true if bean was added, false if already present. */ public boolean addBean(Object o, boolean managed) { diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java index 2f07404f2ba..e3f2086aada 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java @@ -38,7 +38,7 @@ public interface Ordering /** * AbsoluteOrdering * - * An element in web.xml + * An <absolute-order> element in web.xml */ public static class AbsoluteOrdering implements Ordering { @@ -122,7 +122,7 @@ public interface Ordering /** * RelativeOrdering * - * A set of elements in web-fragment.xmls. + * A set of <order> elements in web-fragment.xmls. */ public static class RelativeOrdering implements Ordering { @@ -346,7 +346,7 @@ public interface Ordering * @param list * @param fragNameA * @param fragNameB - * @return true if frament name A is before fragment name B + * @return true if fragment name A is before fragment name B */ protected boolean isBefore (List list, String fragNameA, String fragNameB) { diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java index 91bbf275f40..cedf0c7ae07 100644 --- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java +++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java @@ -27,7 +27,7 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; /** - * @TODO Implement proposed deflate frame draft + * TODO Implement proposed deflate frame draft */ public class DeflateFrameExtension extends AbstractExtension { diff --git a/pom.xml b/pom.xml index 69816e54a32..80426de459b 100644 --- a/pom.xml +++ b/pom.xml @@ -281,9 +281,20 @@ maven-javadoc-plugin true - true + false true - + org.slf4j.*;org.mortbay.* + + http://download.eclipse.org/jetty/stable-7/apidocs/ + + + + org.apache.xbean.XBean + a + Apache XBean: + + + org.apache.maven.plugins