You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2019/08/13 23:16:49 UTC
[camel] branch CAMEL-13853 updated (65e2582 -> 091c4b4)
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a change to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 65e2582 CAMEL-13853: AvailablePortFinder now delegates the port selection to OS
add 74fab44 cleanups for camel-http4 to camel-http component renaming
add d17bdf2 update migration guide and correct typos
add fabfa0f CAMEL-13841: Add the ability to do manual Pulsar message acknowledgements.
add 860b654 Update Javadocs.
add 53f415b CAMEL-13861: Fixes missing logic producing empty messages
add 7b3eb70 CAMEL-13814 Inline EIP images
add ea03405 camel-microprofile-config: fix filtered loading
add 597f256 upgrade to CXF 3.3.3, and this will fix CAMEL-12957
add ab594f3 fix the failing tests on the ci-server
new cda1d1a Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853
new 091c4b4 CAMEL-13853: fix tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 4 +-
README.md | 1 -
.../org/apache/camel/catalog/CamelCatalogTest.java | 4 +-
.../elasticsearch/ElasticsearchBaseTest.java | 7 +-
.../ElasticsearchClusterBaseTest.java | 8 +-
.../camel/http/common/HttpSendDynamicAware.java | 2 +-
.../camel-http/src/main/docs/http-component.adoc | 16 +-
.../BasicAuthenticationHttpClientConfigurer.java | 4 +-
.../{http4 => http}/CompositeHttpConfigurer.java | 2 +-
.../{http4 => http}/HttpClientConfigurer.java | 2 +-
.../component/{http4 => http}/HttpComponent.java | 36 ++--
.../HttpComponentVerifierExtension.java | 2 +-
.../component/{http4 => http}/HttpConstants.java | 2 +-
.../{http4 => http}/HttpDeleteWithBodyMethod.java | 2 +-
.../component/{http4 => http}/HttpEndpoint.java | 2 +-
.../{http4 => http}/HttpEntityConverter.java | 2 +-
.../component/{http4 => http}/HttpMethods.java | 4 +-
.../{http4 => http}/HttpPollingConsumer.java | 14 +-
.../component/{http4 => http}/HttpProducer.java | 10 +-
.../{http4 => http}/HttpSendDynamicAware.java | 2 +-
.../camel/component/{http4 => http}/HttpUtil.java | 2 +-
.../component/{http4 => http}/NoopCookieStore.java | 2 +-
.../{http4 => http}/PreemptiveAuthInterceptor.java | 4 +-
.../{http4 => http}/ProxyHttpClientConfigurer.java | 4 +-
.../cloud/HttpServiceExpression.java} | 8 +-
.../cloud/HttpServiceExpressionFactory.java} | 6 +-
.../{http4 => http}/helper/HttpMethodHelper.java | 8 +-
.../camel/component/{http4 => http}/package.html | 0
.../component/{http4 => http}/BaseHttpTest.java | 4 +-
.../component/{http4 => http}/BaseHttpsTest.java | 4 +-
.../CamelComponentVerifierExtensionTest.java | 8 +-
.../CamelComponentVerifierTest.java | 8 +-
.../{http4 => http}/GoogleUrlRewrite.java | 2 +-
.../{http4 => http}/HeaderFilteringTest.java | 2 +-
.../{http4 => http}/HttpAuthenticationTest.java | 22 +--
.../component/{http4 => http}/HttpBodyTest.java | 18 +-
.../HttpBodyWithOtherProtocalNameTest.java | 6 +-
.../{http4 => http}/HttpBridgeEndpointTest.java | 12 +-
.../HttpCamelHeadersNotCopiedTest.java | 4 +-
.../{http4 => http}/HttpCamelHeadersTest.java | 4 +-
.../component/{http4 => http}/HttpCharsetTest.java | 10 +-
.../{http4 => http}/HttpClientConfigurerTest.java | 4 +-
.../{http4 => http}/HttpCompressionTest.java | 10 +-
.../{http4 => http}/HttpConcurrentTest.java | 4 +-
.../HttpCustomComponentNameTest.java | 2 +-
.../{http4 => http}/HttpDefaultPortNumberTest.java | 10 +-
.../HttpDisableStreamCacheTest.java | 10 +-
.../HttpEndpointOptionsNotChangeComponentTest.java | 6 +-
.../{http4 => http}/HttpEndpointURLTest.java | 14 +-
.../HttpInvalidConfigurationTest.java | 6 +-
.../HttpInvalidHttpClientConfigurationTest.java | 6 +-
.../component/{http4 => http}/HttpMethodsTest.java | 14 +-
.../{http4 => http}/HttpNoCamelHeaderTest.java | 2 +-
.../HttpNoConnectionRedeliveryTest.java | 10 +-
.../{http4 => http}/HttpNoConnectionTest.java | 8 +-
.../component/{http4 => http}/HttpPathTest.java | 10 +-
.../{http4 => http}/HttpPollingConsumerTest.java | 26 +--
.../HttpProducerConnectionCloseTest.java | 14 +-
.../HttpProducerContentLengthTest.java | 34 ++--
.../HttpProducerContentTypeTest.java | 22 +--
.../HttpProducerContentTypeWithSemiColomnTest.java | 22 +--
.../HttpProducerExplicitConnectionCloseTest.java | 12 +-
.../HttpProducerSelectMethodTest.java | 18 +-
.../{http4 => http}/HttpProducerSessionTest.java | 10 +-
.../HttpProducerTwoHeadersWithSameKeyTest.java | 6 +-
.../HttpProducerTwoParametersWithSameKeyTest.java | 6 +-
.../HttpProducerWithSystemPropertiesTest.java | 4 +-
.../{http4 => http}/HttpProxyServerTest.java | 6 +-
.../component/{http4 => http}/HttpQueryTest.java | 14 +-
.../{http4 => http}/HttpRedirectTest.java | 8 +-
.../HttpReferenceParameterTest.java | 8 +-
.../{http4 => http}/HttpSNIHostNameTest.java | 4 +-
.../{http4 => http}/HttpSOTimeoutTest.java | 10 +-
.../{http4 => http}/HttpSendDynamicAwareTest.java | 6 +-
.../{http4 => http}/HttpServerTestSupport.java | 4 +-
.../HttpThrowExceptionOnFailureTest.java | 18 +-
.../{http4 => http}/HttpWithHttpUriHeaderTest.java | 10 +-
.../{http4 => http}/HttpsAuthenticationTest.java | 14 +-
.../component/{http4 => http}/HttpsGetTest.java | 10 +-
.../{http4 => http}/HttpsServerTestSupport.java | 3 +-
.../HttpsSslContextParametersGetTest.java | 8 +-
...psTwoComponentsSslContextParametersGetTest.java | 14 +-
...tpsTwoDifferentSslContextParametersGetTest.java | 12 +-
.../ManagedHttpProducerPoolStatsTest.java | 4 +-
.../component/{http4 => http}/UrlRewriteTest.java | 2 +-
.../handler/AuthenticationValidationHandler.java | 4 +-
.../handler/BasicRawQueryValidationHandler.java | 2 +-
.../handler/BasicValidationHandler.java | 4 +-
.../handler/DelayValidationHandler.java | 4 +-
.../handler/DrinkValidationHandler.java | 2 +-
.../handler/HeaderValidationHandler.java | 4 +-
.../ProxyAuthenticationValidationHandler.java | 4 +-
.../handler/SessionReflectionHandler.java | 2 +-
.../{http4 => http}/helper/HttpHelperTest.java | 6 +-
.../rest/RestCamelComponentVerifierTest.java | 8 +-
.../http4/AdviceAndInterceptHttp4IssueTest.java | 95 ----------
.../src/test/resources/log4j2.properties | 2 +-
.../camel/component/http4/CamelHttp4Context.xml | 79 --------
.../camel-jetty/src/main/docs/jetty-component.adoc | 6 +-
.../jetty/HttpAuthMethodPriorityTest.java | 2 +-
.../HttpBasicAuthComponentConfiguredTest.java | 2 +-
...gMapHttpMessageFormUrlEncodedFalseBodyTest.java | 8 +-
...pBindingPreservePostFormUrlEncodedBodyTest.java | 10 +-
.../jetty/HttpBridgeMultipartRouteTest.java | 22 +--
...thBodyTest.java => HttpDeleteWithBodyTest.java} | 6 +-
.../component/jetty/HttpGZipEncodingTest.java | 2 +-
.../component/jetty/MultiThreadedHttpGetTest.java | 6 +-
.../component/jetty/javabody/HttpJavaBodyTest.java | 2 +-
.../rest/producer/Http4RestProducerGetTest.java | 60 -------
.../rest/producer/Http4RestProducerPutTest.java | 53 ------
.../apache/camel/component/jetty/jetty-https.xml | 5 -
.../jetty/jetty-noconnection-redelivery.xml | 5 -
.../camel/component/jetty/jetty-noconnection.xml | 5 -
.../config/CamelMicroProfilePropertiesSource.java | 13 +-
.../CamelMicroProfilePropertiesSourceTest.java | 10 ++
.../camel/component/netty4/http/BaseNettyTest.java | 2 +-
...pBindingPreservePostFormUrlEncodedBodyTest.java | 2 +-
.../http/NettyHttpBindingUseAbsolutePathTest.java | 2 +-
.../NettyHttpBindingUseRelativePathInPostTest.java | 2 +-
.../http/NettyHttpBindingUseRelativePathTest.java | 2 +-
.../netty4/http/SpringNettyHttpBasicAuthTest.xml | 5 -
.../netty4/http/SpringNettyHttpSSLTest.xml | 5 -
.../camel/component/netty4/BaseNettyTest.java | 2 +-
.../camel/component/olingo2/Olingo2Consumer.java | 3 +-
.../olingo2/Olingo2ComponentConsumerTest.java | 111 +++++++++++-
.../camel/component/olingo4/Olingo4Consumer.java | 3 +-
.../olingo4/Olingo4ComponentConsumerTest.java | 144 ++++++++++++++-
.../src/main/docs/properties-component.adoc | 3 +-
.../src/main/docs/pulsar-component.adoc | 9 +-
.../pulsar/DefaultPulsarMessageReceipt.java | 67 +++++++
.../DefaultPulsarMessageReceiptFactory.java} | 20 +--
.../camel/component/pulsar/PulsarComponent.java | 33 ++++
.../camel/component/pulsar/PulsarEndpoint.java | 5 +
.../component/pulsar/PulsarMessageListener.java | 11 +-
.../component/pulsar/PulsarMessageReceipt.java | 70 ++++++++
.../pulsar/PulsarMessageReceiptFactory.java} | 28 ++-
.../pulsar/configuration/PulsarConfiguration.java | 43 +++++
.../consumers/CommonCreationStrategyImpl.java | 3 +
.../pulsar/utils/message/PulsarMessageHeaders.java | 1 +
.../component/pulsar/PulsarComponentTest.java | 14 ++
.../pulsar/PulsarConsumerAcknowledgementTest.java | 200 +++++++++++++++++++++
.../PulsarConsumerNoAcknowledgementTest.java | 103 +++++++++++
.../pulsar/PulsarCustomMessageReceiptTest.java | 135 ++++++++++++++
.../pulsar/PulsarNegativeAcknowledgementTest.java} | 23 +--
.../component/restlet/RestRestletRouterIdTest.java | 2 +-
.../PreservePostFormUrlEncodedBodyTest.java | 10 +-
.../src/test/resources/SpringTest.xml | 5 -
.../src/main/docs/eips/aggregate-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/choice-eip.adoc | 2 +-
.../src/main/docs/eips/claimCheck-eip.adoc | 2 +-
.../main/docs/eips/content-based-router-eip.adoc | 2 +-
.../src/main/docs/eips/content-filter-eip.adoc | 2 +-
.../src/main/docs/eips/dynamic-router.adoc | 2 +-
.../src/main/docs/eips/dynamicRouter-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/enrich-eip.adoc | 2 +-
.../main/docs/eips/eventDrivenConsumer-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/filter-eip.adoc | 2 +-
.../src/main/docs/eips/otherwise-eip.adoc | 2 +-
.../src/main/docs/eips/pipeline-eip.adoc | 2 +-
.../src/main/docs/eips/recipientList-eip.adoc | 2 +-
.../src/main/docs/eips/requestReply-eip.adoc | 2 +-
.../src/main/docs/eips/resequence-eip.adoc | 2 +-
.../src/main/docs/eips/rollback-eip.adoc | 2 +-
.../src/main/docs/eips/routingSlip-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/split-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/step-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/when-eip.adoc | 2 +-
.../camel-core/src/main/docs/eips/wireTap-eip.adoc | 2 +-
.../apache/camel/language/simple/SimpleTest.java | 2 +-
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/PulsarEndpointBuilderFactory.java | 86 +++++++++
.../modules/ROOT/pages/http-component.adoc | 16 +-
.../modules/ROOT/pages/jetty-component.adoc | 6 +-
.../modules/ROOT/pages/properties-component.adoc | 6 +-
.../modules/ROOT/pages/pulsar-component.adoc | 9 +-
.../modules/ROOT/assets/images/eip/Aggregator.gif | Bin 0 -> 2413 bytes
.../ROOT/assets/images/eip/AggregatorIcon.gif | Bin 0 -> 392 bytes
.../modules/ROOT/assets/images/eip/ChannelIcon.gif | Bin 0 -> 376 bytes
.../assets/images/eip/CompetingConsumersIcon.gif | Bin 0 -> 428 bytes
.../ROOT/assets/images/eip/ContentBasedRouter.gif | Bin 0 -> 2504 bytes
.../assets/images/eip/ContentBasedRouterIcon.gif | Bin 0 -> 356 bytes
.../ROOT/assets/images/eip/ContentFilter.gif | Bin 0 -> 1777 bytes
.../ROOT/assets/images/eip/ContentFilterIcon.gif | Bin 0 -> 375 bytes
.../ROOT/assets/images/eip/ControlBusIcon.gif | Bin 0 -> 764 bytes
.../images/eip/CorrelationIdentifierIcon.gif | Bin 0 -> 375 bytes
.../images/eip/CorrelationIdentifierSolution.gif | Bin 0 -> 4041 bytes
.../ROOT/assets/images/eip/DataEnricher.gif | Bin 0 -> 2703 bytes
.../ROOT/assets/images/eip/DataEnricherIcon.gif | Bin 0 -> 372 bytes
.../assets/images/eip/DeadLetterChannelIcon.gif | Bin 0 -> 519 bytes
.../images/eip/DeadLetterChannelSolution.gif | Bin 0 -> 3557 bytes
.../modules/ROOT/assets/images/eip/DetourIcon.gif | Bin 0 -> 678 bytes
.../images/eip/DistributionAggregateIcon.gif | Bin 0 -> 491 bytes
.../assets/images/eip/DurableSubscriptionIcon.gif | Bin 0 -> 306 bytes
.../ROOT/assets/images/eip/DynamicRouter.gif | Bin 0 -> 7122 bytes
.../ROOT/assets/images/eip/DynamicRouterIcon.gif | Bin 0 -> 654 bytes
.../assets/images/eip/EventDrivenConsumerIcon.gif | Bin 0 -> 388 bytes
.../images/eip/EventDrivenConsumerSolution.gif | Bin 0 -> 2077 bytes
.../ROOT/assets/images/eip/EventMessageIcon.gif | Bin 0 -> 264 bytes
.../assets/images/eip/EventMessageSolution.gif | Bin 0 -> 2843 bytes
.../assets/images/eip/GuaranteedMessagingIcon.gif | Bin 0 -> 312 bytes
.../images/eip/GuaranteedMessagingSolution.gif | Bin 0 -> 4574 bytes
.../ROOT/assets/images/eip/MessageBusIcon.gif | Bin 0 -> 381 bytes
.../ROOT/assets/images/eip/MessageBusSolution.gif | Bin 0 -> 2243 bytes
.../assets/images/eip/MessageChannelSolution.gif | Bin 0 -> 3343 bytes
.../assets/images/eip/MessageDispatcherIcon.gif | Bin 0 -> 431 bytes
.../ROOT/assets/images/eip/MessageEndpointIcon.gif | Bin 0 -> 391 bytes
.../assets/images/eip/MessageEndpointSolution.gif | Bin 0 -> 3816 bytes
.../ROOT/assets/images/eip/MessageFilter.gif | Bin 0 -> 3820 bytes
.../ROOT/assets/images/eip/MessageFilterIcon.gif | Bin 0 -> 497 bytes
.../modules/ROOT/assets/images/eip/MessageIcon.gif | Bin 0 -> 799 bytes
.../ROOT/assets/images/eip/MessageRouter.gif | Bin 0 -> 3340 bytes
.../ROOT/assets/images/eip/MessageSelectorIcon.gif | Bin 0 -> 455 bytes
.../ROOT/assets/images/eip/MessageSolution.gif | Bin 0 -> 1256 bytes
.../ROOT/assets/images/eip/MessageTranslator.gif | Bin 0 -> 2183 bytes
.../assets/images/eip/MessageTranslatorIcon.gif | Bin 0 -> 487 bytes
.../assets/images/eip/MessagingAdapterIcon.gif | Bin 0 -> 388 bytes
.../assets/images/eip/MessagingGatewayIcon.gif | Bin 0 -> 485 bytes
.../ROOT/assets/images/eip/NormalizerIcon.gif | Bin 0 -> 401 bytes
.../ROOT/assets/images/eip/PipesAndFilters.gif | Bin 0 -> 2906 bytes
.../ROOT/assets/images/eip/PipesAndFiltersIcon.gif | Bin 0 -> 455 bytes
.../ROOT/assets/images/eip/PointToPointIcon.gif | Bin 0 -> 147 bytes
.../assets/images/eip/PointToPointSolution.gif | Bin 0 -> 2995 bytes
.../ROOT/assets/images/eip/PollingConsumerIcon.gif | Bin 0 -> 418 bytes
.../assets/images/eip/PollingConsumerSolution.gif | Bin 0 -> 2117 bytes
.../assets/images/eip/PublishSubscribeIcon.gif | Bin 0 -> 227 bytes
.../assets/images/eip/PublishSubscribeSolution.gif | Bin 0 -> 4269 bytes
.../ROOT/assets/images/eip/RecipientList.gif | Bin 0 -> 5065 bytes
.../ROOT/assets/images/eip/RecipientListIcon.gif | Bin 0 -> 368 bytes
.../ROOT/assets/images/eip/RequestReply.gif | Bin 0 -> 3141 bytes
.../ROOT/assets/images/eip/RequestReplyIcon.gif | Bin 0 -> 274 bytes
.../modules/ROOT/assets/images/eip/Resequencer.gif | Bin 0 -> 1965 bytes
.../ROOT/assets/images/eip/ResequencerIcon.gif | Bin 0 -> 435 bytes
.../ROOT/assets/images/eip/ReturnAddressIcon.gif | Bin 0 -> 302 bytes
.../assets/images/eip/ReturnAddressSolution.gif | Bin 0 -> 5867 bytes
.../ROOT/assets/images/eip/RoutingTableIcon.gif | Bin 0 -> 376 bytes
.../ROOT/assets/images/eip/RoutingTableSimple.gif | Bin 0 -> 3459 bytes
.../modules/ROOT/assets/images/eip/Sequencer.gif | Bin 0 -> 2298 bytes
.../ROOT/assets/images/eip/SplitterIcon.gif | Bin 0 -> 397 bytes
.../ROOT/assets/images/eip/StoreInLibrary.gif | Bin 0 -> 6440 bytes
.../ROOT/assets/images/eip/StoreInLibraryIcon.gif | Bin 0 -> 684 bytes
.../assets/images/eip/TransactionalClientIcon.gif | Bin 0 -> 486 bytes
.../images/eip/TransactionalClientSolution.gif | Bin 0 -> 3654 bytes
.../modules/ROOT/assets/images/eip/WireTap.gif | Bin 0 -> 3067 bytes
.../modules/ROOT/assets/images/eip/WireTapIcon.gif | Bin 0 -> 481 bytes
.../modules/ROOT/pages/aggregate-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/choice-eip.adoc | 2 +-
.../modules/ROOT/pages/claimCheck-eip.adoc | 2 +-
.../ROOT/pages/content-based-router-eip.adoc | 2 +-
.../modules/ROOT/pages/content-enricher.adoc | 2 +-
.../modules/ROOT/pages/content-filter-eip.adoc | 2 +-
.../modules/ROOT/pages/correlation-identifier.adoc | 2 +-
.../modules/ROOT/pages/dead-letter-channel.adoc | 2 +-
.../modules/ROOT/pages/dynamic-router.adoc | 2 +-
.../modules/ROOT/pages/dynamicRouter-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/enrich-eip.adoc | 2 +-
.../pages/enterprise-integration-patterns.adoc | 112 ++++++------
.../modules/ROOT/pages/event-message.adoc | 2 +-
.../ROOT/pages/eventDrivenConsumer-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/filter-eip.adoc | 2 +-
.../modules/ROOT/pages/guaranteed-delivery.adoc | 2 +-
.../modules/ROOT/pages/http-session-handling.adoc | 2 +-
.../modules/ROOT/pages/http-session.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/karaf.adoc | 1 -
.../modules/ROOT/pages/message-bus.adoc | 2 +-
.../modules/ROOT/pages/message-channel.adoc | 2 +-
.../modules/ROOT/pages/message-endpoint.adoc | 2 +-
.../modules/ROOT/pages/message-router.adoc | 2 +-
.../modules/ROOT/pages/message-translator.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/message.adoc | 2 +-
.../modules/ROOT/pages/otherwise-eip.adoc | 2 +-
.../modules/ROOT/pages/pipeline-eip.adoc | 2 +-
.../modules/ROOT/pages/point-to-point-channel.adoc | 2 +-
.../modules/ROOT/pages/polling-consumer.adoc | 2 +-
.../ROOT/pages/publish-subscribe-channel.adoc | 2 +-
.../modules/ROOT/pages/recipientList-eip.adoc | 2 +-
.../modules/ROOT/pages/requestReply-eip.adoc | 2 +-
.../modules/ROOT/pages/resequence-eip.adoc | 2 +-
.../modules/ROOT/pages/return-address.adoc | 2 +-
.../modules/ROOT/pages/rollback-eip.adoc | 2 +-
.../modules/ROOT/pages/routingSlip-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/split-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/step-eip.adoc | 2 +-
.../modules/ROOT/pages/transactional-client.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/when-eip.adoc | 2 +-
.../modules/ROOT/pages/wireTap-eip.adoc | 2 +-
parent/pom.xml | 2 +-
.../springboot/HttpComponentAutoConfiguration.java | 4 +-
.../springboot/HttpComponentConfiguration.java | 4 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../springboot/PulsarComponentConfiguration.java | 32 ++++
.../apache/camel/itest/http/Http4EndpointTest.java | 82 ---------
.../itest/http/Http4MaxConnectionPerHostTest.java | 81 ---------
.../apache/camel/itest/http/Http4RouteTest.java | 89 ---------
.../apache/camel/itest/http/HttpEndpointTest.java | 39 +++-
.../itest/http/HttpMaxConnectionPerHostTest.java | 40 ++++-
.../jetty/JettyBridgeHostHeaderIssueTest.java | 2 +-
.../camel/itest/http/Http4EndpointTest-context.xml | 55 ------
.../http/Http4MaxConnectionPerHostTest-context.xml | 46 -----
.../camel/itest/http/HttpEndpointTest-context.xml | 21 ++-
.../http/HttpMaxConnectionPerHostTest-context.xml | 18 +-
300 files changed, 1781 insertions(+), 1308 deletions(-)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/BasicAuthenticationHttpClientConfigurer.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/CompositeHttpConfigurer.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpClientConfigurer.java (96%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpComponent.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpComponentVerifierExtension.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpConstants.java (96%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpDeleteWithBodyMethod.java (96%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpEndpoint.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpEntityConverter.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpMethods.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpPollingConsumer.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpProducer.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpSendDynamicAware.java (95%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpUtil.java (96%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/NoopCookieStore.java (97%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/PreemptiveAuthInterceptor.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/ProxyHttpClientConfigurer.java (98%)
copy components/camel-http/src/main/java/org/apache/camel/component/{http4/cloud/Http4ServiceExpression.java => http/cloud/HttpServiceExpression.java} (80%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4/cloud/Http4ServiceExpressionFactory.java => http/cloud/HttpServiceExpressionFactory.java} (87%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/helper/HttpMethodHelper.java (94%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/package.html (100%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/BaseHttpTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/BaseHttpsTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/CamelComponentVerifierExtensionTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/CamelComponentVerifierTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/GoogleUrlRewrite.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HeaderFilteringTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpAuthenticationTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpBodyTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpBodyWithOtherProtocalNameTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpBridgeEndpointTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCamelHeadersNotCopiedTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCamelHeadersTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCharsetTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpClientConfigurerTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCompressionTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpConcurrentTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCustomComponentNameTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpDefaultPortNumberTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpDisableStreamCacheTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpEndpointOptionsNotChangeComponentTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpEndpointURLTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpInvalidConfigurationTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpInvalidHttpClientConfigurationTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpMethodsTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpNoCamelHeaderTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpNoConnectionRedeliveryTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpNoConnectionTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpPathTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpPollingConsumerTest.java (91%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerConnectionCloseTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerContentLengthTest.java (94%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerContentTypeTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerContentTypeWithSemiColomnTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerExplicitConnectionCloseTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerSelectMethodTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerSessionTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerTwoHeadersWithSameKeyTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerTwoParametersWithSameKeyTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerWithSystemPropertiesTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProxyServerTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpQueryTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpRedirectTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpReferenceParameterTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpSNIHostNameTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpSOTimeoutTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpSendDynamicAwareTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpServerTestSupport.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpThrowExceptionOnFailureTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpWithHttpUriHeaderTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsAuthenticationTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsGetTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsServerTestSupport.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsSslContextParametersGetTest.java (94%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsTwoComponentsSslContextParametersGetTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsTwoDifferentSslContextParametersGetTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/ManagedHttpProducerPoolStatsTest.java (99%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/UrlRewriteTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/AuthenticationValidationHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/BasicRawQueryValidationHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/BasicValidationHandler.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/DelayValidationHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/DrinkValidationHandler.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/HeaderValidationHandler.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/ProxyAuthenticationValidationHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/SessionReflectionHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/helper/HttpHelperTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/rest/RestCamelComponentVerifierTest.java (97%)
delete mode 100644 components/camel-http/src/test/java/org/apache/camel/component/http4/AdviceAndInterceptHttp4IssueTest.java
delete mode 100644 components/camel-http/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
rename components/camel-jetty/src/test/java/org/apache/camel/component/jetty/{Http4DeleteWithBodyTest.java => HttpDeleteWithBodyTest.java} (91%)
delete mode 100644 components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java
delete mode 100644 components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java
create mode 100644 components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/DefaultPulsarMessageReceipt.java
copy components/{camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpression.java => camel-pulsar/src/main/java/org/apache/camel/component/pulsar/DefaultPulsarMessageReceiptFactory.java} (64%)
create mode 100644 components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarMessageReceipt.java
rename components/{camel-http/src/main/java/org/apache/camel/component/http4/HttpMethodsConverter.java => camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarMessageReceiptFactory.java} (55%)
create mode 100644 components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java
create mode 100644 components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java
create mode 100644 components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java
rename components/{camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpression.java => camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarNegativeAcknowledgementTest.java} (61%)
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/Aggregator.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/AggregatorIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ChannelIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/CompetingConsumersIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ContentBasedRouter.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ContentBasedRouterIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ContentFilter.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ContentFilterIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ControlBusIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/CorrelationIdentifierIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/CorrelationIdentifierSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DataEnricher.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DataEnricherIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DeadLetterChannelIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DeadLetterChannelSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DetourIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DistributionAggregateIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DurableSubscriptionIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DynamicRouter.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DynamicRouterIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/EventDrivenConsumerIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/EventDrivenConsumerSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/EventMessageIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/EventMessageSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/GuaranteedMessagingIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/GuaranteedMessagingSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageBusIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageBusSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageChannelSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageDispatcherIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageEndpointIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageEndpointSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageFilter.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageFilterIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageRouter.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageSelectorIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageTranslator.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageTranslatorIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessagingAdapterIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessagingGatewayIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/NormalizerIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/PipesAndFilters.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/PipesAndFiltersIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/PointToPointIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/PointToPointSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/PollingConsumerIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/PollingConsumerSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/PublishSubscribeIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/PublishSubscribeSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/RecipientList.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/RecipientListIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/RequestReply.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/RequestReplyIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/Resequencer.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ResequencerIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ReturnAddressIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ReturnAddressSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/RoutingTableIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/RoutingTableSimple.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/Sequencer.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/SplitterIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/StoreInLibrary.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/StoreInLibraryIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/TransactionalClientIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/TransactionalClientSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/WireTap.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/WireTapIcon.gif
rename platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/{http4 => http}/springboot/HttpComponentAutoConfiguration.java (98%)
rename platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/{http4 => http}/springboot/HttpComponentConfiguration.java (98%)
delete mode 100644 tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
delete mode 100644 tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
delete mode 100644 tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
delete mode 100644 tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
delete mode 100644 tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
[camel] 01/02: Merge branch 'master' of
https://github.com/apache/camel into CAMEL-13853
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cda1d1aadbf9ba9cdd1a8856632e42e685a268ca
Merge: 65e2582 ab594f3
Author: Jan Bednář <ma...@janbednar.eu>
AuthorDate: Wed Aug 14 00:53:47 2019 +0200
Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853
# Conflicts:
# tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
MIGRATION.md | 4 +-
README.md | 1 -
.../org/apache/camel/catalog/CamelCatalogTest.java | 4 +-
.../camel/http/common/HttpSendDynamicAware.java | 2 +-
.../camel-http/src/main/docs/http-component.adoc | 16 +-
.../BasicAuthenticationHttpClientConfigurer.java | 4 +-
.../{http4 => http}/CompositeHttpConfigurer.java | 2 +-
.../{http4 => http}/HttpClientConfigurer.java | 2 +-
.../component/{http4 => http}/HttpComponent.java | 36 ++--
.../HttpComponentVerifierExtension.java | 2 +-
.../component/{http4 => http}/HttpConstants.java | 2 +-
.../{http4 => http}/HttpDeleteWithBodyMethod.java | 2 +-
.../component/{http4 => http}/HttpEndpoint.java | 2 +-
.../{http4 => http}/HttpEntityConverter.java | 2 +-
.../component/{http4 => http}/HttpMethods.java | 4 +-
.../{http4 => http}/HttpPollingConsumer.java | 14 +-
.../component/{http4 => http}/HttpProducer.java | 10 +-
.../{http4 => http}/HttpSendDynamicAware.java | 2 +-
.../camel/component/{http4 => http}/HttpUtil.java | 2 +-
.../component/{http4 => http}/NoopCookieStore.java | 2 +-
.../{http4 => http}/PreemptiveAuthInterceptor.java | 4 +-
.../{http4 => http}/ProxyHttpClientConfigurer.java | 4 +-
.../cloud/HttpServiceExpression.java} | 8 +-
.../cloud/HttpServiceExpressionFactory.java} | 6 +-
.../{http4 => http}/helper/HttpMethodHelper.java | 8 +-
.../camel/component/{http4 => http}/package.html | 0
.../component/{http4 => http}/BaseHttpTest.java | 4 +-
.../component/{http4 => http}/BaseHttpsTest.java | 4 +-
.../CamelComponentVerifierExtensionTest.java | 8 +-
.../CamelComponentVerifierTest.java | 8 +-
.../{http4 => http}/GoogleUrlRewrite.java | 2 +-
.../{http4 => http}/HeaderFilteringTest.java | 2 +-
.../{http4 => http}/HttpAuthenticationTest.java | 22 +--
.../component/{http4 => http}/HttpBodyTest.java | 18 +-
.../HttpBodyWithOtherProtocalNameTest.java | 6 +-
.../{http4 => http}/HttpBridgeEndpointTest.java | 12 +-
.../HttpCamelHeadersNotCopiedTest.java | 4 +-
.../{http4 => http}/HttpCamelHeadersTest.java | 4 +-
.../component/{http4 => http}/HttpCharsetTest.java | 10 +-
.../{http4 => http}/HttpClientConfigurerTest.java | 4 +-
.../{http4 => http}/HttpCompressionTest.java | 10 +-
.../{http4 => http}/HttpConcurrentTest.java | 4 +-
.../HttpCustomComponentNameTest.java | 2 +-
.../{http4 => http}/HttpDefaultPortNumberTest.java | 10 +-
.../HttpDisableStreamCacheTest.java | 10 +-
.../HttpEndpointOptionsNotChangeComponentTest.java | 6 +-
.../{http4 => http}/HttpEndpointURLTest.java | 14 +-
.../HttpInvalidConfigurationTest.java | 6 +-
.../HttpInvalidHttpClientConfigurationTest.java | 6 +-
.../component/{http4 => http}/HttpMethodsTest.java | 14 +-
.../{http4 => http}/HttpNoCamelHeaderTest.java | 2 +-
.../HttpNoConnectionRedeliveryTest.java | 10 +-
.../{http4 => http}/HttpNoConnectionTest.java | 8 +-
.../component/{http4 => http}/HttpPathTest.java | 10 +-
.../{http4 => http}/HttpPollingConsumerTest.java | 26 +--
.../HttpProducerConnectionCloseTest.java | 14 +-
.../HttpProducerContentLengthTest.java | 34 ++--
.../HttpProducerContentTypeTest.java | 22 +--
.../HttpProducerContentTypeWithSemiColomnTest.java | 22 +--
.../HttpProducerExplicitConnectionCloseTest.java | 12 +-
.../HttpProducerSelectMethodTest.java | 18 +-
.../{http4 => http}/HttpProducerSessionTest.java | 10 +-
.../HttpProducerTwoHeadersWithSameKeyTest.java | 6 +-
.../HttpProducerTwoParametersWithSameKeyTest.java | 6 +-
.../HttpProducerWithSystemPropertiesTest.java | 4 +-
.../{http4 => http}/HttpProxyServerTest.java | 6 +-
.../component/{http4 => http}/HttpQueryTest.java | 14 +-
.../{http4 => http}/HttpRedirectTest.java | 8 +-
.../HttpReferenceParameterTest.java | 8 +-
.../{http4 => http}/HttpSNIHostNameTest.java | 4 +-
.../{http4 => http}/HttpSOTimeoutTest.java | 10 +-
.../{http4 => http}/HttpSendDynamicAwareTest.java | 6 +-
.../{http4 => http}/HttpServerTestSupport.java | 4 +-
.../HttpThrowExceptionOnFailureTest.java | 18 +-
.../{http4 => http}/HttpWithHttpUriHeaderTest.java | 10 +-
.../{http4 => http}/HttpsAuthenticationTest.java | 14 +-
.../component/{http4 => http}/HttpsGetTest.java | 10 +-
.../{http4 => http}/HttpsServerTestSupport.java | 3 +-
.../HttpsSslContextParametersGetTest.java | 8 +-
...psTwoComponentsSslContextParametersGetTest.java | 14 +-
...tpsTwoDifferentSslContextParametersGetTest.java | 12 +-
.../ManagedHttpProducerPoolStatsTest.java | 4 +-
.../component/{http4 => http}/UrlRewriteTest.java | 2 +-
.../handler/AuthenticationValidationHandler.java | 4 +-
.../handler/BasicRawQueryValidationHandler.java | 2 +-
.../handler/BasicValidationHandler.java | 4 +-
.../handler/DelayValidationHandler.java | 4 +-
.../handler/DrinkValidationHandler.java | 2 +-
.../handler/HeaderValidationHandler.java | 4 +-
.../ProxyAuthenticationValidationHandler.java | 4 +-
.../handler/SessionReflectionHandler.java | 2 +-
.../{http4 => http}/helper/HttpHelperTest.java | 6 +-
.../rest/RestCamelComponentVerifierTest.java | 8 +-
.../http4/AdviceAndInterceptHttp4IssueTest.java | 95 ----------
.../src/test/resources/log4j2.properties | 2 +-
.../camel/component/http4/CamelHttp4Context.xml | 79 --------
.../camel-jetty/src/main/docs/jetty-component.adoc | 6 +-
.../jetty/HttpAuthMethodPriorityTest.java | 2 +-
.../HttpBasicAuthComponentConfiguredTest.java | 2 +-
...gMapHttpMessageFormUrlEncodedFalseBodyTest.java | 8 +-
...pBindingPreservePostFormUrlEncodedBodyTest.java | 10 +-
.../jetty/HttpBridgeMultipartRouteTest.java | 22 +--
...thBodyTest.java => HttpDeleteWithBodyTest.java} | 6 +-
.../component/jetty/HttpGZipEncodingTest.java | 2 +-
.../component/jetty/MultiThreadedHttpGetTest.java | 6 +-
.../component/jetty/javabody/HttpJavaBodyTest.java | 2 +-
.../rest/producer/Http4RestProducerGetTest.java | 60 -------
.../rest/producer/Http4RestProducerPutTest.java | 53 ------
.../config/CamelMicroProfilePropertiesSource.java | 13 +-
.../CamelMicroProfilePropertiesSourceTest.java | 10 ++
...pBindingPreservePostFormUrlEncodedBodyTest.java | 2 +-
.../http/NettyHttpBindingUseAbsolutePathTest.java | 2 +-
.../NettyHttpBindingUseRelativePathInPostTest.java | 2 +-
.../http/NettyHttpBindingUseRelativePathTest.java | 2 +-
.../camel/component/olingo2/Olingo2Consumer.java | 3 +-
.../olingo2/Olingo2ComponentConsumerTest.java | 111 +++++++++++-
.../camel/component/olingo4/Olingo4Consumer.java | 3 +-
.../olingo4/Olingo4ComponentConsumerTest.java | 144 ++++++++++++++-
.../src/main/docs/properties-component.adoc | 3 +-
.../src/main/docs/pulsar-component.adoc | 9 +-
.../pulsar/DefaultPulsarMessageReceipt.java | 67 +++++++
.../DefaultPulsarMessageReceiptFactory.java} | 20 +--
.../camel/component/pulsar/PulsarComponent.java | 33 ++++
.../camel/component/pulsar/PulsarEndpoint.java | 5 +
.../component/pulsar/PulsarMessageListener.java | 11 +-
.../component/pulsar/PulsarMessageReceipt.java | 70 ++++++++
.../pulsar/PulsarMessageReceiptFactory.java} | 28 ++-
.../pulsar/configuration/PulsarConfiguration.java | 43 +++++
.../consumers/CommonCreationStrategyImpl.java | 3 +
.../pulsar/utils/message/PulsarMessageHeaders.java | 1 +
.../component/pulsar/PulsarComponentTest.java | 14 ++
.../pulsar/PulsarConsumerAcknowledgementTest.java | 200 +++++++++++++++++++++
.../PulsarConsumerNoAcknowledgementTest.java | 103 +++++++++++
.../pulsar/PulsarCustomMessageReceiptTest.java | 135 ++++++++++++++
.../pulsar/PulsarNegativeAcknowledgementTest.java} | 23 +--
.../component/restlet/RestRestletRouterIdTest.java | 2 +-
.../PreservePostFormUrlEncodedBodyTest.java | 10 +-
.../src/main/docs/eips/aggregate-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/choice-eip.adoc | 2 +-
.../src/main/docs/eips/claimCheck-eip.adoc | 2 +-
.../main/docs/eips/content-based-router-eip.adoc | 2 +-
.../src/main/docs/eips/content-filter-eip.adoc | 2 +-
.../src/main/docs/eips/dynamic-router.adoc | 2 +-
.../src/main/docs/eips/dynamicRouter-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/enrich-eip.adoc | 2 +-
.../main/docs/eips/eventDrivenConsumer-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/filter-eip.adoc | 2 +-
.../src/main/docs/eips/otherwise-eip.adoc | 2 +-
.../src/main/docs/eips/pipeline-eip.adoc | 2 +-
.../src/main/docs/eips/recipientList-eip.adoc | 2 +-
.../src/main/docs/eips/requestReply-eip.adoc | 2 +-
.../src/main/docs/eips/resequence-eip.adoc | 2 +-
.../src/main/docs/eips/rollback-eip.adoc | 2 +-
.../src/main/docs/eips/routingSlip-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/split-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/step-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/when-eip.adoc | 2 +-
.../camel-core/src/main/docs/eips/wireTap-eip.adoc | 2 +-
.../apache/camel/language/simple/SimpleTest.java | 2 +-
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/PulsarEndpointBuilderFactory.java | 86 +++++++++
.../modules/ROOT/pages/http-component.adoc | 16 +-
.../modules/ROOT/pages/jetty-component.adoc | 6 +-
.../modules/ROOT/pages/properties-component.adoc | 6 +-
.../modules/ROOT/pages/pulsar-component.adoc | 9 +-
.../modules/ROOT/assets/images/eip/Aggregator.gif | Bin 0 -> 2413 bytes
.../ROOT/assets/images/eip/AggregatorIcon.gif | Bin 0 -> 392 bytes
.../modules/ROOT/assets/images/eip/ChannelIcon.gif | Bin 0 -> 376 bytes
.../assets/images/eip/CompetingConsumersIcon.gif | Bin 0 -> 428 bytes
.../ROOT/assets/images/eip/ContentBasedRouter.gif | Bin 0 -> 2504 bytes
.../assets/images/eip/ContentBasedRouterIcon.gif | Bin 0 -> 356 bytes
.../ROOT/assets/images/eip/ContentFilter.gif | Bin 0 -> 1777 bytes
.../ROOT/assets/images/eip/ContentFilterIcon.gif | Bin 0 -> 375 bytes
.../ROOT/assets/images/eip/ControlBusIcon.gif | Bin 0 -> 764 bytes
.../images/eip/CorrelationIdentifierIcon.gif | Bin 0 -> 375 bytes
.../images/eip/CorrelationIdentifierSolution.gif | Bin 0 -> 4041 bytes
.../ROOT/assets/images/eip/DataEnricher.gif | Bin 0 -> 2703 bytes
.../ROOT/assets/images/eip/DataEnricherIcon.gif | Bin 0 -> 372 bytes
.../assets/images/eip/DeadLetterChannelIcon.gif | Bin 0 -> 519 bytes
.../images/eip/DeadLetterChannelSolution.gif | Bin 0 -> 3557 bytes
.../modules/ROOT/assets/images/eip/DetourIcon.gif | Bin 0 -> 678 bytes
.../images/eip/DistributionAggregateIcon.gif | Bin 0 -> 491 bytes
.../assets/images/eip/DurableSubscriptionIcon.gif | Bin 0 -> 306 bytes
.../ROOT/assets/images/eip/DynamicRouter.gif | Bin 0 -> 7122 bytes
.../ROOT/assets/images/eip/DynamicRouterIcon.gif | Bin 0 -> 654 bytes
.../assets/images/eip/EventDrivenConsumerIcon.gif | Bin 0 -> 388 bytes
.../images/eip/EventDrivenConsumerSolution.gif | Bin 0 -> 2077 bytes
.../ROOT/assets/images/eip/EventMessageIcon.gif | Bin 0 -> 264 bytes
.../assets/images/eip/EventMessageSolution.gif | Bin 0 -> 2843 bytes
.../assets/images/eip/GuaranteedMessagingIcon.gif | Bin 0 -> 312 bytes
.../images/eip/GuaranteedMessagingSolution.gif | Bin 0 -> 4574 bytes
.../ROOT/assets/images/eip/MessageBusIcon.gif | Bin 0 -> 381 bytes
.../ROOT/assets/images/eip/MessageBusSolution.gif | Bin 0 -> 2243 bytes
.../assets/images/eip/MessageChannelSolution.gif | Bin 0 -> 3343 bytes
.../assets/images/eip/MessageDispatcherIcon.gif | Bin 0 -> 431 bytes
.../ROOT/assets/images/eip/MessageEndpointIcon.gif | Bin 0 -> 391 bytes
.../assets/images/eip/MessageEndpointSolution.gif | Bin 0 -> 3816 bytes
.../ROOT/assets/images/eip/MessageFilter.gif | Bin 0 -> 3820 bytes
.../ROOT/assets/images/eip/MessageFilterIcon.gif | Bin 0 -> 497 bytes
.../modules/ROOT/assets/images/eip/MessageIcon.gif | Bin 0 -> 799 bytes
.../ROOT/assets/images/eip/MessageRouter.gif | Bin 0 -> 3340 bytes
.../ROOT/assets/images/eip/MessageSelectorIcon.gif | Bin 0 -> 455 bytes
.../ROOT/assets/images/eip/MessageSolution.gif | Bin 0 -> 1256 bytes
.../ROOT/assets/images/eip/MessageTranslator.gif | Bin 0 -> 2183 bytes
.../assets/images/eip/MessageTranslatorIcon.gif | Bin 0 -> 487 bytes
.../assets/images/eip/MessagingAdapterIcon.gif | Bin 0 -> 388 bytes
.../assets/images/eip/MessagingGatewayIcon.gif | Bin 0 -> 485 bytes
.../ROOT/assets/images/eip/NormalizerIcon.gif | Bin 0 -> 401 bytes
.../ROOT/assets/images/eip/PipesAndFilters.gif | Bin 0 -> 2906 bytes
.../ROOT/assets/images/eip/PipesAndFiltersIcon.gif | Bin 0 -> 455 bytes
.../ROOT/assets/images/eip/PointToPointIcon.gif | Bin 0 -> 147 bytes
.../assets/images/eip/PointToPointSolution.gif | Bin 0 -> 2995 bytes
.../ROOT/assets/images/eip/PollingConsumerIcon.gif | Bin 0 -> 418 bytes
.../assets/images/eip/PollingConsumerSolution.gif | Bin 0 -> 2117 bytes
.../assets/images/eip/PublishSubscribeIcon.gif | Bin 0 -> 227 bytes
.../assets/images/eip/PublishSubscribeSolution.gif | Bin 0 -> 4269 bytes
.../ROOT/assets/images/eip/RecipientList.gif | Bin 0 -> 5065 bytes
.../ROOT/assets/images/eip/RecipientListIcon.gif | Bin 0 -> 368 bytes
.../ROOT/assets/images/eip/RequestReply.gif | Bin 0 -> 3141 bytes
.../ROOT/assets/images/eip/RequestReplyIcon.gif | Bin 0 -> 274 bytes
.../modules/ROOT/assets/images/eip/Resequencer.gif | Bin 0 -> 1965 bytes
.../ROOT/assets/images/eip/ResequencerIcon.gif | Bin 0 -> 435 bytes
.../ROOT/assets/images/eip/ReturnAddressIcon.gif | Bin 0 -> 302 bytes
.../assets/images/eip/ReturnAddressSolution.gif | Bin 0 -> 5867 bytes
.../ROOT/assets/images/eip/RoutingTableIcon.gif | Bin 0 -> 376 bytes
.../ROOT/assets/images/eip/RoutingTableSimple.gif | Bin 0 -> 3459 bytes
.../modules/ROOT/assets/images/eip/Sequencer.gif | Bin 0 -> 2298 bytes
.../ROOT/assets/images/eip/SplitterIcon.gif | Bin 0 -> 397 bytes
.../ROOT/assets/images/eip/StoreInLibrary.gif | Bin 0 -> 6440 bytes
.../ROOT/assets/images/eip/StoreInLibraryIcon.gif | Bin 0 -> 684 bytes
.../assets/images/eip/TransactionalClientIcon.gif | Bin 0 -> 486 bytes
.../images/eip/TransactionalClientSolution.gif | Bin 0 -> 3654 bytes
.../modules/ROOT/assets/images/eip/WireTap.gif | Bin 0 -> 3067 bytes
.../modules/ROOT/assets/images/eip/WireTapIcon.gif | Bin 0 -> 481 bytes
.../modules/ROOT/pages/aggregate-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/choice-eip.adoc | 2 +-
.../modules/ROOT/pages/claimCheck-eip.adoc | 2 +-
.../ROOT/pages/content-based-router-eip.adoc | 2 +-
.../modules/ROOT/pages/content-enricher.adoc | 2 +-
.../modules/ROOT/pages/content-filter-eip.adoc | 2 +-
.../modules/ROOT/pages/correlation-identifier.adoc | 2 +-
.../modules/ROOT/pages/dead-letter-channel.adoc | 2 +-
.../modules/ROOT/pages/dynamic-router.adoc | 2 +-
.../modules/ROOT/pages/dynamicRouter-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/enrich-eip.adoc | 2 +-
.../pages/enterprise-integration-patterns.adoc | 112 ++++++------
.../modules/ROOT/pages/event-message.adoc | 2 +-
.../ROOT/pages/eventDrivenConsumer-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/filter-eip.adoc | 2 +-
.../modules/ROOT/pages/guaranteed-delivery.adoc | 2 +-
.../modules/ROOT/pages/http-session-handling.adoc | 2 +-
.../modules/ROOT/pages/http-session.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/karaf.adoc | 1 -
.../modules/ROOT/pages/message-bus.adoc | 2 +-
.../modules/ROOT/pages/message-channel.adoc | 2 +-
.../modules/ROOT/pages/message-endpoint.adoc | 2 +-
.../modules/ROOT/pages/message-router.adoc | 2 +-
.../modules/ROOT/pages/message-translator.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/message.adoc | 2 +-
.../modules/ROOT/pages/otherwise-eip.adoc | 2 +-
.../modules/ROOT/pages/pipeline-eip.adoc | 2 +-
.../modules/ROOT/pages/point-to-point-channel.adoc | 2 +-
.../modules/ROOT/pages/polling-consumer.adoc | 2 +-
.../ROOT/pages/publish-subscribe-channel.adoc | 2 +-
.../modules/ROOT/pages/recipientList-eip.adoc | 2 +-
.../modules/ROOT/pages/requestReply-eip.adoc | 2 +-
.../modules/ROOT/pages/resequence-eip.adoc | 2 +-
.../modules/ROOT/pages/return-address.adoc | 2 +-
.../modules/ROOT/pages/rollback-eip.adoc | 2 +-
.../modules/ROOT/pages/routingSlip-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/split-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/step-eip.adoc | 2 +-
.../modules/ROOT/pages/transactional-client.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/when-eip.adoc | 2 +-
.../modules/ROOT/pages/wireTap-eip.adoc | 2 +-
parent/pom.xml | 2 +-
.../springboot/HttpComponentAutoConfiguration.java | 4 +-
.../springboot/HttpComponentConfiguration.java | 4 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../springboot/PulsarComponentConfiguration.java | 32 ++++
.../apache/camel/itest/http/Http4EndpointTest.java | 82 ---------
.../itest/http/Http4MaxConnectionPerHostTest.java | 81 ---------
.../apache/camel/itest/http/Http4RouteTest.java | 89 ---------
.../apache/camel/itest/http/HttpEndpointTest.java | 39 +++-
.../itest/http/HttpMaxConnectionPerHostTest.java | 40 ++++-
.../jetty/JettyBridgeHostHeaderIssueTest.java | 2 +-
.../camel/itest/http/Http4EndpointTest-context.xml | 55 ------
.../http/Http4MaxConnectionPerHostTest-context.xml | 46 -----
.../camel/itest/http/HttpEndpointTest-context.xml | 21 ++-
.../http/HttpMaxConnectionPerHostTest-context.xml | 18 +-
290 files changed, 1767 insertions(+), 1273 deletions(-)
[camel] 02/02: CAMEL-13853: fix tests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 091c4b442a158e58fef8133903264335a6f362ac
Author: Jan Bednář <ma...@janbednar.eu>
AuthorDate: Wed Aug 14 00:55:19 2019 +0200
CAMEL-13853: fix tests
---
.../camel/component/elasticsearch/ElasticsearchBaseTest.java | 7 ++++++-
.../component/elasticsearch/ElasticsearchClusterBaseTest.java | 8 ++++++--
.../resources/org/apache/camel/component/jetty/jetty-https.xml | 5 -----
.../camel/component/jetty/jetty-noconnection-redelivery.xml | 5 -----
.../org/apache/camel/component/jetty/jetty-noconnection.xml | 5 -----
.../org/apache/camel/component/netty4/http/BaseNettyTest.java | 2 +-
.../camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml | 5 -----
.../apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml | 5 -----
.../java/org/apache/camel/component/netty4/BaseNettyTest.java | 2 +-
components/camel-undertow/src/test/resources/SpringTest.xml | 5 -----
10 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
index a715284..605981f 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
@@ -46,9 +46,13 @@ public class ElasticsearchBaseTest extends CamelTestSupport {
@BeforeClass
public static void cleanupOnce() throws Exception {
deleteDirectory("target/testcluster/");
+
clusterName = "es-cl-run-" + System.currentTimeMillis();
runner = new ElasticsearchClusterRunner();
+ runner.setMaxHttpPort(-1);
+ runner.setMaxTransportPort(-1);
+
// create ES nodes
runner.onBuild((number, settingsBuilder) -> {
settingsBuilder.put("http.cors.enabled", true);
@@ -56,7 +60,8 @@ public class ElasticsearchBaseTest extends CamelTestSupport {
}).build(newConfigs()
.clusterName(clusterName)
.numOfNode(1)
- .baseHttpPort(ES_BASE_TRANSPORT_PORT)
+ .baseHttpPort(ES_BASE_HTTP_PORT - 1) // ElasticsearchClusterRunner add node id to port, so set it to ES_BASE_HTTP_PORT-1 to start node 1 exactly on ES_BASE_HTTP_PORT
+ .baseTransportPort(ES_BASE_TRANSPORT_PORT - 1) // ElasticsearchClusterRunner add node id to port, so set it to ES_BASE_TRANSPORT_PORT-1 to start node 1 exactly on ES_BASE_TRANSPORT_PORT
.basePath("target/testcluster/"));
// wait for green status
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
index 9a74519..6a3705a 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
@@ -51,6 +51,9 @@ public class ElasticsearchClusterBaseTest extends CamelTestSupport {
// create runner instance
runner = new ElasticsearchClusterRunner();
+ runner.setMaxHttpPort(-1);
+ runner.setMaxTransportPort(-1);
+
// create ES nodes
runner.onBuild((number, settingsBuilder) -> {
settingsBuilder.put("http.cors.enabled", true);
@@ -58,12 +61,13 @@ public class ElasticsearchClusterBaseTest extends CamelTestSupport {
}).build(newConfigs()
.clusterName(clusterName)
.numOfNode(1)
- .baseHttpPort(ES_BASE_HTTP_PORT)
+ .baseHttpPort(ES_BASE_HTTP_PORT - 1) // ElasticsearchClusterRunner add node id to port, so set it to ES_BASE_HTTP_PORT-1 to start node 1 exactly on ES_BASE_HTTP_PORT
+ .baseTransportPort(ES_FIRST_NODE_TRANSPORT_PORT - 1) // ElasticsearchClusterRunner add node id to port, so set it to ES_FIRST_NODE_TRANSPORT_PORT-1 to start node 1 exactly on ES_FIRST_NODE_TRANSPORT_PORT
.basePath("target/testcluster/"));
// wait for green status
runner.ensureGreen();
- restclientbuilder = RestClient.builder(new HttpHost(InetAddress.getByName("127.0.0.1"), ES_FIRST_NODE_TRANSPORT_PORT));
+ restclientbuilder = RestClient.builder(new HttpHost(InetAddress.getByName("127.0.0.1"), ES_BASE_HTTP_PORT));
client = new RestHighLevelClient(restclientbuilder);
restClient = client.getLowLevelClient();
}
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
index df959fb..604abf2 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
@@ -42,11 +42,6 @@
<property name="targetMethod">
<value>getNextAvailable</value>
</property>
- <property name="arguments">
- <list>
- <value>9000</value>
- </list>
- </property>
</bean>
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml
index 7f9113b..4dc5e87 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml
@@ -31,11 +31,6 @@
<property name="targetMethod">
<value>getNextAvailable</value>
</property>
- <property name="arguments">
- <list>
- <value>9000</value>
- </list>
- </property>
</bean>
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml
index 6cee164..8c6fe59 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml
@@ -32,11 +32,6 @@
<property name="targetMethod">
<value>getNextAvailable</value>
</property>
- <property name="arguments">
- <list>
- <value>5000</value>
- </list>
- </property>
</bean>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
index 2342ecc..837bb8b 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
@@ -44,7 +44,7 @@ public class BaseNettyTest extends CamelTestSupport {
private static volatile int port;
- @Before
+ @BeforeClass
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml b/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml
index eec97c1..5c04667 100644
--- a/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml
+++ b/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml
@@ -31,11 +31,6 @@
<property name="targetMethod">
<value>getNextAvailable</value>
</property>
- <property name="arguments">
- <list>
- <value>9000</value>
- </list>
- </property>
</bean>
<bean id="constraint" class="org.apache.camel.component.netty4.http.SecurityConstraintMapping">
diff --git a/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml b/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml
index a62abb4..7a44ad1 100644
--- a/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml
+++ b/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml
@@ -32,11 +32,6 @@
<property name="targetMethod">
<value>getNextAvailable</value>
</property>
- <property name="arguments">
- <list>
- <value>9000</value>
- </list>
- </property>
</bean>
<camel:sslContextParameters id="mySsl">
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
index 7453ba6..f933e73 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
@@ -45,7 +45,7 @@ public class BaseNettyTest extends CamelTestSupport {
private static volatile int port;
- @Before
+ @BeforeClass
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-undertow/src/test/resources/SpringTest.xml b/components/camel-undertow/src/test/resources/SpringTest.xml
index 32177f9..6730454 100644
--- a/components/camel-undertow/src/test/resources/SpringTest.xml
+++ b/components/camel-undertow/src/test/resources/SpringTest.xml
@@ -43,11 +43,6 @@
<property name="targetMethod">
<value>getNextAvailable</value>
</property>
- <property name="arguments">
- <list>
- <value>8800</value>
- </list>
- </property>
</bean>
<bean id="accessLogReceiver" class="io.undertow.server.handlers.accesslog.JBossLoggingAccessLogReceiver"/>