You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2015/03/20 18:10:43 UTC

svn commit: r1668099 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie: NetscapeDraftSpec.java NetscapeDraftSpecProvider.java RFC2109Spec.java RFC2109SpecProvider.java RFC2965Spec.java RFC2965SpecProvider.java

Author: olegk
Date: Fri Mar 20 17:10:42 2015
New Revision: 1668099

URL: http://svn.apache.org/r1668099
Log:
Marked RFC 2109, RFC 2965, Netscape draft cookie specs as obsolete

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecProvider.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecProvider.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java?rev=1668099&r1=1668098&r2=1668099&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java Fri Mar 20 17:10:42 2015
@@ -33,6 +33,7 @@ import java.util.List;
 import org.apache.http.FormattedHeader;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
+import org.apache.http.annotation.Obsolete;
 import org.apache.http.annotation.ThreadSafe;
 import org.apache.http.cookie.CommonCookieAttributeHandler;
 import org.apache.http.cookie.Cookie;
@@ -49,9 +50,13 @@ import org.apache.http.util.CharArrayBuf
  * the original draft specification published by Netscape Communications.
  * It should be avoided unless absolutely necessary for compatibility with
  * legacy applications.
+ * <p>
+ * Rendered obsolete by {@link org.apache.http.impl.cookie.RFC6265LaxSpec}.
  *
  * @since 4.0
+ * @see org.apache.http.impl.cookie.RFC6265LaxSpec
  */
+@Obsolete
 @ThreadSafe
 public class NetscapeDraftSpec extends CookieSpecBase {
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.java?rev=1668099&r1=1668098&r2=1668099&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.java Fri Mar 20 17:10:42 2015
@@ -28,6 +28,7 @@
 package org.apache.http.impl.cookie;
 
 import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Obsolete;
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.CookieSpecProvider;
 import org.apache.http.protocol.HttpContext;
@@ -36,9 +37,13 @@ import org.apache.http.protocol.HttpCont
  * {@link org.apache.http.cookie.CookieSpecProvider} implementation that provides an instance of
  * {@link NetscapeDraftSpec}. The instance returned by this factory
  * can be shared by multiple threads.
+ * <p>
+ * Rendered obsolete by {@link org.apache.http.impl.cookie.RFC6265CookieSpecProvider}
  *
  * @since 4.4
+ * @see org.apache.http.impl.cookie.RFC6265CookieSpecProvider
  */
+@Obsolete
 @Immutable
 public class NetscapeDraftSpecProvider implements CookieSpecProvider {
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java?rev=1668099&r1=1668098&r2=1668099&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java Fri Mar 20 17:10:42 2015
@@ -33,6 +33,7 @@ import java.util.List;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
+import org.apache.http.annotation.Obsolete;
 import org.apache.http.annotation.ThreadSafe;
 import org.apache.http.client.utils.DateUtils;
 import org.apache.http.cookie.ClientCookie;
@@ -49,13 +50,13 @@ import org.apache.http.util.CharArrayBuf
 
 /**
  * RFC 2109 compliant {@link org.apache.http.cookie.CookieSpec} implementation.
- * This is an older version of the official HTTP state management specification
- * superseded by RFC 2965.
- *
- * @see RFC2965Spec
+ * <p>
+ * Rendered obsolete by {@link org.apache.http.impl.cookie.RFC6265StrictSpec}.
  *
  * @since 4.0
+ * @see org.apache.http.impl.cookie.RFC6265StrictSpec
  */
+@Obsolete
 @ThreadSafe
 public class RFC2109Spec extends CookieSpecBase {
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecProvider.java?rev=1668099&r1=1668098&r2=1668099&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecProvider.java Fri Mar 20 17:10:42 2015
@@ -28,6 +28,7 @@
 package org.apache.http.impl.cookie;
 
 import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Obsolete;
 import org.apache.http.conn.util.PublicSuffixMatcher;
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.CookieSpecProvider;
@@ -37,9 +38,13 @@ import org.apache.http.protocol.HttpCont
  * {@link org.apache.http.cookie.CookieSpecProvider} implementation that provides an instance of
  * {@link RFC2109Spec}. The instance returned by this factory
  * can be shared by multiple threads.
+ * <p>
+ * Rendered obsolete by {@link org.apache.http.impl.cookie.RFC6265CookieSpecProvider}
  *
  * @since 4.4
+ * @see org.apache.http.impl.cookie.RFC6265CookieSpecProvider
  */
+@Obsolete
 @Immutable
 public class RFC2109SpecProvider implements CookieSpecProvider {
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java?rev=1668099&r1=1668098&r2=1668099&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java Fri Mar 20 17:10:42 2015
@@ -35,6 +35,7 @@ import java.util.Map;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.NameValuePair;
+import org.apache.http.annotation.Obsolete;
 import org.apache.http.annotation.ThreadSafe;
 import org.apache.http.cookie.ClientCookie;
 import org.apache.http.cookie.CommonCookieAttributeHandler;
@@ -49,9 +50,13 @@ import org.apache.http.util.CharArrayBuf
 
 /**
  * RFC 2965 compliant {@link org.apache.http.cookie.CookieSpec} implementation.
+ * <p>
+ * Rendered obsolete by {@link org.apache.http.impl.cookie.RFC6265StrictSpec}.
  *
  * @since 4.0
+ * @see org.apache.http.impl.cookie.RFC6265StrictSpec
  */
+@Obsolete
 @ThreadSafe
 public class RFC2965Spec extends RFC2109Spec {
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecProvider.java?rev=1668099&r1=1668098&r2=1668099&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecProvider.java Fri Mar 20 17:10:42 2015
@@ -28,6 +28,7 @@
 package org.apache.http.impl.cookie;
 
 import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Obsolete;
 import org.apache.http.conn.util.PublicSuffixMatcher;
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.CookieSpecProvider;
@@ -37,9 +38,13 @@ import org.apache.http.protocol.HttpCont
  * {@link org.apache.http.cookie.CookieSpecProvider} implementation that provides an instance of
  * {@link RFC2965Spec}. The instance returned by this factory can
  * be shared by multiple threads.
+ * <p>
+ * Rendered obsolete by {@link org.apache.http.impl.cookie.RFC6265CookieSpecProvider}
  *
  * @since 4.4
+ * @see org.apache.http.impl.cookie.RFC6265CookieSpecProvider
  */
+@Obsolete
 @Immutable
 public class RFC2965SpecProvider implements CookieSpecProvider {