diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/BrowserHelperFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/BrowserHelperFilter.java index a01d8fdc..9e50b0ef 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/BrowserHelperFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/BrowserHelperFilter.java @@ -30,14 +30,6 @@ package com.twelvemonkeys.servlet; -import com.twelvemonkeys.lang.StringUtil; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -45,12 +37,22 @@ import java.util.Properties; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +import com.twelvemonkeys.lang.StringUtil; + /** * BrowserHelperFilter * * @author Harald Kuhr * @version $Id: BrowserHelperFilter.java#1 $ */ +@Deprecated public class BrowserHelperFilter extends GenericFilter { private static final String HTTP_HEADER_ACCEPT = "Accept"; protected static final String HTTP_HEADER_USER_AGENT = "User-Agent"; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/DebugServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/DebugServlet.java index 54644745..a198db08 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/DebugServlet.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/DebugServlet.java @@ -30,14 +30,15 @@ package com.twelvemonkeys.servlet; +import java.io.IOException; +import java.util.Enumeration; + import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Enumeration; /** * DebugServlet class description. @@ -46,6 +47,7 @@ import java.util.Enumeration; * @author last modified by $Author: haku $ * @version $Id: DebugServlet.java#1 $ */ +@Deprecated public class DebugServlet extends GenericServlet { private long dateModified; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java index 46f2e9f7..f5c88a32 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java @@ -30,14 +30,21 @@ package com.twelvemonkeys.servlet; -import com.twelvemonkeys.lang.BeanUtil; - -import javax.servlet.*; import java.io.IOException; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.util.Enumeration; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import com.twelvemonkeys.lang.BeanUtil; + /** * Defines a generic, protocol-independent filter. *

@@ -72,6 +79,7 @@ import java.util.Enumeration; * @see Filter * @see FilterConfig */ +@Deprecated public abstract class GenericFilter implements Filter, FilterConfig, Serializable { // TODO: Rewrite to use ServletConfigurator instead of BeanUtil diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java index 2e7521b9..38010105 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java @@ -30,11 +30,12 @@ package com.twelvemonkeys.servlet; -import com.twelvemonkeys.lang.BeanUtil; +import java.lang.reflect.InvocationTargetException; import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import java.lang.reflect.InvocationTargetException; + +import com.twelvemonkeys.lang.BeanUtil; /** * Defines a generic, protocol-independent servlet. @@ -52,6 +53,7 @@ import java.lang.reflect.InvocationTargetException; * * @version $Id: GenericServlet.java#1 $ */ +@Deprecated public abstract class GenericServlet extends javax.servlet.GenericServlet { // TODO: Rewrite to use ServletConfigurator instead of BeanUtil diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java index 88b57519..849bdb42 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java @@ -30,11 +30,12 @@ package com.twelvemonkeys.servlet; -import com.twelvemonkeys.lang.BeanUtil; +import java.lang.reflect.InvocationTargetException; import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import java.lang.reflect.InvocationTargetException; + +import com.twelvemonkeys.lang.BeanUtil; /** * Defines a generic, HTTP specific servlet. @@ -52,6 +53,7 @@ import java.lang.reflect.InvocationTargetException; * * @version $Id: HttpServlet.java#1 $ */ +@Deprecated public abstract class HttpServlet extends javax.servlet.http.HttpServlet { // TODO: Rewrite to use ServletConfigurator instead of BeanUtil diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/InitParam.java b/servlet/src/main/java/com/twelvemonkeys/servlet/InitParam.java index 4c9cd343..7306fbf2 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/InitParam.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/InitParam.java @@ -30,7 +30,12 @@ package com.twelvemonkeys.servlet; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotation to be used by servlets/filters, to have their {@code init}-method @@ -49,6 +54,7 @@ import java.lang.annotation.*; @Inherited @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD/*, TODO: ElementType.FIELD*/}) +@Deprecated public @interface InitParam { static final String UNDEFINED = ""; String name() default UNDEFINED; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/OutputStreamAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/OutputStreamAdapter.java index c287da01..3c99f45c 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/OutputStreamAdapter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/OutputStreamAdapter.java @@ -30,12 +30,13 @@ package com.twelvemonkeys.servlet; -import com.twelvemonkeys.lang.Validate; - -import javax.servlet.ServletOutputStream; import java.io.IOException; import java.io.OutputStream; +import javax.servlet.ServletOutputStream; + +import com.twelvemonkeys.lang.Validate; + /** * A {@code ServletOutputStream} implementation backed by a * {@link java.io.OutputStream}. For filters that need to buffer the @@ -71,6 +72,7 @@ import java.io.OutputStream; * @version $Id: OutputStreamAdapter.java#1 $ * */ +@Deprecated public class OutputStreamAdapter extends ServletOutputStream { /** The wrapped {@code OutputStream}. */ diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigException.java index 75ca2f94..f6effc54 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigException.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigException.java @@ -38,6 +38,7 @@ import javax.servlet.ServletException; * @author Harald Kuhr * @version $Id: ServletConfigException.java#2 $ */ +@Deprecated public class ServletConfigException extends ServletException { // TODO: Parameters for init-param at fault, and possibly servlet name? diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java index d2450b95..3c791c55 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java @@ -30,14 +30,15 @@ package com.twelvemonkeys.servlet; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletResponse; +import static com.twelvemonkeys.lang.Validate.notNull; + import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import static com.twelvemonkeys.lang.Validate.notNull; +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletResponse; /** * A delegate for handling stream support in wrapped servlet responses. @@ -50,6 +51,7 @@ import static com.twelvemonkeys.lang.Validate.notNull; * @author last modified by $Author: haku $ * @version $Id: ServletResponseStreamDelegate.java#2 $ */ +@Deprecated public class ServletResponseStreamDelegate { private Object out = null; protected final ServletResponse response; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java index 98390d83..ce0a377c 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java @@ -30,14 +30,6 @@ package com.twelvemonkeys.servlet; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.util.convert.ConversionException; -import com.twelvemonkeys.util.convert.Converter; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.File; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -48,6 +40,21 @@ import java.net.URL; import java.util.List; import java.util.Map; +import javax.servlet.FilterConfig; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletRequest; +import javax.servlet.ServletRequestWrapper; +import javax.servlet.ServletResponse; +import javax.servlet.ServletResponseWrapper; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.util.convert.ConversionException; +import com.twelvemonkeys.util.convert.Converter; + /** * Various servlet related helper methods. @@ -57,6 +64,7 @@ import java.util.Map; * @author last modified by $Author: haku $ * @version $Id: ServletUtil.java#3 $ */ +@Deprecated public final class ServletUtil { /** diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/ThrottleFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ThrottleFilter.java index c531cc3f..5ff5e3a0 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/ThrottleFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/ThrottleFilter.java @@ -30,8 +30,12 @@ package com.twelvemonkeys.servlet; -import com.twelvemonkeys.io.FileUtil; -import com.twelvemonkeys.lang.StringUtil; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -39,12 +43,9 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; + +import com.twelvemonkeys.io.FileUtil; +import com.twelvemonkeys.lang.StringUtil; /** * ThrottleFilter, a filter for easing server during heavy load. @@ -62,6 +63,7 @@ import java.util.Map; * @see #setMaxConcurrentThreadCount * @see #setResponseMessages */ +@Deprecated public class ThrottleFilter extends GenericFilter { /** diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/TimingFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/TimingFilter.java index 3c129d04..e245d762 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/TimingFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/TimingFilter.java @@ -30,12 +30,13 @@ package com.twelvemonkeys.servlet; +import java.io.IOException; + import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import java.io.IOException; /** * TimingFilter class description. @@ -44,6 +45,7 @@ import java.io.IOException; * @author last modified by $Author: haku $ * @version $Id: TimingFilter.java#1 $ */ +@Deprecated public class TimingFilter extends GenericFilter { private String attribUsage = null; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilter.java index 07ab319c..ad363657 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilter.java @@ -30,12 +30,18 @@ package com.twelvemonkeys.servlet; -import javax.servlet.*; import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.ServletResponseWrapper; + /** * Removes extra unneccessary white space from a servlet response. * White space is defined as per {@link Character#isWhitespace(char)}. @@ -112,6 +118,7 @@ import java.io.PrintWriter; * @author last modified by $Author: haku $ * @version $Id: TrimWhiteSpaceFilter.java#2 $ */ +@Deprecated public class TrimWhiteSpaceFilter extends GenericFilter { private boolean autoFlush = true; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheRequest.java index 0b53cbf8..ee763fac 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheRequest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheRequest.java @@ -30,10 +30,10 @@ package com.twelvemonkeys.servlet.cache; -import com.twelvemonkeys.lang.Validate; - import java.net.URI; +import com.twelvemonkeys.lang.Validate; + /** * AbstractCacheRequest * @@ -41,6 +41,7 @@ import java.net.URI; * @author last modified by $Author: haku $ * @version $Id: AbstractCacheRequest.java#1 $ */ +@Deprecated public abstract class AbstractCacheRequest implements CacheRequest { private final URI requestURI; private final String method; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheResponse.java index cbcc0037..e236ce5b 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheResponse.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheResponse.java @@ -30,7 +30,11 @@ package com.twelvemonkeys.servlet.cache; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * AbstractCacheResponse @@ -39,6 +43,7 @@ import java.util.*; * @author last modified by $Author: haku $ * @version $Id: AbstractCacheResponse.java#1 $ */ +@Deprecated public abstract class AbstractCacheResponse implements CacheResponse { private int status; private final Map> headers = new LinkedHashMap>(); // Insertion order diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheException.java index 0302cb94..9912c4ff 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheException.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheException.java @@ -37,6 +37,7 @@ package com.twelvemonkeys.servlet.cache; * @author last modified by $Author: haku $ * @version $Id: CacheException.java#1 $ */ +@Deprecated public class CacheException extends Exception { public CacheException(Throwable pCause) { super(pCause); diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheFilter.java index 507e81bd..4ba87b61 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheFilter.java @@ -30,19 +30,25 @@ package com.twelvemonkeys.servlet.cache; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.servlet.GenericFilter; -import com.twelvemonkeys.servlet.ServletConfigException; -import com.twelvemonkeys.servlet.ServletUtil; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.servlet.GenericFilter; +import com.twelvemonkeys.servlet.ServletConfigException; +import com.twelvemonkeys.servlet.ServletUtil; + /** * A Filter that provides response caching, for HTTP {@code GET} requests. *

@@ -58,6 +64,7 @@ import java.util.logging.Logger; * @version $Id: CacheFilter.java#4 $ * */ +@Deprecated public class CacheFilter extends GenericFilter { HTTPCache cache; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheRequest.java index 8b9a43cb..5d71f3ae 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheRequest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheRequest.java @@ -41,6 +41,7 @@ import java.util.Map; * @author last modified by $Author: haku $ * @version $Id: CacheRequest.java#1 $ */ +@Deprecated public interface CacheRequest { URI getRequestURI(); diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponse.java index 8e0ea7f4..d95e1df2 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponse.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponse.java @@ -42,6 +42,7 @@ import java.util.Map; * @author last modified by $Author: haku $ * @version $Id: CacheResponse.java#1 $ */ +@Deprecated public interface CacheResponse { OutputStream getOutputStream() throws IOException; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java index e8f495e2..26127460 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java @@ -30,16 +30,17 @@ package com.twelvemonkeys.servlet.cache; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.net.HTTPUtil; -import com.twelvemonkeys.servlet.ServletResponseStreamDelegate; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponseWrapper; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponseWrapper; + +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.net.HTTPUtil; +import com.twelvemonkeys.servlet.ServletResponseStreamDelegate; + /** * CacheResponseWrapper class description. *

@@ -54,6 +55,7 @@ import java.io.PrintWriter; * @author last modified by $Author: haku $ * @version $Id: CacheResponseWrapper.java#3 $ */ +@Deprecated class CacheResponseWrapper extends HttpServletResponseWrapper { private ServletResponseStreamDelegate streamDelegate; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntity.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntity.java index 0f6bc1e2..aad05833 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntity.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntity.java @@ -38,6 +38,7 @@ import java.io.IOException; * @author Harald Kuhr * @version $Id: CachedEntity.java#3 $ */ +@Deprecated interface CachedEntity { /** diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntityImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntityImpl.java index 564021ca..9f131b5b 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntityImpl.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntityImpl.java @@ -30,18 +30,20 @@ package com.twelvemonkeys.servlet.cache; -import com.twelvemonkeys.lang.Validate; - -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.twelvemonkeys.lang.Validate; + /** * CachedEntity * * @author Harald Kuhr * @version $Id: CachedEntityImpl.java#3 $ */ +@Deprecated class CachedEntityImpl implements CachedEntity { private String cacheURI; private HTTPCache cache; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponse.java index fb433dca..3e5acf17 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponse.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponse.java @@ -39,6 +39,7 @@ import java.io.OutputStream; * @author Harald Kuhr * @version $Id: CachedResponse.java#3 $ */ +@Deprecated interface CachedResponse { /** * Writes the cached headers to the response diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponseImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponseImpl.java index 3436138d..a3eebf89 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponseImpl.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponseImpl.java @@ -30,13 +30,17 @@ package com.twelvemonkeys.servlet.cache; -import com.twelvemonkeys.io.FastByteArrayOutputStream; -import com.twelvemonkeys.lang.Validate; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.util.*; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.twelvemonkeys.io.FastByteArrayOutputStream; +import com.twelvemonkeys.lang.Validate; /** * CachedResponseImpl @@ -44,6 +48,7 @@ import java.util.*; * @author Harald Kuhr * @version $Id: CachedResponseImpl.java#4 $ */ +@Deprecated class CachedResponseImpl implements CachedResponse { final protected Map> headers; protected int headersSize; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheRequest.java index 858ccff4..137128fa 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheRequest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheRequest.java @@ -42,6 +42,7 @@ import java.util.Map; * @author last modified by $Author: haku $ * @version $Id: ClientCacheRequest.java#1 $ */ +@Deprecated public final class ClientCacheRequest extends AbstractCacheRequest { private Map> parameters; private Map> headers; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheResponse.java index 85e6a05c..fe71093e 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheResponse.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheResponse.java @@ -41,6 +41,7 @@ import java.io.OutputStream; * @author last modified by $Author: haku $ * @version $Id: ClientCacheResponse.java#2 $ */ +@Deprecated public final class ClientCacheResponse extends AbstractCacheResponse { // It's quite useless to cache the data either on disk or in memory, as it already is cached in the client's cache... // It would be nice if we could bypass that... diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java index 2055d3cf..aff48c60 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java @@ -30,6 +30,14 @@ package com.twelvemonkeys.servlet.cache; +import java.io.*; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletResponse; + import com.twelvemonkeys.io.FileUtil; import com.twelvemonkeys.lang.StringUtil; import com.twelvemonkeys.lang.Validate; @@ -38,13 +46,6 @@ import com.twelvemonkeys.net.MIMEUtil; import com.twelvemonkeys.util.LRUHashMap; import com.twelvemonkeys.util.NullMap; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * A "simple" HTTP cache. * @@ -95,6 +96,7 @@ import java.util.logging.Logger; // TODO: Rewrite to use NIO for performance // TODO: Allow no tempdir for in-memory only cache // TODO: Specify max size of disk-cache +@Deprecated public class HTTPCache { /** * The HTTP header {@code "Cache-Control"} diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ResponseResolver.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ResponseResolver.java index 835c8760..a27ea28a 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ResponseResolver.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ResponseResolver.java @@ -39,6 +39,7 @@ import java.io.IOException; * @author last modified by $Author: haku $ * @version $Id: ResponseResolver.java#2 $ */ +@Deprecated public interface ResponseResolver { void resolve(CacheRequest pRequest, CacheResponse pResponse) throws IOException, CacheException; } diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java index 09e1a4b7..a50add40 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java @@ -30,19 +30,20 @@ package com.twelvemonkeys.servlet.cache; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.net.HTTPUtil; -import com.twelvemonkeys.servlet.ServletResponseStreamDelegate; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.util.List; import java.util.Map; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; + +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.net.HTTPUtil; +import com.twelvemonkeys.servlet.ServletResponseStreamDelegate; + /** * CacheResponseWrapper class description. *

@@ -57,6 +58,7 @@ import java.util.Map; * @author last modified by $Author: haku $ * @version $Id: SerlvetCacheResponseWrapper.java#2 $ */ +@Deprecated class SerlvetCacheResponseWrapper extends HttpServletResponseWrapper { private ServletResponseStreamDelegate streamDelegate; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheRequest.java index 57c08a03..8ab24829 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheRequest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheRequest.java @@ -30,13 +30,14 @@ package com.twelvemonkeys.servlet.cache; -import com.twelvemonkeys.servlet.ServletUtil; - -import javax.servlet.http.HttpServletRequest; import java.net.URI; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; + +import com.twelvemonkeys.servlet.ServletUtil; + /** * ServletCacheRequest * @@ -44,6 +45,7 @@ import java.util.Map; * @author last modified by $Author: haku $ * @version $Id: ServletCacheRequest.java#1 $ */ +@Deprecated public final class ServletCacheRequest extends AbstractCacheRequest { private final HttpServletRequest request; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheResponse.java index 244a6aa0..25f853fb 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheResponse.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheResponse.java @@ -30,10 +30,11 @@ package com.twelvemonkeys.servlet.cache; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; +import javax.servlet.http.HttpServletResponse; + /** * ServletCacheResponse * @@ -41,6 +42,7 @@ import java.io.OutputStream; * @author last modified by $Author: haku $ * @version $Id: ServletCacheResponse.java#2 $ */ +@Deprecated public final class ServletCacheResponse extends AbstractCacheResponse { private HttpServletResponse response; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletResponseResolver.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletResponseResolver.java index c5f064cd..ace68b33 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletResponseResolver.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletResponseResolver.java @@ -30,10 +30,11 @@ package com.twelvemonkeys.servlet.cache; +import java.io.IOException; + import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; /** * ServletResponseResolver @@ -42,6 +43,7 @@ import java.io.IOException; * @author last modified by $Author: haku $ * @version $Id: ServletResponseResolver.java#2 $ */ +@Deprecated final class ServletResponseResolver implements ResponseResolver { final private ServletCacheRequest request; final private ServletCacheResponse response; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponse.java index 476975c3..721d9174 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponse.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponse.java @@ -38,6 +38,7 @@ import java.io.OutputStream; * @author Harald Kuhr * @version $Id: WritableCachedResponse.java#2 $ */ +@Deprecated public interface WritableCachedResponse extends CachedResponse, CacheResponse { /** * Gets the {@code OutputStream} for this cached response. diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java index 056c3b61..2e0b74bb 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java @@ -30,9 +30,6 @@ package com.twelvemonkeys.servlet.cache; -import com.twelvemonkeys.io.FastByteArrayOutputStream; -import com.twelvemonkeys.net.HTTPUtil; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -40,12 +37,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import com.twelvemonkeys.io.FastByteArrayOutputStream; +import com.twelvemonkeys.net.HTTPUtil; + /** * WritableCachedResponseImpl * * @author Harald Kuhr * @version $Id: WritableCachedResponseImpl.java#3 $ */ +@Deprecated class WritableCachedResponseImpl implements WritableCachedResponse { private final CachedResponseImpl cachedResponse; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileSizeExceededException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileSizeExceededException.java index b043de45..79677de7 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileSizeExceededException.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileSizeExceededException.java @@ -36,6 +36,7 @@ package com.twelvemonkeys.servlet.fileupload; * @author Harald Kuhr * @version $Id: FileSizeExceededException.java#1 $ */ +@Deprecated public class FileSizeExceededException extends FileUploadException { public FileSizeExceededException(Throwable pCause) { super(pCause.getMessage(), pCause); diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadException.java index 9167a7ad..c07519f6 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadException.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadException.java @@ -38,6 +38,7 @@ import javax.servlet.ServletException; * @author Harald Kuhr * @version $Id: FileUploadException.java#1 $ */ +@Deprecated public class FileUploadException extends ServletException { public FileUploadException(String pMessage) { super(pMessage); diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadFilter.java index 7520a087..efc29919 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadFilter.java @@ -30,20 +30,21 @@ package com.twelvemonkeys.servlet.fileupload; -import com.twelvemonkeys.io.FileUtil; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.servlet.GenericFilter; -import com.twelvemonkeys.servlet.ServletUtil; +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; + +import com.twelvemonkeys.io.FileUtil; +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.servlet.GenericFilter; +import com.twelvemonkeys.servlet.ServletUtil; /** * A servlet {@code Filter} for processing HTTP file upload requests, as @@ -55,6 +56,7 @@ import java.net.URL; * @author Harald Kuhr * @version $Id: FileUploadFilter.java#1 $ */ +@Deprecated public class FileUploadFilter extends GenericFilter { private File uploadDir; private long maxFileSize = 1024 * 1024; // 1 MByte diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequest.java index 9d8a6545..a893845e 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequest.java @@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest; * @author Harald Kuhr * @version $Id: HttpFileUploadRequest.java#1 $ */ +@Deprecated public interface HttpFileUploadRequest extends HttpServletRequest { /** * Returns the value of a request parameter as an {@code UploadedFile}, diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequestWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequestWrapper.java index dad18653..ac22ab7a 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequestWrapper.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequestWrapper.java @@ -30,18 +30,23 @@ package com.twelvemonkeys.servlet.fileupload; +import java.io.File; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileUpload; import org.apache.commons.fileupload.FileUploadBase; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletRequestContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import java.io.File; -import java.util.*; - /** * An {@code HttpFileUploadRequest} implementation, based on * Jakarta Commons FileUpload. @@ -49,6 +54,7 @@ import java.util.*; * @author Harald Kuhr * @version $Id: HttpFileUploadRequestWrapper.java#1 $ */ +@Deprecated class HttpFileUploadRequestWrapper extends HttpServletRequestWrapper implements HttpFileUploadRequest { private final Map parameters = new HashMap(); diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFile.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFile.java index 356a6ced..4b794916 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFile.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFile.java @@ -40,6 +40,7 @@ import java.io.InputStream; * @author Harald Kuhr * @version $Id: UploadedFile.java#1 $ */ +@Deprecated public interface UploadedFile { /** * Returns the length of file, in bytes. diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFileImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFileImpl.java index ba9d6e1b..a9bd2cab 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFileImpl.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFileImpl.java @@ -30,13 +30,13 @@ package com.twelvemonkeys.servlet.fileupload; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadException; - import java.io.File; import java.io.IOException; import java.io.InputStream; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileUploadException; + /** * An {@code UploadedFile} implementation, based on * Jakarta Commons FileUpload. @@ -44,6 +44,7 @@ import java.io.InputStream; * @author Harald Kuhr * @version $Id: UploadedFileImpl.java#1 $ */ +@Deprecated class UploadedFileImpl implements UploadedFile { private final FileItem item; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPFilter.java index 96a3b8f1..5d135f19 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPFilter.java @@ -30,7 +30,7 @@ package com.twelvemonkeys.servlet.gzip; -import com.twelvemonkeys.servlet.GenericFilter; +import java.io.IOException; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -38,7 +38,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; + +import com.twelvemonkeys.servlet.GenericFilter; /** * A filter to reduce the output size of web resources. @@ -114,6 +115,7 @@ import java.io.IOException; * @author last modified by $Author: haku $ * @version $Id: GZIPFilter.java#1 $ */ +@Deprecated public class GZIPFilter extends GenericFilter { { diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPResponseWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPResponseWrapper.java index bce73bdd..24f320a5 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPResponseWrapper.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPResponseWrapper.java @@ -30,16 +30,17 @@ package com.twelvemonkeys.servlet.gzip; -import com.twelvemonkeys.servlet.OutputStreamAdapter; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.zip.GZIPOutputStream; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; + +import com.twelvemonkeys.servlet.OutputStreamAdapter; + /** * GZIPResponseWrapper class description. *

@@ -53,6 +54,7 @@ import java.util.zip.GZIPOutputStream; * @author last modified by $Author: haku $ * @version $Id: GZIPResponseWrapper.java#1 $ */ +@Deprecated public class GZIPResponseWrapper extends HttpServletResponseWrapper { // TODO: Remove/update ETags if needed? Read the spec (RFC 2616) on Vary/ETag for caching diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/AWTImageFilterAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/AWTImageFilterAdapter.java index f0df539d..2fff38b4 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/AWTImageFilterAdapter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/AWTImageFilterAdapter.java @@ -30,13 +30,14 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.image.ImageUtil; - -import javax.servlet.ServletRequest; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; +import javax.servlet.ServletRequest; + +import com.twelvemonkeys.image.ImageUtil; + /** * AWTImageFilterAdapter * @@ -44,6 +45,7 @@ import java.awt.image.RenderedImage; * @version $Id: AWTImageFilterAdapter.java#1 $ * */ +@Deprecated public class AWTImageFilterAdapter extends ImageFilter { private java.awt.image.ImageFilter imageFilter = null; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/BufferedImageOpAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/BufferedImageOpAdapter.java index 523b72c7..42fe7a93 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/BufferedImageOpAdapter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/BufferedImageOpAdapter.java @@ -30,11 +30,12 @@ package com.twelvemonkeys.servlet.image; -import javax.servlet.ServletRequest; import java.awt.image.BufferedImage; import java.awt.image.BufferedImageOp; import java.awt.image.RenderedImage; +import javax.servlet.ServletRequest; + /** * BufferedImageOpAdapter * @@ -42,6 +43,7 @@ import java.awt.image.RenderedImage; * @version $Id: BufferedImageOpAdapter.java#1 $ * */ +@Deprecated public class BufferedImageOpAdapter extends ImageFilter { private BufferedImageOp filter = null; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ColorServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ColorServlet.java index dd169448..ddf8f793 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ColorServlet.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ColorServlet.java @@ -30,14 +30,15 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.servlet.GenericServlet; +import java.io.IOException; +import java.util.zip.CRC32; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import java.io.IOException; -import java.util.zip.CRC32; + +import com.twelvemonkeys.servlet.GenericServlet; /** * Creates a minimal 1 x 1 pixel PNG image, in a color specified by the @@ -52,6 +53,7 @@ import java.util.zip.CRC32; * @author last modified by $Author: haku $ * @version $Id: ColorServlet.java#2 $ */ +@Deprecated public class ColorServlet extends GenericServlet { private final static String RGB_PARAME = "color"; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ComposeFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ComposeFilter.java index 30ce20aa..df6fe3c5 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ComposeFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ComposeFilter.java @@ -30,17 +30,19 @@ package com.twelvemonkeys.servlet.image; -import javax.servlet.ServletRequest; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.io.IOException; +import javax.servlet.ServletRequest; + /** * ComposeFilter * * @author Harald Kuhr * @version $Id: ComposeFilter.java#1 $ */ +@Deprecated public class ComposeFilter extends ImageFilter { protected RenderedImage doFilter(BufferedImage pImage, ServletRequest pRequest, ImageServletResponse pResponse) throws IOException { // 1. Load different image, locally (using ServletContext.getResource) diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ContentNegotiationFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ContentNegotiationFilter.java index c5cadff4..b5d660d6 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ContentNegotiationFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ContentNegotiationFilter.java @@ -30,16 +30,6 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.image.ImageUtil; -import com.twelvemonkeys.lang.StringUtil; - -import javax.imageio.ImageIO; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.IndexColorModel; @@ -49,6 +39,17 @@ import java.net.HttpURLConnection; import java.util.HashMap; import java.util.Map; +import javax.imageio.ImageIO; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.twelvemonkeys.image.ImageUtil; +import com.twelvemonkeys.lang.StringUtil; + /** * This filter implements server side content negotiation and transcoding for * images. @@ -60,6 +61,7 @@ import java.util.Map; // unneccessary conversion (as IE supports PNG, the latests FireFox supports // JPEG and GIF, etc. even though they both don't explicitly list these formats // in their Accept headers). +@Deprecated public class ContentNegotiationFilter extends ImageFilter { private final static String MIME_TYPE_IMAGE_PREFIX = "image/"; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/CropFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/CropFilter.java index d9936ef7..5eafc8fc 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/CropFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/CropFilter.java @@ -30,13 +30,14 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.servlet.ServletUtil; - -import javax.servlet.ServletRequest; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; +import javax.servlet.ServletRequest; + +import com.twelvemonkeys.servlet.ServletUtil; + /** * This Servlet is able to render a cropped part of an image. * @@ -96,6 +97,7 @@ import java.awt.image.RenderedImage; * @author last modified by $Author: haku $ * @version $Id: CropFilter.java#1 $ */ +@Deprecated public class CropFilter extends ScaleFilter { /** {@code cropX}*/ protected final static String PARAM_CROP_X = "cropX"; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java index 2b16e1c2..9df33056 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java @@ -30,16 +30,21 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.image.ImageUtil; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.servlet.GenericFilter; - -import javax.servlet.*; -import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.io.IOException; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; + +import com.twelvemonkeys.image.ImageUtil; +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.servlet.GenericFilter; + /** * Abstract base class for image filters. Automatically decoding and encoding of * the image is handled in the {@code doFilterImpl} method. @@ -50,6 +55,7 @@ import java.io.IOException; * @version $Id: ImageFilter.java#2 $ * */ +@Deprecated public abstract class ImageFilter extends GenericFilter { // TODO: Take the design back to the drawing board (see ImageServletResponseImpl) // - Allow multiple filters to set size attribute diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletException.java index 2d6c48f6..e952449b 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletException.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletException.java @@ -41,6 +41,7 @@ import javax.servlet.ServletException; * * @version $Id: ImageServletException.java#2 $ */ +@Deprecated public class ImageServletException extends ServletException { public ImageServletException(String pMessage) { diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponse.java index 150de214..2ef7e17f 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponse.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponse.java @@ -30,11 +30,12 @@ package com.twelvemonkeys.servlet.image; -import javax.servlet.ServletResponse; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.io.IOException; +import javax.servlet.ServletResponse; + /** * ImageServletResponse. *

@@ -46,6 +47,7 @@ import java.io.IOException; * @author Harald Kuhr * @version $Id: ImageServletResponse.java#4 $ */ +@Deprecated public interface ImageServletResponse extends ServletResponse { /** * Request attribute of type {@link java.awt.Dimension} controlling image diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java index 3eae9b1f..813058ae 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java @@ -30,24 +30,6 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.image.ImageUtil; -import com.twelvemonkeys.io.FastByteArrayOutputStream; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.servlet.ServletResponseStreamDelegate; -import com.twelvemonkeys.servlet.ServletUtil; -import com.twelvemonkeys.servlet.image.aoi.AreaOfInterest; -import com.twelvemonkeys.servlet.image.aoi.AreaOfInterestFactory; - -import javax.imageio.*; -import javax.imageio.stream.ImageInputStream; -import javax.imageio.stream.ImageOutputStream; -import javax.servlet.ServletContext; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.IndexColorModel; @@ -60,6 +42,31 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.Iterator; +import javax.imageio.IIOException; +import javax.imageio.IIOImage; +import javax.imageio.ImageIO; +import javax.imageio.ImageReadParam; +import javax.imageio.ImageReader; +import javax.imageio.ImageWriteParam; +import javax.imageio.ImageWriter; +import javax.imageio.stream.ImageInputStream; +import javax.imageio.stream.ImageOutputStream; +import javax.servlet.ServletContext; +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; + +import com.twelvemonkeys.image.ImageUtil; +import com.twelvemonkeys.io.FastByteArrayOutputStream; +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.servlet.ServletResponseStreamDelegate; +import com.twelvemonkeys.servlet.ServletUtil; +import com.twelvemonkeys.servlet.image.aoi.AreaOfInterest; +import com.twelvemonkeys.servlet.image.aoi.AreaOfInterestFactory; + /** * This {@link ImageServletResponse} implementation can be used with image * requests, to have the image immediately decoded to a {@code BufferedImage}. @@ -75,6 +82,7 @@ import java.util.Iterator; // TODO: This implementation has a problem if two filters does scaling, as the second will overwrite the SIZE attribute // TODO: Allow different scaling algorithm based on input image (use case: IndexColorModel does not scale well using default, smooth may be slow for large images) // TODO: Support pluggable pre- and post-processing steps +@Deprecated class ImageServletResponseImpl extends HttpServletResponseWrapper implements ImageServletResponse { private ServletRequest originalRequest; private final ServletContext context; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/NullImageFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/NullImageFilter.java index 20a65ef9..6a2cc0ef 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/NullImageFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/NullImageFilter.java @@ -30,10 +30,11 @@ package com.twelvemonkeys.servlet.image; -import javax.servlet.ServletRequest; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; +import javax.servlet.ServletRequest; + /** * An {@code ImageFilter} that does nothing. Useful for debugging purposes. * @@ -41,6 +42,7 @@ import java.awt.image.RenderedImage; * @version $Id: NullImageFilter.java $ * */ +@Deprecated public final class NullImageFilter extends ImageFilter { protected RenderedImage doFilter(BufferedImage pImage, ServletRequest pRequest, ImageServletResponse pResponse) { return pImage; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/RotateFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/RotateFilter.java index b3b1f245..51974464 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/RotateFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/RotateFilter.java @@ -30,17 +30,18 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.image.ImageUtil; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.servlet.ServletUtil; - -import javax.servlet.ServletRequest; import java.awt.*; import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; +import javax.servlet.ServletRequest; + +import com.twelvemonkeys.image.ImageUtil; +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.servlet.ServletUtil; + /** * This Servlet is able to render a cropped part of an image. * @@ -81,6 +82,7 @@ import java.awt.image.RenderedImage; */ // TODO: Correct rounding errors, resulting in black borders when rotating 90 // degrees, and one of width or height is odd length... +@Deprecated public class RotateFilter extends ImageFilter { /** {@code angle}*/ protected final static String PARAM_ANGLE = "angle"; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ScaleFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ScaleFilter.java index bf780e64..6434d7a0 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ScaleFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ScaleFilter.java @@ -30,16 +30,17 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.image.ImageUtil; -import com.twelvemonkeys.lang.StringUtil; -import com.twelvemonkeys.servlet.ServletUtil; - -import javax.servlet.ServletRequest; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.lang.reflect.Field; +import javax.servlet.ServletRequest; + +import com.twelvemonkeys.image.ImageUtil; +import com.twelvemonkeys.lang.StringUtil; +import com.twelvemonkeys.servlet.ServletUtil; + /** * This filter renders a scaled version of an image read from a @@ -83,6 +84,7 @@ import java.lang.reflect.Field; * @version $Id: ScaleFilter.java#1 $ * */ +@Deprecated public class ScaleFilter extends ImageFilter { /** diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/SourceRenderFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/SourceRenderFilter.java index 9a7aa74d..727458ba 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/SourceRenderFilter.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/SourceRenderFilter.java @@ -30,16 +30,17 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.servlet.ServletUtil; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.awt.image.RenderedImage; +import java.io.IOException; import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.awt.image.RenderedImage; -import java.io.IOException; + +import com.twelvemonkeys.servlet.ServletUtil; /** * A {@link javax.servlet.Filter} that extracts request parameters, and sets the @@ -53,6 +54,7 @@ import java.io.IOException; * @author Harald Kuhr * @version $Id: SourceRenderFilter.java#1 $ */ +@Deprecated public class SourceRenderFilter extends ImageFilter { private String sizeWidthParam = "size.w"; private String sizeHeightParam = "size.h"; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java index 42bfc8f2..f46d37c7 100644 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java @@ -36,6 +36,7 @@ import java.awt.*; * @author Erlend Hamnaberg * @version $Revision: $ */ +@Deprecated public interface AreaOfInterest { Rectangle getAOI(Rectangle pCrop); diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java index ded138af..fc2c500a 100644 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java @@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicReference; * @author Erlend Hamnaberg * @version $Revision: $ */ +@Deprecated public class AreaOfInterestFactory { private final static AtomicReference DEFAULT = new AtomicReference(new AreaOfInterestFactory()); diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java index 817f575b..9f7b0672 100644 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java @@ -30,14 +30,15 @@ package com.twelvemonkeys.servlet.image.aoi; -import com.twelvemonkeys.lang.Validate; - import java.awt.*; +import com.twelvemonkeys.lang.Validate; + /** * @author Erlend Hamnaberg * @version $Revision: $ */ +@Deprecated public class AreaOfInterestWrapper implements AreaOfInterest { private AreaOfInterest mDelegate; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java index 1f667e21..5cd86a00 100644 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java @@ -37,6 +37,7 @@ import java.awt.*; * @author Erlend Hamnaberg * @version $Revision: $ */ +@Deprecated public class DefaultAreaOfInterest implements AreaOfInterest { private final int mOriginalWidth; private final int mOriginalHeight; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java index 15a13742..1605d2df 100644 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java @@ -36,6 +36,7 @@ import java.awt.*; * @author Erlend Hamnaberg * @version $Revision: $ */ +@Deprecated public class PercentAreaOfInterest extends DefaultAreaOfInterest { public PercentAreaOfInterest(Dimension pOriginalDimension) { diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java index 4cf4deed..aa04e779 100644 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java +++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java @@ -36,6 +36,7 @@ import java.awt.*; * @author Erlend Hamnaberg * @version $Revision: $ */ +@Deprecated public class UniformAreaOfInterest extends DefaultAreaOfInterest { public UniformAreaOfInterest(Dimension pOriginalDimension) {