You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2016/03/28 12:31:13 UTC
[27/27] camel git commit: Merge branch 'master' into jdk8-lambdas.
Merge branch 'master' into jdk8-lambdas.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e5f2b28e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e5f2b28e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e5f2b28e
Branch: refs/heads/jdk8-lambdas
Commit: e5f2b28e21a5a800a268df96650caa9e655667a8
Parents: c2b0aa3 95d1531
Author: Raúl Kripalani <ra...@apache.org>
Authored: Mon Mar 28 11:30:14 2016 +0100
Committer: Raúl Kripalani <ra...@apache.org>
Committed: Mon Mar 28 11:30:14 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/CamelContext.java | 17 +
.../camel/component/rest/RestApiEndpoint.java | 2 +-
.../apache/camel/impl/DefaultCamelContext.java | 20 +-
.../camel/util/jsse/CipherSuitesParameters.java | 17 +-
.../jsse/SecureSocketProtocolsParameters.java | 17 +-
.../camel/impl/DefaultCamelContextTest.java | 20 +
.../util/jsse/SSLContextParametersTest.java | 333 +++++------
components/camel-context/pom.xml | 2 +-
...ractBaseSSLContextParametersFactoryBean.java | 42 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/docs/freemarker.adoc | 4 +
.../camel-ganglia/src/main/docs/ganglia.adoc | 4 +
.../google/drive/GoogleDriveEndpoint.java | 2 +-
.../component/hystrix/CamelHystrixCommand.java | 22 +-
.../component/hystrix/HystrixConfiguration.java | 48 +-
.../component/hystrix/HystrixConstants.java | 62 ++-
.../component/hystrix/HystrixProducer.java | 255 ++++++---
.../component/hystrix/HystrixComponentBase.java | 50 ++
.../hystrix/HystrixComponentCacheTest.java | 84 +++
.../HystrixComponentCircuitBreakerTest.java | 30 +-
.../hystrix/HystrixComponentFallbackTest.java | 98 ++++
.../HystrixComponentRequestContextTest.java | 25 +-
.../component/hystrix/HystrixComponentTest.java | 154 ------
.../hystrix/HystrixComponentTimeOutTest.java | 98 ++++
.../camel/component/ignite/IgniteComponent.java | 15 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
.../camel/swagger/RestSwaggerProcessor.java | 9 +-
.../camel/swagger/RestSwaggerSupport.java | 48 +-
.../swagger/SwaggerRestApiProcessorFactory.java | 8 +-
.../swagger/servlet/RestSwaggerCorsFilter.java | 68 ++-
.../swagger/servlet/RestSwaggerServlet.java | 9 +-
parent/pom.xml | 4 +-
.../features/src/main/resources/features.xml | 23 +-
tests/camel-itest-karaf/pom.xml | 17 +-
tests/camel-itest-karaf/run-tests.sh | 74 +++
.../camel/itest/karaf/AbstractFeatureTest.java | 250 ++++++---
.../apache/camel/itest/karaf/CamelAhcTest.java | 11 +-
.../camel/itest/karaf/CamelAhcWsTest.java | 7 -
.../apache/camel/itest/karaf/CamelAmqpTest.java | 7 -
.../apache/camel/itest/karaf/CamelApnsTest.java | 7 -
.../karaf/CamelAtmosphereWebsocketTest.java | 8 +-
.../apache/camel/itest/karaf/CamelAtomTest.java | 7 -
.../apache/camel/itest/karaf/CamelAvroTest.java | 13 -
.../apache/camel/itest/karaf/CamelAwsTest.java | 23 +-
.../apache/camel/itest/karaf/CamelBamTest.java | 9 +-
.../camel/itest/karaf/CamelBarcodeTest.java | 14 -
.../camel/itest/karaf/CamelBase64Test.java | 13 -
.../itest/karaf/CamelBeanValidatorTest.java | 7 -
.../camel/itest/karaf/CamelBeanioTest.java | 13 -
.../camel/itest/karaf/CamelBeanstalkTest.java | 7 -
.../camel/itest/karaf/CamelBindyTest.java | 19 +-
.../apache/camel/itest/karaf/CamelBoonTest.java | 13 -
.../apache/camel/itest/karaf/CamelBoxTest.java | 7 -
.../camel/itest/karaf/CamelBraintreeTest.java | 7 -
.../camel/itest/karaf/CamelCacheTest.java | 7 -
.../camel/itest/karaf/CamelCassandraqlTest.java | 9 +-
.../camel/itest/karaf/CamelCastorTest.java | 13 -
.../camel/itest/karaf/CamelChunkTest.java | 6 -
.../camel/itest/karaf/CamelCmSmsTest.java | 11 +-
.../apache/camel/itest/karaf/CamelCmisTest.java | 7 +-
.../camel/itest/karaf/CamelCometdTest.java | 7 -
.../camel/itest/karaf/CamelContextTest.java | 7 -
.../camel/itest/karaf/CamelCouchDBTest.java | 7 -
.../camel/itest/karaf/CamelCryptoTest.java | 13 -
.../apache/camel/itest/karaf/CamelCsvTest.java | 14 -
.../apache/camel/itest/karaf/CamelCxfTest.java | 13 +-
.../camel/itest/karaf/CamelDisruptorTest.java | 13 +-
.../apache/camel/itest/karaf/CamelDnsTest.java | 7 -
.../camel/itest/karaf/CamelDockerTest.java | 7 -
.../camel/itest/karaf/CamelDozerTest.java | 7 -
.../camel/itest/karaf/CamelDropboxTest.java | 11 +-
.../itest/karaf/CamelElasticsearchTest.java | 9 +-
.../camel/itest/karaf/CamelElsqlTest.java | 9 +-
.../apache/camel/itest/karaf/CamelEtcdTest.java | 7 -
.../camel/itest/karaf/CamelEventadminTest.java | 9 +-
.../apache/camel/itest/karaf/CamelExecTest.java | 9 +-
.../camel/itest/karaf/CamelFacebookTest.java | 7 -
.../camel/itest/karaf/CamelFlatpackTest.java | 13 -
.../apache/camel/itest/karaf/CamelFopTest.java | 7 -
.../camel/itest/karaf/CamelFreemarkerTest.java | 7 -
.../apache/camel/itest/karaf/CamelFtpTest.java | 11 +-
.../camel/itest/karaf/CamelGangliaTest.java | 7 -
.../camel/itest/karaf/CamelGeocoderTest.java | 7 -
.../apache/camel/itest/karaf/CamelGitTest.java | 7 -
.../camel/itest/karaf/CamelGithubTest.java | 7 -
.../itest/karaf/CamelGoogleCalendarTest.java | 7 -
.../camel/itest/karaf/CamelGoogleDriveTest.java | 7 -
.../camel/itest/karaf/CamelGoogleMailTest.java | 7 -
.../camel/itest/karaf/CamelGroovyTest.java | 7 -
.../apache/camel/itest/karaf/CamelGsonTest.java | 18 +-
.../itest/karaf/CamelGuavaEventBusTest.java | 7 -
.../camel/itest/karaf/CamelGuiceTest.java | 11 +-
.../camel/itest/karaf/CamelHazelcastTest.java | 7 -
.../camel/itest/karaf/CamelHbaseTest.java | 7 -
.../camel/itest/karaf/CamelHdfs2Test.java | 7 -
.../apache/camel/itest/karaf/CamelHdfsTest.java | 7 -
.../camel/itest/karaf/CamelHessianTest.java | 13 -
.../camel/itest/karaf/CamelHipchatTest.java | 7 -
.../apache/camel/itest/karaf/CamelHl7Test.java | 13 -
.../camel/itest/karaf/CamelHttp4Test.java | 7 -
.../apache/camel/itest/karaf/CamelHttpTest.java | 7 -
.../camel/itest/karaf/CamelHystrixTest.java | 35 ++
.../camel/itest/karaf/CamelIbatisTest.java | 7 -
.../apache/camel/itest/karaf/CamelIcalTest.java | 13 -
.../camel/itest/karaf/CamelIgniteTest.java | 18 +-
.../camel/itest/karaf/CamelInfinispanTest.java | 8 +-
.../apache/camel/itest/karaf/CamelIrcTest.java | 7 -
.../camel/itest/karaf/CamelJCacheTest.java | 8 +-
.../camel/itest/karaf/CamelJacksonTest.java | 15 +-
.../camel/itest/karaf/CamelJacksonxmlTest.java | 12 -
.../camel/itest/karaf/CamelJasyptTest.java | 8 +-
.../apache/camel/itest/karaf/CamelJaxbTest.java | 12 -
.../apache/camel/itest/karaf/CamelJbpmTest.java | 7 -
.../camel/itest/karaf/CamelJcloudsTest.java | 6 -
.../apache/camel/itest/karaf/CamelJcrTest.java | 6 -
.../itest/karaf/CamelJdbcAggregatorTest.java | 41 --
.../apache/camel/itest/karaf/CamelJdbcTest.java | 6 -
.../camel/itest/karaf/CamelJetty8Test.java | 41 --
.../camel/itest/karaf/CamelJetty9Test.java | 40 --
.../camel/itest/karaf/CamelJettyTest.java | 6 -
.../camel/itest/karaf/CamelJgroupsTest.java | 6 -
.../apache/camel/itest/karaf/CamelJibxTest.java | 12 -
.../apache/camel/itest/karaf/CamelJingTest.java | 6 -
.../apache/camel/itest/karaf/CamelJmsTest.java | 6 -
.../apache/camel/itest/karaf/CamelJmxTest.java | 6 -
.../apache/camel/itest/karaf/CamelJoltTest.java | 6 -
.../camel/itest/karaf/CamelJosqlTest.java | 8 +-
.../apache/camel/itest/karaf/CamelJpaTest.java | 6 -
.../camel/itest/karaf/CamelJsonpathTest.java | 6 -
.../camel/itest/karaf/CamelJt400Test.java | 6 -
.../apache/camel/itest/karaf/CamelJuelTest.java | 8 +-
.../camel/itest/karaf/CamelJxpathTest.java | 6 -
.../camel/itest/karaf/CamelKafkaTest.java | 6 -
.../camel/itest/karaf/CamelKratiTest.java | 6 -
.../camel/itest/karaf/CamelKubernetesTest.java | 6 -
.../apache/camel/itest/karaf/CamelLdapTest.java | 6 -
.../camel/itest/karaf/CamelLinkedinTest.java | 8 +-
.../camel/itest/karaf/CamelLuceneTest.java | 10 +-
.../apache/camel/itest/karaf/CamelLzfTest.java | 12 -
.../apache/camel/itest/karaf/CamelMailTest.java | 10 +-
.../camel/itest/karaf/CamelMetricsTest.java | 6 -
.../camel/itest/karaf/CamelMina2Test.java | 6 -
.../apache/camel/itest/karaf/CamelMinaTest.java | 6 -
.../apache/camel/itest/karaf/CamelMllpTest.java | 6 -
.../camel/itest/karaf/CamelMongodbTest.java | 6 -
.../apache/camel/itest/karaf/CamelMqttTest.java | 6 -
.../apache/camel/itest/karaf/CamelMsvTest.java | 6 -
.../camel/itest/karaf/CamelMustacheTest.java | 6 -
.../apache/camel/itest/karaf/CamelMvelTest.java | 6 -
.../camel/itest/karaf/CamelMyBatisTest.java | 6 -
.../apache/camel/itest/karaf/CamelNatsTest.java | 6 -
.../camel/itest/karaf/CamelNetty4HttpTest.java | 6 -
.../camel/itest/karaf/CamelNetty4Test.java | 6 -
.../camel/itest/karaf/CamelNettyHttpTest.java | 6 -
.../camel/itest/karaf/CamelNettyTest.java | 6 -
.../apache/camel/itest/karaf/CamelOgnlTest.java | 6 -
.../camel/itest/karaf/CamelOlingo2Test.java | 8 +-
.../camel/itest/karaf/CamelOpenshiftTest.java | 6 -
.../camel/itest/karaf/CamelOptaplannerTest.java | 6 -
.../apache/camel/itest/karaf/CamelPahoTest.java | 6 -
.../camel/itest/karaf/CamelPaxloggingTest.java | 6 -
.../apache/camel/itest/karaf/CamelPdfTest.java | 6 -
.../camel/itest/karaf/CamelPgeventTest.java | 6 -
.../camel/itest/karaf/CamelPrinterTest.java | 8 +-
.../camel/itest/karaf/CamelProtobufTest.java | 12 -
.../camel/itest/karaf/CamelQuartz2Test.java | 6 -
.../camel/itest/karaf/CamelQuartzTest.java | 6 -
.../camel/itest/karaf/CamelQuickFixTest.java | 6 -
.../camel/itest/karaf/CamelRabbitmqTest.java | 7 -
.../camel/itest/karaf/CamelRestletTest.java | 6 -
.../apache/camel/itest/karaf/CamelRmiTest.java | 6 -
.../camel/itest/karaf/CamelRouteboxTest.java | 6 -
.../apache/camel/itest/karaf/CamelRssTest.java | 6 -
.../apache/camel/itest/karaf/CamelRxTest.java | 8 +-
.../camel/itest/karaf/CamelSalesforceTest.java | 6 -
.../itest/karaf/CamelSapNetweaverTest.java | 6 -
.../camel/itest/karaf/CamelSaxonTest.java | 10 +-
.../camel/itest/karaf/CamelScalaTest.java | 9 +-
.../camel/itest/karaf/CamelSchematronTest.java | 6 -
.../camel/itest/karaf/CamelScriptTest.java | 10 +-
.../camel/itest/karaf/CamelServicenowTest.java | 6 -
.../camel/itest/karaf/CamelServletTest.java | 6 -
.../apache/camel/itest/karaf/CamelSipTest.java | 6 -
.../apache/camel/itest/karaf/CamelSjmsTest.java | 6 -
.../camel/itest/karaf/CamelSlackTest.java | 6 -
.../apache/camel/itest/karaf/CamelSmppTest.java | 6 -
.../camel/itest/karaf/CamelSnakeyamlTest.java | 11 +-
.../apache/camel/itest/karaf/CamelSnmpTest.java | 6 -
.../apache/camel/itest/karaf/CamelSoapTest.java | 15 +-
.../apache/camel/itest/karaf/CamelSolrTest.java | 6 -
.../camel/itest/karaf/CamelSplunkTest.java | 6 -
.../camel/itest/karaf/CamelSpringBatchTest.java | 6 -
.../itest/karaf/CamelSpringJavaconfigTest.java | 9 +-
.../camel/itest/karaf/CamelSpringLdapTest.java | 7 -
.../camel/itest/karaf/CamelSpringRedisTest.java | 6 -
.../itest/karaf/CamelSpringWebServiceTest.java | 6 -
.../apache/camel/itest/karaf/CamelSqlTest.java | 6 -
.../apache/camel/itest/karaf/CamelSshTest.java | 6 -
.../apache/camel/itest/karaf/CamelStAXTest.java | 6 -
.../camel/itest/karaf/CamelStompTest.java | 6 -
.../camel/itest/karaf/CamelStreamTest.java | 6 -
.../itest/karaf/CamelStringTemplateTest.java | 6 -
.../camel/itest/karaf/CamelSwaggerJavaTest.java | 8 +-
.../camel/itest/karaf/CamelSwaggerTest.java | 8 +-
.../camel/itest/karaf/CamelSyslogTest.java | 12 -
.../camel/itest/karaf/CamelTagsoupTest.java | 15 +-
.../camel/itest/karaf/CamelTarfileTest.java | 12 -
.../camel/itest/karaf/CamelTestSpringTest.java | 8 +-
.../apache/camel/itest/karaf/CamelTestTest.java | 8 +-
.../camel/itest/karaf/CamelTwitterTest.java | 6 -
.../camel/itest/karaf/CamelUndertowTest.java | 7 +-
.../itest/karaf/CamelUnivocityParsersTest.java | 35 ++
.../camel/itest/karaf/CamelUrlrewriteTest.java | 8 +-
.../camel/itest/karaf/CamelVelocityTest.java | 6 -
.../camel/itest/karaf/CamelVertxTest.java | 12 +-
.../camel/itest/karaf/CamelWeatherTest.java | 6 -
.../camel/itest/karaf/CamelWebsocketTest.java | 6 -
.../camel/itest/karaf/CamelXmlbeansTest.java | 8 +-
.../camel/itest/karaf/CamelXmljsonTest.java | 12 -
.../camel/itest/karaf/CamelXmlrpcTest.java | 6 -
.../camel/itest/karaf/CamelXmlsecurityTest.java | 14 +-
.../apache/camel/itest/karaf/CamelXmppTest.java | 6 -
.../camel/itest/karaf/CamelXstreamTest.java | 21 +-
.../apache/camel/itest/karaf/CamelYamlTest.java | 17 +-
.../camel/itest/karaf/CamelYammerTest.java | 6 -
.../camel/itest/karaf/CamelZipfileTest.java | 12 -
.../camel/itest/karaf/CamelZookeeperTest.java | 6 -
.../test/resources/OSGI-INF/blueprint/camel.xml | 10 +
.../src/test/resources/jre.properties | 551 +++++++++++++++++++
.../tools/apt/AbstractAnnotationProcessor.java | 3 +-
232 files changed, 2009 insertions(+), 2217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e5f2b28e/components/camel-context/pom.xml
----------------------------------------------------------------------
diff --cc components/camel-context/pom.xml
index 986e74e,f2bf700..544a1ea
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@@ -25,9 -25,9 +25,9 @@@
</parent>
<artifactId>camel-context</artifactId>
- <name>Camel :: Context</name>
+ <name>Camel :: Context (deprecated)</name>
<description>Camel Context component to expose CamelContext objects as a black box Component for use in other routes</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.context.*</camel.osgi.export.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/e5f2b28e/parent/pom.xml
----------------------------------------------------------------------