[pulsar] branch master updated: [pulsar-admin] remove duplicate shaded ahc.properties file in client and admin (#4514)

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new a764f88  [pulsar-admin] remove duplicate shaded ahc.properties file in client and admin (#4514)
a764f88 is described below

commit a764f8820a7fd7e137be044e8d0373beb4da7dd5
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Wed Jun 12 22:31:20 2019 -0700

    [pulsar-admin] remove duplicate shaded ahc.properties file in client and admin (#4514)
    
    removing file from one of the location pulsar-client-admin and adding the symlink from pulsar-client module.
---
 .../org/asynchttpclient/config/ahc.properties      | 74 +---------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

diff --git a/pulsar-client-admin/src/main/resources/org/asynchttpclient/config/ahc.properties b/pulsar-client-admin/src/main/resources/org/asynchttpclient/config/ahc.properties
deleted file mode 100644
index 914456a..0000000
--- a/pulsar-client-admin/src/main/resources/org/asynchttpclient/config/ahc.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# This file is used by the shaded asynchttpclient packaged in pulsar-client-${VERSION}-shaded.jar.
-# For more details please refer https://github.com/apache/pulsar/issues/389
-
-org.apache.pulsar.shade.org.asynchttpclient.threadPoolName=AsyncHttpClient
-org.apache.pulsar.shade.org.asynchttpclient.maxConnections=-1
-org.apache.pulsar.shade.org.asynchttpclient.maxConnectionsPerHost=-1
-org.apache.pulsar.shade.org.asynchttpclient.connectTimeout=5000
-org.apache.pulsar.shade.org.asynchttpclient.pooledConnectionIdleTimeout=60000
-org.apache.pulsar.shade.org.asynchttpclient.connectionPoolCleanerPeriod=1000
-org.apache.pulsar.shade.org.asynchttpclient.readTimeout=60000
-org.apache.pulsar.shade.org.asynchttpclient.requestTimeout=60000
-org.apache.pulsar.shade.org.asynchttpclient.connectionTtl=-1
-org.apache.pulsar.shade.org.asynchttpclient.followRedirect=false
-org.apache.pulsar.shade.org.asynchttpclient.maxRedirects=5
-org.apache.pulsar.shade.org.asynchttpclient.compressionEnforced=false
-org.apache.pulsar.shade.org.asynchttpclient.userAgent=AHC/2.1
-org.apache.pulsar.shade.org.asynchttpclient.enabledProtocols=TLSv1.2, TLSv1.1, TLSv1
-org.apache.pulsar.shade.org.asynchttpclient.enabledCipherSuites=
-org.apache.pulsar.shade.org.asynchttpclient.useProxySelector=false
-org.apache.pulsar.shade.org.asynchttpclient.useProxyProperties=false
-org.apache.pulsar.shade.org.asynchttpclient.validateResponseHeaders=true
-org.apache.pulsar.shade.org.asynchttpclient.aggregateWebSocketFrameFragments=true
-org.apache.pulsar.shade.org.asynchttpclient.strict302Handling=false
-org.apache.pulsar.shade.org.asynchttpclient.keepAlive=true
-org.apache.pulsar.shade.org.asynchttpclient.maxRequestRetry=5
-org.apache.pulsar.shade.org.asynchttpclient.disableUrlEncodingForBoundRequests=false
-org.apache.pulsar.shade.org.asynchttpclient.useLaxCookieEncoder=false
-org.apache.pulsar.shade.org.asynchttpclient.removeQueryParamOnRedirect=true
-org.apache.pulsar.shade.org.asynchttpclient.useOpenSsl=false
-org.apache.pulsar.shade.org.asynchttpclient.useInsecureTrustManager=false
-org.apache.pulsar.shade.org.asynchttpclient.disableHttpsEndpointIdentificationAlgorithm=false
-org.apache.pulsar.shade.org.asynchttpclient.sslSessionCacheSize=0
-org.apache.pulsar.shade.org.asynchttpclient.sslSessionTimeout=0
-org.apache.pulsar.shade.org.asynchttpclient.tcpNoDelay=true
-org.apache.pulsar.shade.org.asynchttpclient.soReuseAddress=false
-org.apache.pulsar.shade.org.asynchttpclient.soLinger=-1
-org.apache.pulsar.shade.org.asynchttpclient.soSndBuf=-1
-org.apache.pulsar.shade.org.asynchttpclient.soRcvBuf=-1
-org.apache.pulsar.shade.org.asynchttpclient.httpClientCodecMaxInitialLineLength=4096
-org.apache.pulsar.shade.org.asynchttpclient.httpClientCodecMaxHeaderSize=8192
-org.apache.pulsar.shade.org.asynchttpclient.httpClientCodecMaxChunkSize=8192
-org.apache.pulsar.shade.org.asynchttpclient.httpClientCodecInitialBufferSize=128
-org.apache.pulsar.shade.org.asynchttpclient.disableZeroCopy=false
-org.apache.pulsar.shade.org.asynchttpclient.handshakeTimeout=10000
-org.apache.pulsar.shade.org.asynchttpclient.chunkedFileChunkSize=8192
-org.apache.pulsar.shade.org.asynchttpclient.webSocketMaxBufferSize=128000000
-org.apache.pulsar.shade.org.asynchttpclient.webSocketMaxFrameSize=10240
-org.apache.pulsar.shade.org.asynchttpclient.keepEncodingHeader=false
-org.apache.pulsar.shade.org.asynchttpclient.shutdownQuietPeriod=2000
-org.apache.pulsar.shade.org.asynchttpclient.shutdownTimeout=15000
-org.apache.pulsar.shade.org.asynchttpclient.useNativeTransport=false
-org.apache.pulsar.shade.org.asynchttpclient.ioThreadsCount=0
-org.apache.pulsar.shade.org.asynchttpclient.acquireFreeChannelTimeout=0
-org.apache.pulsar.shade.org.org.asynchttpclient.enableWebSocketCompression=true
diff --git a/pulsar-client-admin/src/main/resources/org/asynchttpclient/config/ahc.properties b/pulsar-client-admin/src/main/resources/org/asynchttpclient/config/ahc.properties
new file mode 120000
index 0000000..eac6e7e
--- /dev/null
+++ b/pulsar-client-admin/src/main/resources/org/asynchttpclient/config/ahc.properties
@@ -0,0 +1 @@
+../../../../../../../pulsar-client/src/main/resources/ahc.properties
\ No newline at end of file