HTTPCLIENT-866: removed dependency on jcip-annotations; replaced jcip annotations with custom ones based on jcip but with SOURCE retention policy; added attribution clauses to NOTICE.txt and LICENSE.txt
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@807756 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski
parent
87dad42869
commit
33de23c102
|
|
@ -173,4 +173,10 @@
|
|||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
This project contains annotations derived from JCIP-ANNOTATIONS
|
||||
Copyright (c) 2005 Brian Goetz and Tim Peierls.
|
||||
See http://www.jcip.net and the Creative Commons Attribution License
|
||||
(http://creativecommons.org/licenses/by/2.5)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,3 +3,6 @@ Copyright 1999-2009 The Apache Software Foundation
|
|||
|
||||
This product includes software developed by
|
||||
The Apache Software Foundation (http://www.apache.org/).
|
||||
|
||||
This project contains annotations derived from JCIP-ANNOTATIONS
|
||||
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
|
||||
|
|
@ -70,17 +70,6 @@
|
|||
<version>${junit.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.jcip</groupId>
|
||||
<artifactId>jcip-annotations</artifactId>
|
||||
<version>1.0</version>
|
||||
<!--
|
||||
Annotations are only _required_ during a build
|
||||
They are not needed at run-time
|
||||
Provided means that the dependency is not transitive.
|
||||
-->
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
* ====================================================================
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
package org.apache.http.annotation;
|
||||
|
||||
import java.lang.annotation.Documented;
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* This annotation can be applied to a field or a method to indicate that its
|
||||
* thread-safety is guaranteed by a synchronization particular lock.
|
||||
* <p>
|
||||
* Based on code developed by Brian Goetz and Tim Peierls and concepts
|
||||
* published in 'Java Concurrency in Practice' by Brian Goetz, Tim Peierls,
|
||||
* Joshua Bloch, Joseph Bowbeer, David Holmes and Doug Lea.
|
||||
*/
|
||||
@Documented
|
||||
@Target({ElementType.FIELD, ElementType.METHOD})
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface GuardedBy {
|
||||
String value();
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
* ====================================================================
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
package org.apache.http.annotation;
|
||||
|
||||
import java.lang.annotation.Documented;
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* This annotation can be applied to a class to indicate that its
|
||||
* internal state cannot mutate and therefore it is thread-safe.
|
||||
* <p>
|
||||
* Based on code developed by Brian Goetz and Tim Peierls and concepts
|
||||
* published in 'Java Concurrency in Practice' by Brian Goetz, Tim Peierls,
|
||||
* Joshua Bloch, Joseph Bowbeer, David Holmes and Doug Lea.
|
||||
*/
|
||||
@Documented
|
||||
@Target(ElementType.TYPE)
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface Immutable {
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
* ====================================================================
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
package org.apache.http.annotation;
|
||||
|
||||
import java.lang.annotation.Documented;
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* This annotation can be applied to a class to indicate that it is not
|
||||
* thread-safe and therefore should not be accessed concurrently.
|
||||
* <p>
|
||||
* Based on code developed by Brian Goetz and Tim Peierls and concepts
|
||||
* published in 'Java Concurrency in Practice' by Brian Goetz, Tim Peierls,
|
||||
* Joshua Bloch, Joseph Bowbeer, David Holmes and Doug Lea.
|
||||
*/
|
||||
@Documented
|
||||
@Target(ElementType.TYPE)
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface NotThreadSafe {
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
* ====================================================================
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
package org.apache.http.annotation;
|
||||
|
||||
import java.lang.annotation.Documented;
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* This annotation can be applied to a class to indicate that it is
|
||||
* thread-safe and therefore can be accessed concurrently by multiple
|
||||
* threads.
|
||||
* <p>
|
||||
* Based on code developed by Brian Goetz and Tim Peierls and concepts
|
||||
* published in 'Java Concurrency in Practice' by Brian Goetz, Tim Peierls,
|
||||
* Joshua Bloch, Joseph Bowbeer, David Holmes and Doug Lea.
|
||||
*/
|
||||
@Documented
|
||||
@Target(ElementType.TYPE)
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface ThreadSafe {
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.auth;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Constants and static helpers related to the HTTP authentication.
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import net.jcip.annotations.GuardedBy;
|
||||
import net.jcip.annotations.ThreadSafe;
|
||||
import org.apache.http.annotation.GuardedBy;
|
||||
import org.apache.http.annotation.ThreadSafe;
|
||||
|
||||
import org.apache.http.params.HttpParams;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ package org.apache.http.auth;
|
|||
|
||||
import java.util.Locale;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.util.LangUtils;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.auth;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.auth;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.ProtocolException;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ package org.apache.http.auth;
|
|||
|
||||
import java.security.Principal;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.util.LangUtils;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.auth;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Authentication credentials required to respond to a authentication
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.auth;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.ProtocolException;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.auth;
|
|||
import java.security.Principal;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.util.LangUtils;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.auth;
|
|||
import java.security.Principal;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.util.LangUtils;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ package org.apache.http.auth;
|
|||
|
||||
import java.security.Principal;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.util.LangUtils;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.auth.params;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.params.HttpParams;
|
||||
import org.apache.http.protocol.HTTP;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.client;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Signals a circular redirect
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ package org.apache.http.client;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Signals an error in the HTTP protocol.
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.client;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Signals a non 2xx HTTP response.
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.client;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.ProtocolException;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.client;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.ProtocolException;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.entity;
|
|||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.List;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.NameValuePair;
|
||||
import org.apache.http.client.utils.URLEncodedUtils;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.methods;
|
|||
|
||||
import java.net.URI;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
/**
|
||||
* HTTP DELETE method
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.client.methods;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpEntity;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.methods;
|
|||
|
||||
import java.net.URI;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
/**
|
||||
* HTTP GET method.
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.methods;
|
|||
|
||||
import java.net.URI;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
/**
|
||||
* HTTP HEAD method.
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import java.net.URI;
|
|||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HeaderElement;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.methods;
|
|||
|
||||
import java.net.URI;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
/**
|
||||
* HTTP POST method.
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.methods;
|
|||
|
||||
import java.net.URI;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
/**
|
||||
* HTTP PUT method.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ import java.net.URI;
|
|||
import java.util.concurrent.locks.Lock;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.ProtocolVersion;
|
||||
import org.apache.http.RequestLine;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.methods;
|
|||
|
||||
import java.net.URI;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
/**
|
||||
* HTTP TRACE method.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.client.params;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Standard authentication schemes supported by HttpClient.
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.params;
|
|||
|
||||
import java.util.Collection;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpHost;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.client.params;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Standard cookie specifications supported by HttpClient.
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.client.params;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.params.HttpParams;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.protocol;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.auth.AuthSchemeRegistry;
|
||||
import org.apache.http.client.CookieStore;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ import java.util.ArrayList;
|
|||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.protocol;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.HttpException;
|
||||
import org.apache.http.HttpRequest;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ package org.apache.http.client.protocol;
|
|||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpException;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.protocol;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.client.protocol;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ package org.apache.http.client.protocol;
|
|||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ package org.apache.http.client.utils;
|
|||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* A collection of utilities to workaround limitations of Java clone framework.
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ package org.apache.http.client.utils;
|
|||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Uses the java.net.IDN class through reflection.
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
package org.apache.http.client.utils;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Facade that provides conversion between Unicode and Punycode domain names.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ package org.apache.http.client.utils;
|
|||
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Implementation from pseudo code in RFC 3492.
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import java.net.URI;
|
|||
import java.net.URISyntaxException;
|
||||
import java.util.Stack;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ import java.util.Collections;
|
|||
import java.util.List;
|
||||
import java.util.Scanner;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpEntity;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ package org.apache.http.conn;
|
|||
import java.io.InputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
/**
|
||||
* Basic implementation of {@link EofSensorWatcher}. The underlying connection
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import java.io.IOException;
|
|||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.HttpEntity;
|
||||
import org.apache.http.entity.HttpEntityWrapper;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn;
|
|||
|
||||
import java.io.InterruptedIOException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* A timeout while connecting to an HTTP server or waiting for an
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.conn;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* A timeout while waiting for an available connection
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn;
|
|||
import java.io.InputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
/**
|
||||
* A stream wrapper that triggers actions on {@link #close close()} and EOF.
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ package org.apache.http.conn;
|
|||
|
||||
import java.net.ConnectException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ import java.util.Collections;
|
|||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.conn.scheme.SocketFactory;
|
||||
import org.apache.http.params.HttpConnectionParams;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.conn.params;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.params.HttpAbstractParamBean;
|
||||
import org.apache.http.params.HttpParams;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.conn.params;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.params.HttpAbstractParamBean;
|
||||
import org.apache.http.params.HttpParams;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.conn.params;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.conn.routing.HttpRoute;
|
||||
import org.apache.http.params.HttpParams;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn.params;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.conn.routing.HttpRoute;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn.params;
|
|||
|
||||
import java.net.InetAddress;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
import org.apache.http.conn.routing.HttpRoute;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ package org.apache.http.conn.params;
|
|||
|
||||
import java.net.InetAddress;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
import org.apache.http.params.HttpParams;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.conn.routing;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Basic implementation of an {@link HttpRouteDirector HttpRouteDirector}.
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn.routing;
|
|||
|
||||
import java.net.InetAddress;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn.routing;
|
|||
|
||||
import java.net.InetAddress;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import java.net.InetSocketAddress;
|
|||
import java.net.Socket;
|
||||
import java.net.SocketTimeoutException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.conn.ConnectTimeoutException;
|
||||
import org.apache.http.params.HttpConnectionParams;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ package org.apache.http.conn.scheme;
|
|||
|
||||
import java.util.Locale;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.util.LangUtils;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ import java.util.LinkedHashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.jcip.annotations.GuardedBy;
|
||||
import net.jcip.annotations.ThreadSafe;
|
||||
import org.apache.http.annotation.GuardedBy;
|
||||
import org.apache.http.annotation.ThreadSafe;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.conn.ssl;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.conn.util.InetAddressUtils;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.conn.ssl;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* The ALLOW_ALL HostnameVerifier essentially turns hostname verification
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn.ssl;
|
|||
|
||||
import javax.net.ssl.SSLException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* The HostnameVerifier that works the same way as Curl and Firefox.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.conn.ssl;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.conn.ConnectTimeoutException;
|
||||
import org.apache.http.conn.scheme.HostNameResolver;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn.ssl;
|
|||
|
||||
import javax.net.ssl.SSLException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* The Strict HostnameVerifier works the same way as Sun Java 1.4, Sun
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.conn.util;
|
|||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* A collection of utilities relating to InetAddresses.
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ package org.apache.http.cookie;
|
|||
import java.io.Serializable;
|
||||
import java.util.Comparator;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* This cookie comparator can be used to compare identity of cookies.
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ package org.apache.http.cookie;
|
|||
|
||||
import java.util.Locale;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* CookieOrigin class encapsulates details of an origin server that
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ package org.apache.http.cookie;
|
|||
import java.io.Serializable;
|
||||
import java.util.Comparator;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* This cookie comparator ensures that multiple cookies satisfying
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import net.jcip.annotations.GuardedBy;
|
||||
import net.jcip.annotations.ThreadSafe;
|
||||
import org.apache.http.annotation.GuardedBy;
|
||||
import org.apache.http.annotation.ThreadSafe;
|
||||
|
||||
import org.apache.http.params.HttpParams;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.cookie;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.ProtocolException;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.cookie.params;
|
|||
|
||||
import java.util.Collection;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.params.HttpAbstractParamBean;
|
||||
import org.apache.http.params.HttpParams;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.impl.auth;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.FormattedHeader;
|
||||
import org.apache.http.Header;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.impl.auth;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.commons.codec.binary.Base64;
|
||||
import org.apache.http.Header;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.impl.auth;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.auth.AuthScheme;
|
||||
import org.apache.http.auth.AuthSchemeFactory;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpRequest;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.impl.auth;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.auth.AuthScheme;
|
||||
import org.apache.http.auth.AuthSchemeFactory;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.impl.auth;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.auth.AuthenticationException;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.impl.auth;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpRequest;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import java.util.HashMap;
|
|||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.http.HeaderElement;
|
||||
import org.apache.http.auth.MalformedChallengeException;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
package org.apache.http.impl.auth;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
/**
|
||||
* Authentication credentials required to respond to a authentication
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ import java.io.IOException;
|
|||
import java.net.URI;
|
||||
import java.lang.reflect.UndeclaredThrowableException;
|
||||
|
||||
import net.jcip.annotations.ThreadSafe;
|
||||
import net.jcip.annotations.GuardedBy;
|
||||
import org.apache.http.annotation.ThreadSafe;
|
||||
import org.apache.http.annotation.GuardedBy;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ import java.util.Date;
|
|||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import net.jcip.annotations.GuardedBy;
|
||||
import net.jcip.annotations.ThreadSafe;
|
||||
import org.apache.http.annotation.GuardedBy;
|
||||
import org.apache.http.annotation.ThreadSafe;
|
||||
|
||||
import org.apache.http.client.CookieStore;
|
||||
import org.apache.http.cookie.Cookie;
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ package org.apache.http.impl.client;
|
|||
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.jcip.annotations.GuardedBy;
|
||||
import net.jcip.annotations.ThreadSafe;
|
||||
import org.apache.http.annotation.GuardedBy;
|
||||
import org.apache.http.annotation.ThreadSafe;
|
||||
|
||||
import org.apache.http.auth.AuthScope;
|
||||
import org.apache.http.auth.Credentials;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ package org.apache.http.impl.client;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.HttpEntity;
|
||||
import org.apache.http.HttpResponse;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.impl.client;
|
||||
|
||||
import net.jcip.annotations.NotThreadSafe;
|
||||
import org.apache.http.annotation.NotThreadSafe;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
*/
|
||||
package org.apache.http.impl.client;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.HeaderElement;
|
||||
import org.apache.http.HeaderElementIterator;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
package org.apache.http.impl.client;
|
||||
|
||||
import net.jcip.annotations.ThreadSafe;
|
||||
import org.apache.http.annotation.ThreadSafe;
|
||||
|
||||
import org.apache.http.ConnectionReuseStrategy;
|
||||
import org.apache.http.HttpVersion;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ import java.net.UnknownHostException;
|
|||
|
||||
import javax.net.ssl.SSLHandshakeException;
|
||||
|
||||
import net.jcip.annotations.Immutable;
|
||||
import org.apache.http.annotation.Immutable;
|
||||
|
||||
import org.apache.http.HttpEntityEnclosingRequest;
|
||||
import org.apache.http.HttpRequest;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue