Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into linkedin-component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32dcec96 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32dcec96 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32dcec96 Branch: refs/heads/linkedin-component Commit: 32dcec96095621217d6cf2724d4934f6a4b2187a Parents: b490a90 b8f687a Author: Dhiraj Bokde <dhira...@yahoo.com> Authored: Thu Jul 10 18:05:28 2014 -0700 Committer: Dhiraj Bokde <dhira...@yahoo.com> Committed: Thu Jul 10 18:05:28 2014 -0700 ---------------------------------------------------------------------- apache-camel/pom.xml | 6 +- .../src/main/descriptors/common-bin.xml | 5 +- .../java/org/apache/camel/RecipientList.java | 1 + .../mbean/ManagedBacklogDebuggerMBean.java | 6 + .../mbean/ManagedBacklogTracerMBean.java | 6 + .../mbean/ManagedCamelContextMBean.java | 2 +- .../ManagedStreamCachingStrategyMBean.java | 2 +- .../mbean/ManagedThreadPoolMBean.java | 6 + .../management/mbean/ManagedTracerMBean.java | 6 + .../apache/camel/component/bean/MethodInfo.java | 1 + .../component/file/GenericFileEndpoint.java | 11 + .../GenericFileExclusiveReadLockStrategy.java | 7 +- .../FileChangedExclusiveReadLockStrategy.java | 2 + .../strategy/FileProcessStrategyFactory.java | 4 + .../FileRenameExclusiveReadLockStrategy.java | 15 +- .../GenericFileProcessStrategyFactory.java | 4 + ...ericFileRenameExclusiveReadLockStrategy.java | 5 + .../MarkerFileExclusiveReadLockStrategy.java | 18 + .../apache/camel/impl/DefaultCamelContext.java | 5 + .../org/apache/camel/impl/JndiRegistry.java | 8 +- .../mbean/ManagedBacklogDebugger.java | 8 + .../management/mbean/ManagedBacklogTracer.java | 8 + .../management/mbean/ManagedThreadPool.java | 8 + .../camel/management/mbean/ManagedTracer.java | 8 + .../apache/camel/model/MulticastDefinition.java | 37 +- .../camel/model/RecipientListDefinition.java | 38 +- .../camel/model/RouteDefinitionHelper.java | 12 +- .../org/apache/camel/model/SplitDefinition.java | 35 +- .../apache/camel/model/ThrottleDefinition.java | 2 +- .../org/apache/camel/processor/Enricher.java | 18 +- .../camel/processor/MulticastProcessor.java | 45 +- .../apache/camel/processor/RecipientList.java | 11 +- .../camel/processor/RecipientListProcessor.java | 12 +- .../org/apache/camel/processor/Splitter.java | 11 +- .../org/apache/camel/processor/Throttler.java | 3 +- .../ThrottlerRejectedExecutionException.java | 28 ++ .../apache/camel/support/RecordableReader.java | 94 ++++ .../support/XMLTokenExpressionIterator.java | 41 +- .../org/apache/camel/util/MessageHelper.java | 3 +- .../bean/BeanMethodWithExchangeTest.java | 68 +++ ...ConsumerBridgeRouteExceptionHandlerTest.java | 5 + .../FileConsumerCustomExceptionHandlerTest.java | 5 + .../FileChangedReadLockMarkerFileFalseTest.java | 32 ++ .../org/apache/camel/impl/JndiRegistryTest.java | 59 +++ .../SplitterParallelAggregateTest.java | 135 ++++++ .../apache/camel/processor/SplitterTest.java | 21 + .../apache/camel/processor/ThrottlerTest.java | 5 +- .../enricher/EnricherSendEventTest.java | 118 +++++ .../support/RecordableInputStreamTest.java | 9 +- .../camel/support/RecordableReaderTest.java | 104 ++++ .../XMLTokenExpressionIteratorCharsetTest.java | 116 +++++ .../support/XMLTokenExpressionIteratorTest.java | 33 ++ .../websocket/WebsocketComponent.java | 1 + .../atmosphere/websocket/WebsocketEndpoint.java | 5 + ...ponentConfigurationAndDocumentationTest.java | 58 +++ .../camel/dataformat/bindy/FormatFactory.java | 8 +- components/camel-box/pom.xml | 8 +- .../component/box/AbstractBoxTestSupport.java | 16 + .../apache/camel/component/cxf/CxfProducer.java | 4 +- .../component/cxf/jaxrs/CxfRsProducer.java | 62 ++- .../src/main/resources/META-INF/spring.schemas | 3 + .../component/cxf/jaxrs/CxfRsProducerTest.java | 2 + .../component/cxf/jaxrs/CxfRsSpringProducer.xml | 3 +- .../FtpChangedExclusiveReadLockStrategy.java | 5 + .../strategy/FtpProcessStrategyFactory.java | 8 + .../SftpChangedExclusiveReadLockStrategy.java | 5 + .../component/gae/auth/GAuthComponent.java | 8 +- .../camel/component/gae/auth/GAuthEndpoint.java | 8 + .../component/gae/http/GHttpComponent.java | 3 + .../camel/component/gae/http/GHttpEndpoint.java | 9 +- .../component/gae/login/GLoginComponent.java | 8 +- .../component/gae/login/GLoginEndpoint.java | 10 + .../component/gae/mail/GMailComponent.java | 8 +- .../camel/component/gae/mail/GMailEndpoint.java | 8 + .../component/gae/task/GTaskComponent.java | 3 + .../camel/component/gae/task/GTaskEndpoint.java | 4 + ...ponentConfigurationAndDocumentationTest.java | 57 +++ ...ponentConfigurationAndDocumentationTest.java | 58 +++ ...ponentConfigurationAndDocumentationTest.java | 57 +++ ...ponentConfigurationAndDocumentationTest.java | 57 +++ ...ponentConfigurationAndDocumentationTest.java | 56 +++ .../component/hazelcast/HazelcastComponent.java | 37 +- ...astComponentInstanceReferenceSpringTest.java | 49 ++ .../hazelcast/HazelcastListProducerTest.java | 8 +- ...mel-context-hazelcast-instance-reference.xml | 49 ++ .../component/netty/NettyWorkerPoolBuilder.java | 2 +- .../component/rabbitmq/RabbitMQConsumer.java | 1 - .../component/rabbitmq/RabbitMQProducer.java | 8 +- .../camel/scala/dsl/SMulticastDefinition.scala | 5 + .../camel/scala/dsl/SSplitDefinition.scala | 4 +- .../apache/camel/scala/dsl/MulticastTest.scala | 2 +- .../camel/builder/script/ScriptBuilder.java | 4 + .../script/LanguagePythonStatementsTest.java | 46 ++ .../camel-script/src/test/resources/mypython.py | 3 + .../component/servlet/ServletComponent.java | 6 + .../src/main/resources/META-INF/spring.schemas | 3 + .../src/main/resources/META-INF/spring.schemas | 3 + .../src/main/resources/META-INF/spring.schemas | 6 + .../SpringJmxDumpCBRRoutesAsXmlTest.java | 55 +++ .../SpringJmxDumpCBRRouteAsXmlTest.xml | 43 ++ .../apache/camel/spring/processor/throttler.xml | 2 +- components/camel-test-spring/pom.xml | 39 +- components/camel-test-spring3/pom.xml | 92 ++++ .../CamelSpringDelegatingTestContextLoader.java | 321 +++++++++++++ .../spring/CamelSpringJUnit4ClassRunner.java | 88 ++++ .../spring/CamelSpringTestContextLoader.java | 473 +++++++++++++++++++ ...gTestContextLoaderTestExecutionListener.java | 36 ++ .../test/spring/CamelSpringTestHelper.java | 99 ++++ .../test/spring/CamelSpringTestSupport.java | 220 +++++++++ .../apache/camel/test/spring/DisableJmx.java | 43 ++ .../spring/DisableJmxTestExecutionListener.java | 39 ++ .../apache/camel/test/spring/ExcludeRoutes.java | 44 ++ .../test/spring/LazyLoadTypeConverters.java | 44 ++ .../apache/camel/test/spring/MockEndpoints.java | 43 ++ .../camel/test/spring/MockEndpointsAndSkip.java | 43 ++ .../camel/test/spring/ProvidesBreakpoint.java | 36 ++ .../camel/test/spring/ShutdownTimeout.java | 49 ++ .../spring/StopWatchTestExecutionListener.java | 60 +++ .../apache/camel/test/spring/UseAdviceWith.java | 49 ++ .../src/main/resources/META-INF/LICENSE.txt | 203 ++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../AdviceWithOnExceptionMultipleIssueTest.java | 116 +++++ .../test/issues/MockEndpointsAndSkipTest.java | 46 ++ .../patterns/DebugSpringCamelContextTest.java | 40 ++ .../camel/test/patterns/DebugSpringTest.java | 81 ++++ .../camel/test/patterns/MyProduceBean.java | 41 ++ .../apache/camel/test/patterns/MySender.java | 25 + .../camel/test/patterns/ProduceBeanTest.java | 42 ++ .../test/patterns/ProducerBeanInjectTest.java | 38 ++ .../spring/CamelSpringActiveProfileTest.java | 56 +++ ...ssRunnerDisableJmxInheritedOverrideTest.java | 32 ++ ...Unit4ClassRunnerDisableJmxInheritedTest.java | 21 + ...elSpringJUnit4ClassRunnerDisableJmxTest.java | 33 ++ ...pringJUnit4ClassRunnerExcludeRoutesTest.java | 29 ++ ...LoadTypeConvertersInheritedOverrideTest.java | 33 ++ ...nnerLazyLoadTypeConvertersInheritedTest.java | 21 + ...t4ClassRunnerLazyLoadTypeConvertersTest.java | 33 ++ ...nit4ClassRunnerMockEndpointsAndSkipTest.java | 56 +++ ...pringJUnit4ClassRunnerMockEndpointsTest.java | 57 +++ .../CamelSpringJUnit4ClassRunnerPlainTest.java | 126 +++++ ...sRunnerProvidesBreakpointInherritedTest.java | 22 + ...JUnit4ClassRunnerProvidesBreakpointTest.java | 67 +++ ...nerShutdownTimeoutInheritedOverrideTest.java | 34 ++ ...ClassRunnerShutdownTimeoutInheritedTest.java | 22 + ...ingJUnit4ClassRunnerShutdownTimeoutTest.java | 34 ++ ...pringJUnit4ClassRunnerUseAdviceWithTest.java | 52 ++ ...CamelSpringTestSupportActiveProfileTest.java | 51 ++ .../camel/test/spring/TestRouteBuilder.java | 30 ++ .../src/test/resources/jndi.properties | 22 + .../src/test/resources/log4j.properties | 37 ++ .../AdviceWithOnExceptionMultipleIssueTest.xml | 47 ++ .../test/issues/MockEndpointsAndSkipTest.xml | 35 ++ .../test/patterns/ProduceBeanInjectTest.xml | 39 ++ .../camel/test/patterns/ProduceBeanTest.xml | 33 ++ .../camel/test/patterns/applicationContext.xml | 38 ++ .../CamelSpringActiveProfileTest-context.xml | 41 ++ ...SpringJUnit4ClassRunnerPlainTest-context.xml | 50 ++ .../apache/camel/test/spring/test.properties | 18 + .../camel/dataformat/zipfile/ZipIterator.java | 12 +- components/pom.xml | 9 +- examples/camel-example-box-osgi/README.txt | 38 ++ examples/camel-example-box-osgi/pom.xml | 85 ++++ .../src/main/resources/META-INF/LICENSE.txt | 203 ++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../resources/META-INF/spring/camel-context.xml | 55 +++ .../src/test/resources/log4j.properties | 31 ++ parent/pom.xml | 45 +- .../features/src/main/resources/features.xml | 31 ++ tests/camel-itest-spring32/pom.xml | 52 +- .../camel/itest/async/MyAsyncComponent.java | 37 ++ .../camel/itest/async/MyAsyncEndpoint.java | 73 +++ .../camel/itest/async/MyAsyncProducer.java | 77 +++ .../ibatis/AsyncEndpointTransacted2Test.java | 96 ++++ .../ibatis/AsyncEndpointTransactedTest.java | 88 ++++ .../apache/camel/itest/ibatis/DummyTable.java | 35 ++ .../camel/itest/ibatis/DummyTableImpl.java | 54 +++ .../camel/itest/ibatis/ExceptionRethrower.java | 30 ++ .../camel/itest/ibatis/LoggingPipelineTest.java | 95 ++++ .../ibatis/PartiallyTransactedPipelineTest.java | 99 ++++ ...edExceptionClauseAfterTransactedTagTest.java | 99 ++++ .../itest/ibatis/TransactedFullExampleTest.java | 127 +++++ .../ibatis/TransactedOnCompletionTest.java | 99 ++++ .../itest/ibatis/TransactedOnExceptionTest.java | 99 ++++ .../itest/ibatis/TransactedPipelineTest.java | 94 ++++ .../itest/ibatis/TransactedTryCatchTest.java | 107 +++++ .../src/test/resources/ibatis-config.xml | 8 + .../ibatis/AsyncEndpointTransacted2Test.xml | 52 ++ .../ibatis/AsyncEndpointTransactedTest.xml | 41 ++ .../camel/itest/ibatis/LoggingPipelineTest.xml | 43 ++ .../ibatis/PartiallyTransactedPipelineTest.xml | 37 ++ ...nsactedExceptionClauseAfterTransactedTag.xml | 46 ++ .../itest/ibatis/TransactedFullExampleTest.xml | 58 +++ .../itest/ibatis/TransactedOnCompletionTest.xml | 39 ++ .../itest/ibatis/TransactedOnExceptionTest.xml | 44 ++ .../itest/ibatis/TransactedPipelineTest.xml | 36 ++ .../itest/ibatis/TransactedTryCatchTest.xml | 48 ++ .../camel/itest/ibatis/database-context.xml | 44 ++ .../src/test/resources/table.xml | 13 + .../src/test/resources/transactions.properties | 43 ++ tests/camel-itest/pom.xml | 34 +- .../apache/camel/itest/http/Http4RouteTest.java | 37 +- .../ibatis/AsyncEndpointTransacted2Test.java | 96 ---- .../ibatis/AsyncEndpointTransactedTest.java | 88 ---- .../apache/camel/itest/ibatis/DummyTable.java | 35 -- .../camel/itest/ibatis/DummyTableImpl.java | 54 --- .../camel/itest/ibatis/ExceptionRethrower.java | 30 -- .../camel/itest/ibatis/LoggingPipelineTest.java | 95 ---- .../ibatis/PartiallyTransactedPipelineTest.java | 99 ---- ...edExceptionClauseAfterTransactedTagTest.java | 99 ---- .../itest/ibatis/TransactedFullExampleTest.java | 127 ----- .../ibatis/TransactedOnCompletionTest.java | 99 ---- .../itest/ibatis/TransactedOnExceptionTest.java | 99 ---- .../itest/ibatis/TransactedPipelineTest.java | 94 ---- .../itest/ibatis/TransactedTryCatchTest.java | 107 ----- .../src/test/resources/ibatis-config.xml | 8 - .../ibatis/AsyncEndpointTransacted2Test.xml | 52 -- .../ibatis/AsyncEndpointTransactedTest.xml | 41 -- .../camel/itest/ibatis/LoggingPipelineTest.xml | 43 -- .../ibatis/PartiallyTransactedPipelineTest.xml | 37 -- ...nsactedExceptionClauseAfterTransactedTag.xml | 46 -- .../itest/ibatis/TransactedFullExampleTest.xml | 58 --- .../itest/ibatis/TransactedOnCompletionTest.xml | 39 -- .../itest/ibatis/TransactedOnExceptionTest.xml | 44 -- .../itest/ibatis/TransactedPipelineTest.xml | 36 -- .../itest/ibatis/TransactedTryCatchTest.xml | 48 -- .../camel/itest/ibatis/database-context.xml | 44 -- tests/camel-itest/src/test/resources/table.xml | 13 - .../src/test/resources/transactions.properties | 43 -- tooling/camel-manual/pom.xml | 14 +- 229 files changed, 8106 insertions(+), 1846 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/32dcec96/components/camel-box/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/32dcec96/components/camel-box/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/32dcec96/components/pom.xml ----------------------------------------------------------------------
