Merge branch 'master' into swagger
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5595ed62 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5595ed62 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5595ed62 Branch: refs/heads/master Commit: 5595ed626fb1c1589c5b584285db41f5a9ce0e69 Parents: cfe0909 625eb8d Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Aug 8 09:58:46 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Aug 8 09:58:46 2014 +0200 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 + .../src/main/descriptors/common-bin.xml | 1 + camel-core/pom.xml | 44 +-- .../java/org/apache/camel/CamelContext.java | 13 +- .../src/main/java/org/apache/camel/Route.java | 1 + .../management/mbean/CamelOpenMBeanTypes.java | 16 +- .../mbean/ManagedRestRegistryMBean.java | 32 +++ .../org/apache/camel/builder/RouteBuilder.java | 6 +- .../camel/component/rest/RestComponent.java | 24 +- .../camel/component/rest/RestEndpoint.java | 96 ++++++- .../apache/camel/impl/DefaultCamelContext.java | 14 +- .../apache/camel/impl/DefaultRestRegistry.java | 181 +++++++++++++ .../apache/camel/impl/DefaultRouteContext.java | 5 + .../camel/impl/ScheduledPollConsumer.java | 2 +- .../DefaultManagementLifecycleStrategy.java | 4 + .../management/mbean/ManagedRestRegistry.java | 83 ++++++ .../model/rest/RestConfigurationDefinition.java | 47 ++++ .../apache/camel/model/rest/RestDefinition.java | 84 +++--- .../camel/model/rest/RestHostNameResolver.java | 28 ++ .../camel/model/rest/RestsDefinition.java | 2 +- .../org/apache/camel/spi/RestConfiguration.java | 54 ++++ .../apache/camel/spi/RestConsumerFactory.java | 5 +- .../java/org/apache/camel/spi/RestRegistry.java | 134 +++++++++ .../java/org/apache/camel/util/HostUtils.java | 119 ++++++++ .../org/apache/camel/model/rest/jaxb.index | 1 + .../rest/DummyRestConsumerFactory.java | 9 +- .../rest/FromRestExplicitComponentTest.java | 2 +- .../rest/FromRestGetEmbeddedRouteTest.java | 4 +- .../component/rest/FromRestGetEndPathTest.java | 4 +- .../camel/component/rest/FromRestGetTest.java | 4 +- .../component/rest/FromRestUriPrefixTest.java | 12 +- .../impl/MultipleLifecycleStrategyTest.java | 2 +- .../ManagedFromRestGetEmbeddedRouteTest.java | 4 +- .../management/ManagedFromRestGetTest.java | 4 +- ...roducerRouteAddRemoveRegisterAlwaysTest.java | 6 +- .../management/ManagedRestRegistryTest.java | 98 +++++++ .../management/ManagedRouteAddRemoveTest.java | 42 +-- .../apache/camel/model/XmlRestParseTest.java | 2 +- .../org/apache/camel/model/simpleRest.xml | 2 +- .../camel/blueprint/BlueprintJaxbRestTest.java | 4 +- .../src/test/resources/test-rest.xml | 4 +- .../camel/component/jdbc/JdbcProducer.java | 16 +- ...ucerOutputTypeSelectListOutputClassTest.java | 63 +++++ .../component/jetty/JettyHttpComponent.java | 25 +- ...JettyRestServletResolveConsumerStrategy.java | 79 +++++- .../jetty/rest/RestPathMatchingTest.java | 84 ++++-- .../jms/DefaultJmsMessageListenerContainer.java | 37 ++- .../jms/DefaultQueueBrowseStrategy.java | 23 ++ .../camel/component/jms/JmsQueueEndpoint.java | 6 +- .../component/jms/QueueBrowseStrategy.java | 2 + .../ExclusiveQueueMessageListenerContainer.java | 3 +- .../SharedQueueMessageListenerContainer.java | 5 +- .../jms/reply/TemporaryQueueReplyManager.java | 3 +- .../camel/component/jms/CamelJmsTestHelper.java | 24 +- ...uestReplyTempQueueMultipleConsumersTest.java | 2 +- .../camel/component/jms/JmsSelectorInTest.java | 6 +- .../component/jms/JmsTransactedRouteTest.java | 2 +- .../component/jms/ManagedJmsEndpointTest.java | 2 +- .../JmsBlockedAsyncRoutingEngineTest.java | 2 +- .../jms/issues/JmsTXForceShutdownIssueTest.xml | 3 +- ...nErrorHandlerRedeliveryDelayTest-context.xml | 2 +- .../org/apache/camel/component/jms/spring.xml | 2 +- .../jms/tx/AbstractTransactionTest.xml | 4 +- .../tx/ActiveMQWithoutTransactionManager.xml | 2 +- .../jms/tx/JMSTransactionErrorHandlerTest.xml | 2 +- ...MSTransactionIsTransactedRedeliveredTest.xml | 2 +- .../jms/tx/JMSTransactionRollbackTest.xml | 2 +- .../JMSTransactionThrottlingRoutePolicyTest.xml | 2 +- .../jms/tx/JMSTransactionalClientTest.xml | 2 +- .../JMSTransactionalClientWithRollbackTest.xml | 2 +- .../jms/tx/JMXTXUseOriginalBodyTest.xml | 2 +- ...TXUseOriginalBodyWithDLCErrorHandlerTest.xml | 2 +- ...XTXUseOriginalBodyWithTXErrorHandlerTest.xml | 2 +- .../jms/tx/JmsToJmsTransactedSecurityTest.xml | 2 +- .../component/jms/tx/JmsToJmsTransactedTest.xml | 2 +- .../component/jms/tx/JmsTransacted-context.xml | 2 +- .../component/jms/tx/RouteIdTransactedTest.xml | 2 +- .../jms/tx/TransactedAsyncUsingThreadsTest.xml | 2 +- ...ctionErrorHandlerBuilderAsSpringBeanTest.xml | 2 +- ...tionErrorHandlerCustomerSpringParserTest.xml | 2 +- .../TransactionInterceptSendToEndpointTest.xml | 2 +- .../tx/TransactionMinimalConfigurationTest.xml | 2 +- components/camel-metrics/README.md | 271 +++++++++++++++++++ components/camel-metrics/pom.xml | 99 +++++++ .../metrics/AbstractMetricsEndpoint.java | 53 ++++ .../metrics/AbstractMetricsProducer.java | 72 +++++ .../component/metrics/MetricsComponent.java | 128 +++++++++ .../component/metrics/MetricsConstants.java | 32 +++ .../camel/component/metrics/MetricsType.java | 53 ++++ .../metrics/counter/CounterEndpoint.java | 66 +++++ .../metrics/counter/CounterProducer.java | 52 ++++ .../metrics/histogram/HistogramEndpoint.java | 55 ++++ .../metrics/histogram/HistogramProducer.java | 50 ++++ .../component/metrics/meter/MeterEndpoint.java | 55 ++++ .../component/metrics/meter/MeterProducer.java | 45 +++ .../component/metrics/timer/TimerEndpoint.java | 59 ++++ .../component/metrics/timer/TimerProducer.java | 86 ++++++ .../services/org/apache/camel/component/metrics | 18 ++ .../metrics/AbstractMetricsEndpointTest.java | 105 +++++++ .../metrics/AbstractMetricsProducerTest.java | 186 +++++++++++++ .../metrics/MetricComponentSpringTest.java | 91 +++++++ .../metrics/MetricsComponentRouteTest.java | 113 ++++++++ .../component/metrics/MetricsComponentTest.java | 217 +++++++++++++++ .../component/metrics/MetricsTypeTest.java | 34 +++ .../metrics/counter/CounterEndpointTest.java | 102 +++++++ .../metrics/counter/CounterProducerTest.java | 195 +++++++++++++ .../metrics/counter/CounterRouteTest.java | 210 ++++++++++++++ .../histogram/HistogramEndpointTest.java | 88 ++++++ .../histogram/HistogramProducerTest.java | 125 +++++++++ .../metrics/histogram/HistogramRouteTest.java | 124 +++++++++ .../metrics/meter/MeterEndpointTest.java | 89 ++++++ .../metrics/meter/MeterProducerTest.java | 126 +++++++++ .../component/metrics/meter/MeterRouteTest.java | 166 ++++++++++++ .../metrics/timer/TimerEndpointTest.java | 89 ++++++ .../metrics/timer/TimerProducerTest.java | 229 ++++++++++++++++ .../component/metrics/timer/TimerRouteTest.java | 145 ++++++++++ .../src/test/resources/log4j.properties | 40 +++ .../netty/http/NettyHttpComponent.java | 26 +- .../netty/handlers/ClientChannelHandler.java | 1 - .../optaplanner/OptaPlannerComponent.java | 3 +- .../optaplanner/OptaPlannerEndpoint.java | 5 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- .../component/optaplanner/OptaPlannerTest.java | 3 +- .../component/optaplanner/solverConfig.xml | 8 +- .../camel/component/quartz/QuartzComponent.java | 6 +- .../camel/component/quartz/QuartzEndpoint.java | 6 + ...ponentConfigurationAndDocumentationTest.java | 57 ++++ .../component/restlet/MethodBasedRouter.java | 6 +- .../component/restlet/RestletComponent.java | 26 +- .../RestletMultiMethodsEndpointTest.java | 20 ++ .../restlet/RestletRouteBuilderTest.java | 10 + .../restlet/SpringRestRestletPojoInOutTest.xml | 2 +- .../component/servlet/ServletComponent.java | 15 +- ...rvletRestServletResolveConsumerStrategy.java | 81 +++++- .../component/sparkrest/SparkComponent.java | 20 +- .../apache/camel/spring/SpringRouteBuilder.java | 12 +- .../spring/handler/CamelNamespaceHandler.java | 2 +- .../camel/component/rest/RestRefTest.java | 4 +- .../spring/LifecycleStrategyInjectionTest.java | 2 +- .../MultipleLifecycleStrategyInjectionTest.java | 2 +- .../apache/camel/component/rest/RestRefTest.xml | 4 +- .../rest/SpringFromRestConfigurationTest.xml | 4 +- .../rest/SpringFromRestGetEmbeddedRouteTest.xml | 4 +- .../component/rest/SpringFromRestGetTest.xml | 4 +- .../rest/SpringFromRestUriPrefixTest.xml | 6 +- .../sql/DefaultSqlPrepareStatementStrategy.java | 30 +- .../rest/DummyRestConsumerFactory.java | 9 +- .../rest/FromRestGetEmbeddedRouteTest.java | 4 +- .../component/rest/FromRestGetTest.java | 4 +- .../component/rest/FromRestUriPrefixTest.java | 8 +- .../blueprint/component/rest/RestRefTest.java | 4 +- .../rest/FromRestConfigurationTest.xml | 4 +- .../rest/FromRestGetEmbeddedRouteTest.xml | 4 +- .../component/rest/FromRestGetTest.xml | 4 +- .../component/rest/FromRestUriPrefixTest.xml | 6 +- .../blueprint/component/rest/RestRefTest.xml | 4 +- components/pom.xml | 1 + .../pojo_messaging/DistributeRecordsBean.java | 9 +- .../SendFileRecordsToQueueBean.java | 11 +- .../resources/META-INF/spring/camel-context.xml | 4 +- .../README.txt | 5 +- .../camel-example-servlet-rest-tomcat/pom.xml | 2 + .../camel/example/rest/UserRouteBuilder.java | 20 +- .../src/main/resources/camel-config-xml.xml | 23 +- .../src/main/webapp/index.html | 21 +- parent/pom.xml | 19 +- .../features/src/main/resources/features.xml | 8 +- .../camel/itest/karaf/AbstractFeatureTest.java | 2 +- .../camel/itest/karaf/CamelMetricsTest.java | 40 +++ .../itest/osgi/OSGiIntegrationTestSupport.java | 2 +- .../itest/hawtdb/JmsToHawtDBAggregateTest.xml | 2 +- .../JettyJmsShutdownInProgressTest-context.xml | 1 + .../jetty/JettyJmsShutdownTest-context.xml | 1 + .../jms/AdviceWithTransactionIssueTest.xml | 2 +- .../camel/itest/jms/FileToJmsTest-context.xml | 2 +- ...MSTransactionIsTransactedRedeliveredTest.xml | 2 +- .../jms/JmsPollingConsumerTest-context.xml | 2 +- .../camel/itest/tx/JmsToHttpTXTest-context.xml | 2 +- ...actionErrorHandlerConfiguredTest-context.xml | 2 +- .../JmsToHttpTXWithOnExceptionTest-context.xml | 2 +- .../tx/JmsToHttpTXWithRollbackTest-context.xml | 2 +- .../org/apache/camel/maven/JavadocParser.java | 4 +- 182 files changed, 5540 insertions(+), 377 deletions(-) ----------------------------------------------------------------------
