Skip to content

Commit 9e065ba

Browse files
committed
HTTPCLIENT-1743: remove dependency on CC-BY licensed source
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpcore/branches/4.4.x@1747290 13f79535-47bb-0310-9956-ffa450edef68
1 parent 466658f commit 9e065ba

File tree

212 files changed

+341
-687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+341
-687
lines changed

LICENSE.txt

-63
Original file line numberDiff line numberDiff line change
@@ -176,66 +176,3 @@
176176

177177
END OF TERMS AND CONDITIONS
178178

179-
=========================================================================
180-
181-
This project contains annotations in the package org.apache.http.annotation
182-
which are derived from JCIP-ANNOTATIONS
183-
Copyright (c) 2005 Brian Goetz and Tim Peierls.
184-
See http://www.jcip.net and the Creative Commons Attribution License
185-
(http://creativecommons.org/licenses/by/2.5)
186-
Full text: http://creativecommons.org/licenses/by/2.5/legalcode
187-
188-
License
189-
190-
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
191-
192-
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
193-
194-
1. Definitions
195-
196-
"Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
197-
"Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
198-
"Licensor" means the individual or entity that offers the Work under the terms of this License.
199-
"Original Author" means the individual or entity who created the Work.
200-
"Work" means the copyrightable work of authorship offered under the terms of this License.
201-
"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
202-
203-
2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
204-
205-
3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
206-
207-
to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
208-
to create and reproduce Derivative Works;
209-
to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
210-
to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
211-
212-
For the avoidance of doubt, where the work is a musical composition:
213-
Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
214-
Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
215-
Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
216-
217-
The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
218-
219-
4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
220-
221-
You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(b), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(b), as requested.
222-
If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
223-
224-
5. Representations, Warranties and Disclaimer
225-
226-
UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
227-
228-
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
229-
230-
7. Termination
231-
232-
This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
233-
Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
234-
235-
8. Miscellaneous
236-
237-
Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
238-
Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
239-
If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
240-
No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
241-
This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.

NOTICE.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ Apache HttpComponents Core
22
Copyright 2005-2015 The Apache Software Foundation
33

44
This product includes software developed at
5-
The Apache Software Foundation (http://www.apache.org/).
6-
7-
This project contains annotations derived from JCIP-ANNOTATIONS
8-
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
5+
The Apache Software Foundation (http://www.apache.org/).

httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.io.IOException;
3131

3232
import org.apache.http.HttpResponseFactory;
33-
import org.apache.http.annotation.Immutable;
3433
import org.apache.http.impl.DefaultHttpResponseFactory;
3534
import org.apache.http.impl.nio.reactor.AbstractIODispatch;
3635
import org.apache.http.nio.NHttpClientHandler;
@@ -51,7 +50,6 @@
5150
* @deprecated (4.2) use {@link DefaultHttpClientIODispatch}
5251
*/
5352
@Deprecated
54-
@Immutable // provided injected dependencies are immutable
5553
public class DefaultClientIOEventDispatch extends AbstractIODispatch<NHttpClientIOTarget> {
5654

5755
protected final NHttpClientHandler handler;

httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
import java.io.IOException;
3131

3232
import org.apache.http.HttpRequestFactory;
33-
import org.apache.http.annotation.Immutable;
33+
import org.apache.http.annotation.ThreadingBehavior;
34+
import org.apache.http.annotation.Contract;
3435
import org.apache.http.impl.DefaultHttpRequestFactory;
3536
import org.apache.http.impl.nio.reactor.AbstractIODispatch;
3637
import org.apache.http.nio.NHttpServerIOTarget;
@@ -51,7 +52,7 @@
5152
* @deprecated (4.2) use {@link DefaultHttpServerIODispatch}
5253
*/
5354
@Deprecated
54-
@Immutable // provided injected dependencies are immutable
55+
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
5556
public class DefaultServerIOEventDispatch extends AbstractIODispatch<NHttpServerIOTarget> {
5657

5758
protected final ByteBufferAllocator allocator;

httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import javax.net.ssl.SSLContext;
3131
import javax.net.ssl.SSLException;
3232

33-
import org.apache.http.annotation.Immutable;
3433
import org.apache.http.impl.nio.DefaultClientIOEventDispatch;
3534
import org.apache.http.impl.nio.reactor.SSLIOSession;
3635
import org.apache.http.impl.nio.reactor.SSLSetupHandler;
@@ -50,7 +49,6 @@
5049
* @deprecated (4.2) use {@link org.apache.http.impl.nio.DefaultHttpClientIODispatch}
5150
*/
5251
@Deprecated
53-
@Immutable // provided injected dependencies are immutable
5452
public class SSLClientIOEventDispatch extends DefaultClientIOEventDispatch {
5553

5654
private final SSLContext sslcontext;

httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import javax.net.ssl.SSLContext;
3131
import javax.net.ssl.SSLException;
3232

33-
import org.apache.http.annotation.Immutable;
3433
import org.apache.http.impl.nio.DefaultServerIOEventDispatch;
3534
import org.apache.http.impl.nio.reactor.SSLIOSession;
3635
import org.apache.http.impl.nio.reactor.SSLSetupHandler;
@@ -50,7 +49,6 @@
5049
* @deprecated (4.2) use {@link org.apache.http.impl.nio.DefaultHttpServerIODispatch}
5150
*/
5251
@Deprecated
53-
@Immutable // provided injected dependencies are immutable
5452
public class SSLServerIOEventDispatch extends DefaultServerIOEventDispatch {
5553

5654
private final SSLContext sslcontext;

httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/BufferingNHttpEntity.java

-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.io.OutputStream;
3333

3434
import org.apache.http.HttpEntity;
35-
import org.apache.http.annotation.NotThreadSafe;
3635
import org.apache.http.entity.HttpEntityWrapper;
3736
import org.apache.http.nio.ContentDecoder;
3837
import org.apache.http.nio.IOControl;
@@ -53,7 +52,6 @@
5352
* {@link org.apache.http.nio.protocol.BasicAsyncRequestProducer}
5453
* or {@link org.apache.http.nio.protocol.BasicAsyncResponseProducer}
5554
*/
56-
@NotThreadSafe
5755
@Deprecated
5856
public class BufferingNHttpEntity extends HttpEntityWrapper implements
5957
ConsumingNHttpEntity {

httpcore-nio/src/main/java-deprecated/org/apache/http/nio/entity/NHttpEntityWrapper.java

-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.nio.channels.ReadableByteChannel;
3636

3737
import org.apache.http.HttpEntity;
38-
import org.apache.http.annotation.NotThreadSafe;
3938
import org.apache.http.entity.HttpEntityWrapper;
4039
import org.apache.http.nio.ContentEncoder;
4140
import org.apache.http.nio.IOControl;
@@ -48,7 +47,6 @@
4847
*
4948
* @deprecated (4.2) use {@link EntityAsyncContentProducer}
5049
*/
51-
@NotThreadSafe
5250
@Deprecated
5351
public class NHttpEntityWrapper
5452
extends HttpEntityWrapper implements ProducingNHttpEntity {

httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
import org.apache.http.HttpRequest;
3737
import org.apache.http.HttpResponse;
3838
import org.apache.http.HttpStatus;
39-
import org.apache.http.annotation.Immutable;
39+
import org.apache.http.annotation.ThreadingBehavior;
40+
import org.apache.http.annotation.Contract;
4041
import org.apache.http.nio.ContentDecoder;
4142
import org.apache.http.nio.ContentEncoder;
4243
import org.apache.http.nio.NHttpClientConnection;
@@ -91,7 +92,7 @@
9192
* @deprecated (4.2) use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
9293
*/
9394
@Deprecated
94-
@Immutable // provided injected dependencies are immutable
95+
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
9596
public class AsyncNHttpClientHandler extends NHttpHandlerBase
9697
implements NHttpClientHandler {
9798

httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
import org.apache.http.ProtocolException;
4343
import org.apache.http.ProtocolVersion;
4444
import org.apache.http.UnsupportedHttpVersionException;
45-
import org.apache.http.annotation.Immutable;
45+
import org.apache.http.annotation.ThreadingBehavior;
46+
import org.apache.http.annotation.Contract;
4647
import org.apache.http.nio.ContentDecoder;
4748
import org.apache.http.nio.ContentEncoder;
4849
import org.apache.http.nio.IOControl;
@@ -100,7 +101,7 @@
100101
* @deprecated (4.2) use {@link HttpAsyncService}
101102
*/
102103
@Deprecated
103-
@Immutable // provided injected dependencies are immutable
104+
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
104105
public class AsyncNHttpServiceHandler extends NHttpHandlerBase
105106
implements NHttpServiceHandler {
106107

httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpClientHandler.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
import org.apache.http.HttpException;
3434
import org.apache.http.HttpRequest;
3535
import org.apache.http.HttpResponse;
36-
import org.apache.http.annotation.Immutable;
36+
import org.apache.http.annotation.ThreadingBehavior;
37+
import org.apache.http.annotation.Contract;
3738
import org.apache.http.nio.ContentDecoder;
3839
import org.apache.http.nio.ContentEncoder;
3940
import org.apache.http.nio.NHttpClientConnection;
@@ -67,7 +68,7 @@
6768
* @deprecated (4.2) use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
6869
*/
6970
@Deprecated
70-
@Immutable // provided injected dependencies are immutable
71+
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
7172
public class BufferingHttpClientHandler implements NHttpClientHandler {
7273

7374
private final AsyncNHttpClientHandler asyncHandler;

httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
import org.apache.http.HttpRequest;
3636
import org.apache.http.HttpResponse;
3737
import org.apache.http.HttpResponseFactory;
38-
import org.apache.http.annotation.Immutable;
38+
import org.apache.http.annotation.ThreadingBehavior;
39+
import org.apache.http.annotation.Contract;
3940
import org.apache.http.nio.ContentDecoder;
4041
import org.apache.http.nio.ContentEncoder;
4142
import org.apache.http.nio.NHttpServerConnection;
@@ -72,7 +73,7 @@
7273
* @deprecated (4.2) use {@link HttpAsyncService}
7374
*/
7475
@Deprecated
75-
@Immutable // provided injected dependencies are immutable
76+
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
7677
public class BufferingHttpServiceHandler implements NHttpServiceHandler {
7778

7879
private final AsyncNHttpServiceHandler asyncHandler;

httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929

3030
import java.util.Map;
3131

32-
import org.apache.http.annotation.ThreadSafe;
32+
import org.apache.http.annotation.ThreadingBehavior;
33+
import org.apache.http.annotation.Contract;
3334
import org.apache.http.protocol.UriPatternMatcher;
3435

3536
/**
@@ -49,7 +50,7 @@
4950
* @since 4.2
5051
* @deprecated (4.3) use {@link UriHttpAsyncRequestHandlerMapper}
5152
*/
52-
@ThreadSafe
53+
@Contract(threading = ThreadingBehavior.SAFE)
5354
@Deprecated
5455
public class HttpAsyncRequestHandlerRegistry implements HttpAsyncRequestHandlerResolver {
5556

httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpHandlerBase.java

-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.apache.http.HttpRequest;
3434
import org.apache.http.HttpResponse;
3535
import org.apache.http.HttpStatus;
36-
import org.apache.http.annotation.Immutable;
3736
import org.apache.http.nio.NHttpConnection;
3837
import org.apache.http.nio.util.ByteBufferAllocator;
3938
import org.apache.http.params.HttpParams;
@@ -46,7 +45,6 @@
4645
* @deprecated (4.2) do not use
4746
*/
4847
@Deprecated
49-
@Immutable // provided injected dependencies are immutable
5048
public abstract class NHttpHandlerBase {
5149

5250
protected static final String CONN_STATE = "http.nio.conn-state";

0 commit comments

Comments
 (0)