Merge branch 'master' into camel-metrics
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/85cc550f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/85cc550f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/85cc550f Branch: refs/heads/master Commit: 85cc550fd73a6809b07d43686ddad1e9f004d242 Parents: 838eb59 e8fb927 Author: Lauri Kimmel <lauri.kim...@gmx.com> Authored: Wed Jul 30 20:29:57 2014 +1000 Committer: Lauri Kimmel <lauri.kim...@gmx.com> Committed: Wed Jul 30 20:29:57 2014 +1000 ---------------------------------------------------------------------- apache-camel/pom.xml | 24 ++- .../src/main/descriptors/common-bin.xml | 1 + .../camel/FailedToCreateRouteException.java | 10 +- .../camel/component/rest/RestEndpoint.java | 12 +- .../apache/camel/impl/DefaultCamelContext.java | 2 +- .../apache/camel/impl/DefaultRouteContext.java | 7 + .../apache/camel/impl/DefaultUnitOfWork.java | 17 ++ .../language/tokenizer/XMLTokenizeLanguage.java | 1 + .../model/language/XMLTokenizerExpression.java | 6 + .../camel/model/rest/RestBindingDefinition.java | 169 ++++++++------- .../model/rest/RestConfigurationDefinition.java | 79 ++++++++ .../apache/camel/model/rest/RestDefinition.java | 114 ++++++++--- .../apache/camel/model/rest/VerbDefinition.java | 38 ++-- .../camel/processor/CamelInternalProcessor.java | 29 +++ .../processor/binding/RestBindingProcessor.java | 186 +++++++++++++---- .../org/apache/camel/spi/RestConfiguration.java | 59 +++++- .../apache/camel/spi/RestConsumerFactory.java | 7 +- .../camel/spi/SynchronizationRouteAware.java | 58 ++++++ .../java/org/apache/camel/spi/UnitOfWork.java | 17 ++ .../camel/support/SynchronizationAdapter.java | 12 +- .../org/apache/camel/util/UnitOfWorkHelper.java | 52 +++++ .../mock/MockEndpointTimeClauseTest.java | 36 +++- .../rest/DummyRestConsumerFactory.java | 4 +- .../rest/FromRestGetEmbeddedRouteTest.java | 4 +- .../component/rest/FromRestGetEndPathTest.java | 2 +- .../camel/component/rest/FromRestGetTest.java | 3 +- .../management/ManagedFromRestGetTest.java | 3 +- .../RouteAwareSynchronizationTest.java | 97 +++++++++ .../websocket/CamelWebSocketServlet.java | 2 +- .../handler/CamelNamespaceHandler.java | 54 ++++- .../camel/core/osgi/OsgiCamelContextHelper.java | 2 +- .../camel/core/osgi/OsgiClassResolver.java | 20 +- .../camel/core/osgi/CamelOsgiTestSupport.java | 2 +- .../camel/component/http/CamelServlet.java | 41 ++-- .../HttpServletResolveConsumerStrategy.java | 46 +++++ .../http/ServletResolveConsumerStrategy.java | 37 ++++ .../component/jackson/JacksonDataFormat.java | 13 ++ .../jackson/JacksonMarshalAllowJMSTypeTest.java | 2 +- .../JacksonMarshalUnmarshalTypeHeaderTest.java | 2 +- components/camel-jetty/pom.xml | 11 + .../jetty/CamelContinuationServlet.java | 2 +- .../component/jetty/CamelFilterWrapper.java | 1 - .../component/jetty/CamelMultipartFilter.java | 1 + .../component/jetty/JettyHttpComponent.java | 78 ++++++- .../component/jetty/JettyRestHttpBinding.java | 68 +++++++ ...JettyRestServletResolveConsumerStrategy.java | 103 ++++++++++ .../camel/component/jetty/rest/CountryPojo.java | 40 ++++ .../RestJettyBindingModeAutoWithJsonTest.java | 59 ++++++ .../RestJettyBindingModeAutoWithXmlTest.java | 59 ++++++ .../rest/RestJettyBindingModeJsonTest.java | 75 +++++++ .../jetty/rest/RestJettyBindingModeXmlTest.java | 75 +++++++ .../component/jetty/rest/RestJettyGetTest.java | 56 +++++ .../jetty/rest/RestJettyPojoInOutTest.java | 53 +++++ .../rest/RestJettyPostJsonJaxbPojoTest.java | 61 ++++++ .../rest/RestJettyPostJsonPojoListTest.java | 67 ++++++ .../jetty/rest/RestJettyPostJsonPojoTest.java | 61 ++++++ .../rest/RestJettyPostXmlJaxbPojoTest.java | 79 ++++++++ .../jetty/rest/RestPathMatchingTest.java | 55 +++++ .../component/jetty/rest/UserJaxbPojo.java | 48 +++++ .../camel/component/jetty/rest/UserPojo.java | 40 ++++ .../camel/component/jetty/rest/UserService.java | 33 +++ .../jms/reply/CorrelationTimeoutMap.java | 8 +- .../apache/camel/component/jpa/JpaConsumer.java | 2 + components/camel-netty-http/pom.xml | 11 + .../netty/http/DefaultContextPathMatcher.java | 4 + .../netty/http/DefaultNettyHttpBinding.java | 32 +-- .../netty/http/NettyHttpComponent.java | 86 +++++++- .../netty/http/NettyHttpConverter.java | 2 +- .../component/netty/http/NettyHttpHelper.java | 4 +- .../netty/http/RestContextPathMatcher.java | 95 +++++++++ .../netty/http/RestNettyHttpBinding.java | 91 +++++++++ .../http/SecurityAuthenticatorSupport.java | 2 +- .../http/handlers/HttpClientChannelHandler.java | 6 +- .../http/handlers/HttpServerChannelHandler.java | 29 +-- .../HttpServerMultiplexChannelHandler.java | 23 ++- ...ttpAccessHttpRequestAndResponseBeanTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 1 - .../NettyHttpGetWithInvalidMessageTest.java | 104 ++++++++++ .../http/NettyHttpMapHeadersFalseTest.java | 6 +- .../netty/http/NettyUseRawHttpResponseTest.java | 2 +- .../component/netty/http/rest/CountryPojo.java | 40 ++++ ...estNettyHttpBindingModeAutoWithJsonTest.java | 59 ++++++ ...RestNettyHttpBindingModeAutoWithXmlTest.java | 59 ++++++ .../rest/RestNettyHttpBindingModeJsonTest.java | 76 +++++++ .../rest/RestNettyHttpBindingModeXmlTest.java | 77 +++++++ .../netty/http/rest/RestNettyHttpGetTest.java | 56 +++++ .../http/rest/RestNettyHttpPojoInOutTest.java | 55 +++++ .../rest/RestNettyHttpPostJsonJaxbPojoTest.java | 63 ++++++ .../rest/RestNettyHttpPostJsonPojoListTest.java | 68 +++++++ .../rest/RestNettyHttpPostJsonPojoTest.java | 63 ++++++ .../rest/RestNettyHttpPostXmlJaxbPojoTest.java | 79 ++++++++ .../component/netty/http/rest/UserJaxbPojo.java | 48 +++++ .../component/netty/http/rest/UserPojo.java | 40 ++++ .../component/netty/http/rest/UserService.java | 33 +++ .../component/netty/ClientPipelineFactory.java | 2 +- .../component/netty/ServerPipelineFactory.java | 6 +- .../netty/handlers/ClientChannelHandler.java | 1 + .../netty/handlers/ServerChannelHandler.java | 2 +- .../component/netty4/ClientPipelineFactory.java | 2 +- .../camel/component/netty4/NettyProducer.java | 3 +- .../component/netty4/ServerPipelineFactory.java | 4 +- .../SingleUDPNettyServerBootstrapFactory.java | 1 - .../netty4/handlers/ServerChannelHandler.java | 2 +- .../component/netty4/NettyConverterTest.java | 1 - .../component/restlet/RestletComponent.java | 15 +- .../RestRestletBindingModeAutoWithJsonTest.java | 60 ++++++ .../RestRestletBindingModeAutoWithXmlTest.java | 60 ++++++ .../restlet/RestRestletBindingModeJsonTest.java | 1 - .../restlet/RestRestletBindingModeXmlTest.java | 1 - .../restlet/RestRestletPojoInOutTest.java | 6 +- .../RestRestletPostJsonJaxbPojoTest.java | 4 +- .../RestRestletPostJsonPojoListTest.java | 4 +- .../restlet/RestRestletPostJsonPojoTest.java | 4 +- .../restlet/RestRestletPostXmlJaxbPojoTest.java | 4 +- .../restlet/SpringRestRestletPojoInOutTest.java | 53 +++++ .../restlet/SpringRestRestletPojoInOutTest.xml | 46 +++++ components/camel-scala/pom.xml | 11 + components/camel-servlet/pom.xml | 11 + .../servlet/CamelHttpTransportServlet.java | 3 + .../component/servlet/ServletComponent.java | 54 ++++- .../servlet/ServletRestHttpBinding.java | 67 ++++++ ...rvletRestServletResolveConsumerStrategy.java | 102 ++++++++++ .../component/servlet/rest/CountryPojo.java | 40 ++++ .../RestServletBindingModeAutoWithJsonTest.java | 71 +++++++ .../RestServletBindingModeAutoWithXmlTest.java | 71 +++++++ .../rest/RestServletBindingModeJsonTest.java | 86 ++++++++ .../rest/RestServletBindingModeXmlTest.java | 87 ++++++++ .../servlet/rest/RestServletGetTest.java | 66 ++++++ .../servlet/rest/RestServletPojoInOutTest.java | 65 ++++++ .../rest/RestServletPostJsonJaxbPojoTest.java | 70 +++++++ .../rest/RestServletPostJsonPojoListTest.java | 76 +++++++ .../rest/RestServletPostJsonPojoTest.java | 70 +++++++ .../rest/RestServletPostXmlJaxbPojoTest.java | 92 +++++++++ .../component/servlet/rest/UserJaxbPojo.java | 48 +++++ .../camel/component/servlet/rest/UserPojo.java | 40 ++++ .../component/servlet/rest/UserService.java | 33 +++ components/camel-spark-rest/pom.xml | 13 ++ .../sparkrest/DefaultSparkBinding.java | 2 + .../component/sparkrest/SparkComponent.java | 4 +- .../camel/component/sparkrest/CountryPojo.java | 40 ++++ .../sparkrest/RestCamelSparkPojoInOutTest.java | 52 +++++ .../camel/component/sparkrest/UserPojo.java | 40 ++++ .../camel/component/sparkrest/UserService.java | 33 +++ .../component/splunk/SplunkConfiguration.java | 26 +++ .../camel/component/splunk/SplunkConsumer.java | 39 +++- .../splunk/support/SplunkDataReader.java | 41 ++-- .../splunk/support/SplunkResultProcessor.java | 26 +++ .../component/splunk/ConsumerStreamingTest.java | 68 +++++++ .../component/rest/SpringFromRestGetTest.xml | 2 +- .../rest/DummyRestConsumerFactory.java | 4 +- .../rest/FromRestGetEmbeddedRouteTest.java | 4 +- .../component/rest/FromRestGetTest.java | 1 - .../component/rest/FromRestGetTest.xml | 2 +- .../component/xmlsecurity/SantuarioUtil.java | 83 -------- .../xmlsecurity/processor/SantuarioUtil.java | 83 ++++++++ .../processor/XmlSignatureProcessor.java | 2 - .../zookeeper/ZooKeeperConfiguration.java | 4 +- components/pom.xml | 1 + examples/camel-example-restlet-jdbc/pom.xml | 8 +- .../README.txt | 36 ++++ .../camel-example-servlet-rest-tomcat/pom.xml | 84 ++++++++ .../org/apache/camel/example/rest/User.java | 47 +++++ .../camel/example/rest/UserRouteBuilder.java | 49 +++++ .../apache/camel/example/rest/UserService.java | 64 ++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../src/main/resources/camel-config-xml.xml | 59 ++++++ .../src/main/resources/camel-config.xml | 36 ++++ .../src/main/resources/log4j.properties | 28 +++ .../src/main/webapp/WEB-INF/web.xml | 55 +++++ .../src/main/webapp/index.html | 72 +++++++ .../camel-example-spark-rest-tomcat/README.txt | 7 + .../camel-example-spark-rest-tomcat/pom.xml | 6 + .../example/spark/MySparkRouteBuilder.java | 48 ----- .../org/apache/camel/example/spark/User.java | 47 +++++ .../camel/example/spark/UserRouteBuilder.java | 49 +++++ .../apache/camel/example/spark/UserService.java | 64 ++++++ .../src/main/resources/camel-config.xml | 10 +- .../src/main/webapp/index.html | 36 ++-- examples/pom.xml | 1 + parent/pom.xml | 17 +- tests/camel-itest-osgi/pom.xml | 5 + .../OSGiBlueprintQuarz2SchedulerTest.java | 86 ++++++++ .../camel/itest/osgi/blueprint/blueprint-28.xml | 28 +++ 184 files changed, 6387 insertions(+), 505 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/85cc550f/components/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/85cc550f/parent/pom.xml ----------------------------------------------------------------------
