svn commit: r1715835 [1/5] - in /httpcomponents/httpcore/trunk: httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/ httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/ httpcore-osgi/ httpcore-osgi/src/test/java/org/apache/hc/core5/h...

[ol...@apache.org]

Author: olegk
Date: Mon Nov 23 14:46:30 2015
New Revision: 1715835

URL: http://svn.apache.org/viewvc?rev=1715835&view=rev
Log:
Moved utility classes out of http namespace

Added:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Experimental.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Experimental.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/GuardedBy.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/GuardedBy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Immutable.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Immutable.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/NotThreadSafe.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/NotThreadSafe.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Obsolete.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Obsolete.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/ThreadSafe.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/ThreadSafe.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/package-info.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/BasicFuture.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/BasicFuture.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/Cancellable.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/Cancellable.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/FutureCallback.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/FutureCallback.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/package-info.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/EntityUtils.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/EntityUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyDetails.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/PrivateKeyDetails.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyStrategy.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/PrivateKeyStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLContextBuilder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLContexts.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLInitializationException.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLInitializationException.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/TrustStrategy.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/TrustStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/package-info.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Args.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/Args.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Asserts.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/Asserts.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/ByteArrayBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/CharArrayBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharsetUtils.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/CharsetUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/LangUtils.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/LangUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/NetUtils.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/NetUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/TextUtils.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/TextUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/VersionInfo.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/VersionInfo.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/package-info.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/BasicFutureCallback.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/BasicFutureCallback.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/TestBasicFuture.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/ssl/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ssl/TestSSLContextBuilder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/util/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/util/TestArgs.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/util/TestArgs.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/util/TestAsserts.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/util/TestAsserts.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/util/TestByteArrayBuffer.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/util/TestByteArrayBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/util/TestCharArrayBuffer.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/util/TestCharArrayBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/util/TestEntityUtils.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/util/TestEntityUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/util/TestLangUtils.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/util/TestLangUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/util/TestTextUtils.java
      - copied, changed from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/util/TestTextUtils.java
Removed:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ssl/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/util/
Modified:
    httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java
    httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java
    httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml
    httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/AnnotationIT.java
    httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
    httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ConcurrentIT.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PrintVersionInfo.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/FormattedHeader.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpHost.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpVersion.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ProtocolVersion.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/MessageConstraints.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/Registry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/RegistryBuilder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/SocketConfig.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractImmutableHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BasicHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BufferedHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteArrayEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteBufferEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentType.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/FileEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/HttpEntityWithTrailers.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/HttpEntityWrapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/InputStreamEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/SerializableEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/StringEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/BHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/ConnSupport.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/EnglishReasonPhraseCatalog.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/HttpConnectionMetricsImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/IncomingHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/entity/DefaultContentLengthStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpTransportMetricsImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHeaderElementIterator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElement.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElementIterator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderIterator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueFormatter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineFormatter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicListHeaderIterator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicNameValuePair.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicRequestLine.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicStatusLine.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicTokenIterator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BufferedHeader.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueFormatter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLaxLineParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLineParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineFormatter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/ParserCursor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/TokenParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpClientIODispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpServerIODispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParserFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriterFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParserFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriterFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/ContentBufferEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/ContentInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/ContentOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/EntityAsyncContentProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/NByteArrayEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/NFileEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/NStringEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOPoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/LeaseRequest.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExchange.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncService.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/PipeliningClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractIODispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractMultiworkerIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/BaseIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ChannelEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultConnectingIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ExceptionEvent.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorConfig.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSessionImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestHandle.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/PermanentSSLBufferManagementStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/ReleasableSSLBufferManagementStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ChainBuilder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpCoreContext.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpDateGenerator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ImmutableHttpProcessor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestDate.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestExpectContinue.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestUserAgent.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestValidateHost.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseConnControl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseContent.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseDate.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseServer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/TrailerNameFormatter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriHttpRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriPatternMatcher.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestByteBufferEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestHttpEntityWrapper.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestStringEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicHeaderValueFormatter.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicHeaderValueParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicLineFormatter.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestHeaderElement.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestTokenParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpServer.java

Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java Mon Nov 23 14:46:30 2015
@@ -53,8 +53,8 @@ import org.apache.hc.core5.http.entity.C
 import org.apache.hc.core5.http.entity.FileEntity;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.ssl.SSLContextBuilder;
-import org.apache.hc.core5.http.ssl.TrustStrategy;
+import org.apache.hc.core5.ssl.SSLContextBuilder;
+import org.apache.hc.core5.ssl.TrustStrategy;
 
 /**
  * Main program of the HTTP benchmark.

Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java Mon Nov 23 14:46:30 2015
@@ -51,7 +51,7 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.ResponseDate;
 import org.apache.hc.core5.http.protocol.ResponseServer;
 import org.apache.hc.core5.http.protocol.UriHttpRequestHandlerMapper;
-import org.apache.hc.core5.http.util.Asserts;
+import org.apache.hc.core5.util.Asserts;
 
 public class HttpServer {
 

Modified: httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml Mon Nov 23 14:46:30 2015
@@ -149,7 +149,7 @@
           <instructions>
             <Bundle-Name>Apache ${project.name}</Bundle-Name>
             <Bundle-SymbolicName>${project.groupId}.httpcore</Bundle-SymbolicName>
-            <_exportcontents>org.apache.hc.core5.http.*;version=${project.version}</_exportcontents>
+            <_exportcontents>org.apache.hc.core5.*;version=${project.version}</_exportcontents>
             <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
           </instructions>
         </configuration>

Modified: httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/AnnotationIT.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/AnnotationIT.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/AnnotationIT.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/AnnotationIT.java Mon Nov 23 14:46:30 2015
@@ -27,7 +27,7 @@
 
 package org.apache.hc.core5.http.osgi;
 
-import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.annotation.Immutable;
 import org.junit.Test;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java Mon Nov 23 14:46:30 2015
@@ -27,6 +27,17 @@
 
 package org.apache.hc.core5.http.osgi;
 
+import static org.ops4j.pax.exam.CoreOptions.bundle;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
@@ -35,17 +46,6 @@ import org.ops4j.pax.exam.spi.reactors.E
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.ops4j.pax.exam.util.PathUtils;
 
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
-
-import static org.ops4j.pax.exam.CoreOptions.bundle;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
-
 /**
  * Test inherit from this.
  */
@@ -84,15 +84,19 @@ public class Common {
                         .artifactId("httpcore")
                         .version(projectVersion)
                         .classifier("tests"))
-                .exports("org.apache.http.integration")
-                .imports("org.apache.http.protocol",
-                        "org.apache.http",
-                        "org.apache.http.config",
-                        "org.apache.http.entity",
-                        "org.apache.http.impl",
-                        "org.apache.http.impl.bootstrap",
-                        "org.apache.http.util",
-                        "org.apache.http.message",
+                .exports("org.apache.hc.core5.http.integration")
+                .imports("org.apache.hc.core5.annotation",
+                        "org.apache.hc.core5.concurrent",
+                        "org.apache.hc.core5.http",
+                        "org.apache.hc.core5.http.config",
+                        "org.apache.hc.core5.http.entity",
+                        "org.apache.hc.core5.http.message",
+                        "org.apache.hc.core5.http.pool",
+                        "org.apache.hc.core5.http.protocol",
+                        "org.apache.hc.core5.http.impl",
+                        "org.apache.hc.core5.http.impl.bootstrap",
+                        "org.apache.hc.core5.ssl",
+                        "org.apache.hc.core5.util",
                         "org.apache.commons.logging; provider=paxlogging",
                         "org.junit"),
                 junitBundles(),

Modified: httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ConcurrentIT.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ConcurrentIT.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ConcurrentIT.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ConcurrentIT.java Mon Nov 23 14:46:30 2015
@@ -27,8 +27,8 @@
 
 package org.apache.hc.core5.http.osgi;
 
-import org.apache.hc.core5.http.concurrent.BasicFuture;
-import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.concurrent.BasicFuture;
+import org.apache.hc.core5.concurrent.FutureCallback;
 import org.junit.Test;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java Mon Nov 23 14:46:30 2015
@@ -32,6 +32,7 @@ import java.net.Socket;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
@@ -44,7 +45,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
-import org.apache.hc.core5.http.util.EntityUtils;
 
 /**
  * Elemental example for executing multiple GET requests sequentially.

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java Mon Nov 23 14:46:30 2015
@@ -38,6 +38,7 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.InputStreamEntity;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
@@ -52,7 +53,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
-import org.apache.hc.core5.http.util.EntityUtils;
 
 /**
  * Elemental example for executing multiple POST requests sequentially.

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java Mon Nov 23 14:46:30 2015
@@ -33,6 +33,7 @@ import org.apache.hc.core5.http.HttpEnti
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.HttpEntityWithTrailers;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
@@ -46,7 +47,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestContent;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
-import org.apache.hc.core5.http.util.EntityUtils;
 
 /**
  * Elemental example for executing POST request with trailing headers

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java Mon Nov 23 14:46:30 2015
@@ -35,6 +35,7 @@ import org.apache.hc.core5.http.HttpClie
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.hc.core5.http.impl.pool.BasicConnFactory;
 import org.apache.hc.core5.http.impl.pool.BasicConnPool;
@@ -49,7 +50,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
-import org.apache.hc.core5.http.util.EntityUtils;
 
 /**
  * Elemental example for executing multiple GET requests from different threads using a connection

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java Mon Nov 23 14:46:30 2015
@@ -49,6 +49,7 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.MethodNotSupportedException;
 import org.apache.hc.core5.http.config.SocketConfig;
 import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.FileEntity;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
@@ -56,8 +57,7 @@ import org.apache.hc.core5.http.impl.boo
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpRequestHandler;
-import org.apache.hc.core5.http.ssl.SSLContexts;
-import org.apache.hc.core5.http.util.EntityUtils;
+import org.apache.hc.core5.ssl.SSLContexts;
 
 /**
  * Embedded HTTP/1.1 file server based on a classic (blocking) I/O model.

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java Mon Nov 23 14:46:30 2015
@@ -30,9 +30,9 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.concurrent.CountDownLatch;
 
+import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.concurrent.FutureCallback;
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.nio.DefaultHttpClientIODispatch;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java Mon Nov 23 14:46:30 2015
@@ -55,7 +55,7 @@ import org.apache.hc.core5.http.nio.prot
 import org.apache.hc.core5.http.nio.reactor.IOReactorConfig;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.http.ssl.SSLContexts;
+import org.apache.hc.core5.ssl.SSLContexts;
 
 /**
  * Embedded HTTP/1.1 file server based on a non-blocking I/O model and capable of direct channel

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java Mon Nov 23 14:46:30 2015
@@ -32,9 +32,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
+import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.concurrent.FutureCallback;
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.nio.DefaultHttpClientIODispatch;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PrintVersionInfo.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PrintVersionInfo.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PrintVersionInfo.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PrintVersionInfo.java Mon Nov 23 14:46:30 2015
@@ -27,7 +27,7 @@
 
 package org.apache.hc.core5.http.examples;
 
-import org.apache.hc.core5.http.util.VersionInfo;
+import org.apache.hc.core5.util.VersionInfo;
 
 /**
  * Prints version information for debugging purposes.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Experimental.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Experimental.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Experimental.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Experimental.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Experimental.java&r1=1715834&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Experimental.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Experimental.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.annotation;
+package org.apache.hc.core5.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/GuardedBy.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/GuardedBy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/GuardedBy.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/GuardedBy.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/GuardedBy.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/GuardedBy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/GuardedBy.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.annotation;
+package org.apache.hc.core5.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Immutable.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Immutable.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Immutable.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Immutable.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Immutable.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Immutable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Immutable.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.annotation;
+package org.apache.hc.core5.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/NotThreadSafe.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/NotThreadSafe.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/NotThreadSafe.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/NotThreadSafe.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/NotThreadSafe.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/NotThreadSafe.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/NotThreadSafe.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.annotation;
+package org.apache.hc.core5.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Obsolete.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Obsolete.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Obsolete.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Obsolete.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Obsolete.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/Obsolete.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/Obsolete.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.annotation;
+package org.apache.hc.core5.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/ThreadSafe.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/ThreadSafe.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/ThreadSafe.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/ThreadSafe.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/ThreadSafe.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/ThreadSafe.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/ThreadSafe.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.annotation;
+package org.apache.hc.core5.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/package-info.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/package-info.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/annotation/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/annotation/package-info.java Mon Nov 23 14:46:30 2015
@@ -32,4 +32,4 @@
  * See http://www.jcip.net
  * </p>
  */
-package org.apache.hc.core5.http.annotation;
+package org.apache.hc.core5.annotation;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/BasicFuture.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/BasicFuture.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/BasicFuture.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/BasicFuture.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/BasicFuture.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/BasicFuture.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/BasicFuture.java Mon Nov 23 14:46:30 2015
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.concurrent;
-
-import org.apache.hc.core5.http.util.Args;
+package org.apache.hc.core5.concurrent;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.apache.hc.core5.util.Args;
+
 /**
  * Basic implementation of the {@link Future} interface. {@code BasicFuture}
  * can be put into a completed state by invoking any of the following methods:

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/Cancellable.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/Cancellable.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/Cancellable.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/Cancellable.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/Cancellable.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/Cancellable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/Cancellable.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.concurrent;
+package org.apache.hc.core5.concurrent;
 
 /**
  * A {@code Cancellable} represents a process or an operation that can be

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/FutureCallback.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/FutureCallback.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/FutureCallback.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/FutureCallback.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/FutureCallback.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/FutureCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/FutureCallback.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.concurrent;
+package org.apache.hc.core5.concurrent;
 
 /**
  * A callback interface that gets invoked upon completion of

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/package-info.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/package-info.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/concurrent/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/concurrent/package-info.java Mon Nov 23 14:46:30 2015
@@ -28,4 +28,4 @@
 /**
  * Core concurrency APIs.
  */
-package org.apache.hc.core5.http.concurrent;
+package org.apache.hc.core5.concurrent;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/FormattedHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/FormattedHeader.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/FormattedHeader.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/FormattedHeader.java Mon Nov 23 14:46:30 2015
@@ -27,7 +27,7 @@
 
 package org.apache.hc.core5.http;
 
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 
 /**
  * An HTTP header which is already formatted.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpHost.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpHost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpHost.java Mon Nov 23 14:46:30 2015
@@ -31,9 +31,9 @@ import java.io.Serializable;
 import java.net.InetAddress;
 import java.util.Locale;
 
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
-import org.apache.hc.core5.http.util.LangUtils;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.LangUtils;
 
 /**
  * Holds all of the variables needed to describe an HTTP connection to a host.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpVersion.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpVersion.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpVersion.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpVersion.java Mon Nov 23 14:46:30 2015
@@ -27,7 +27,7 @@
 
 package org.apache.hc.core5.http;
 
-import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.annotation.Immutable;
 
 /**
  * Represents an HTTP version. HTTP uses a "major.minor" numbering

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ProtocolVersion.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ProtocolVersion.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ProtocolVersion.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ProtocolVersion.java Mon Nov 23 14:46:30 2015
@@ -29,8 +29,8 @@ package org.apache.hc.core5.http;
 
 import java.io.Serializable;
 
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Represents a protocol version. The "major.minor" numbering

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java Mon Nov 23 14:46:30 2015
@@ -30,9 +30,9 @@ package org.apache.hc.core5.http.config;
 import java.nio.charset.Charset;
 import java.nio.charset.CodingErrorAction;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * HTTP connection configuration.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/MessageConstraints.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/MessageConstraints.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/MessageConstraints.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/MessageConstraints.java Mon Nov 23 14:46:30 2015
@@ -27,7 +27,7 @@
 
 package org.apache.hc.core5.http.config;
 
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * HTTP Message constraints: line length and header count.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/Registry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/Registry.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/Registry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/Registry.java Mon Nov 23 14:46:30 2015
@@ -31,7 +31,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.annotation.ThreadSafe;
 
 /**
  * Generic registry of items keyed by low-case string ID.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/RegistryBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/RegistryBuilder.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/RegistryBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/RegistryBuilder.java Mon Nov 23 14:46:30 2015
@@ -31,8 +31,8 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Builder for {@link Registry} instances.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/SocketConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/SocketConfig.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/SocketConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/config/SocketConfig.java Mon Nov 23 14:46:30 2015
@@ -27,8 +27,8 @@
 
 package org.apache.hc.core5.http.config;
 
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Socket configuration.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractHttpEntity.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractHttpEntity.java Mon Nov 23 14:46:30 2015
@@ -30,8 +30,8 @@ package org.apache.hc.core5.http.entity;
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.TrailerSupplier;
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
 
 /**
  * Abstract base class for mutable entities. Provides the commonly used attributes for streamed and

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractImmutableHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractImmutableHttpEntity.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractImmutableHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/AbstractImmutableHttpEntity.java Mon Nov 23 14:46:30 2015
@@ -31,9 +31,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Abstract base class for immutable entities.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BasicHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BasicHttpEntity.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BasicHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BasicHttpEntity.java Mon Nov 23 14:46:30 2015
@@ -29,9 +29,9 @@ package org.apache.hc.core5.http.entity;
 
 import java.io.InputStream;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.impl.io.EmptyInputStream;
-import org.apache.hc.core5.http.util.Asserts;
+import org.apache.hc.core5.util.Asserts;
 
 /**
  * A generic streamed, non-repeatable entity that obtains its content

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BufferedHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BufferedHttpEntity.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BufferedHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/BufferedHttpEntity.java Mon Nov 23 14:46:30 2015
@@ -33,9 +33,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * A wrapping entity that buffers it content if necessary.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteArrayEntity.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteArrayEntity.java Mon Nov 23 14:46:30 2015
@@ -32,8 +32,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * A self contained, repeatable entity that obtains its content from a byte array.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteBufferEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteBufferEntity.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteBufferEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ByteBufferEntity.java Mon Nov 23 14:46:30 2015
@@ -34,8 +34,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * An entity that delivers the contents of a {@link ByteBuffer}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentType.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentType.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentType.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentType.java Mon Nov 23 14:46:30 2015
@@ -36,18 +36,18 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Consts;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.annotation.Immutable;
 import org.apache.hc.core5.http.message.BasicHeaderValueFormatter;
 import org.apache.hc.core5.http.message.BasicHeaderValueParser;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.core5.http.message.ParserCursor;
-import org.apache.hc.core5.http.util.Args;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
-import org.apache.hc.core5.http.util.TextUtils;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.CharArrayBuffer;
+import org.apache.hc.core5.util.TextUtils;
 
 /**
  * Content type information consisting of a MIME type and an optional charset.