Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge latest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ca89763f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca89763f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca89763f Branch: refs/heads/master Commit: ca89763fdc59381f50d44bac619347e1d3513dd7 Parents: 071c82d a8c02f8 Author: Scott England-Sullivan <sully6...@apache.org> Authored: Fri Jan 24 09:38:12 2014 -0600 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Fri Jan 24 09:38:12 2014 -0600 ---------------------------------------------------------------------- camel-core/pom.xml | 12 +- .../main/java/org/apache/camel/Exchange.java | 1 + .../apache/camel/builder/xml/XsltBuilder.java | 26 +- .../apache/camel/converter/jaxp/StaxSource.java | 279 ++++++++ .../impl/DefaultPackageScanClassResolver.java | 5 +- .../validation/ValidatingProcessor.java | 2 - .../toolbox/FlexibleAggregationStrategy.java | 10 +- .../builder/xml/XsltTestErrorListenerTest.java | 4 + .../camel/component/xslt/XsltDTDTest.java | 20 +- .../camel/converter/jaxp/StaxConverterTest.java | 12 +- .../FlexibleAggregationStrategiesTest.java | 8 +- .../org/apache/camel/avro/generated/Key.java | 2 +- .../org/apache/camel/avro/generated/Value.java | 2 +- .../avro/AvroMarshalAndUnmarshallTest.java | 1 - .../aws/swf/SwfComponentSpringTest.java | 2 - components/camel-bam/pom.xml | 5 + .../apache/camel/bam/EntityManagerCallback.java | 33 + .../apache/camel/bam/EntityManagerTemplate.java | 80 +++ .../org/apache/camel/bam/EntityManagers.java | 16 +- .../org/apache/camel/bam/ProcessBuilder.java | 47 +- .../camel/bam/model/ProcessDefinition.java | 42 +- .../bam/processor/ActivityMonitorEngine.java | 24 +- .../camel/bam/processor/JpaBamProcessor.java | 11 +- .../bam/processor/JpaBamProcessorSupport.java | 65 +- .../java/org/apache/camel/bam/BamRouteTest.java | 7 +- .../apache/camel/bam/EntityManagersTest.java | 42 ++ .../eclipselink/META-INF/spring/spring.xml | 4 - .../hibernate/META-INF/spring/spring.xml | 4 - .../profiles/openjpa/META-INF/spring/spring.xml | 4 - .../resources/org/apache/camel/bam/spring.xml | 4 - .../camel/dataformat/csv/CsvDataFormat.java | 32 +- ...UnmarshalTwoCsvDataFormatConcurrentTest.java | 90 +++ .../cxf/transport/CamelTransportFactory.java | 4 +- .../cxf/common/header/CxfHeaderHelperTest.java | 2 +- .../apache/camel/component/cxf/CxfEndpoint.java | 28 + ...CxfConsumerPayloadXPathClientServerTest.java | 2 +- .../cxf/CxfConsumerPayloadXPathTest.java | 4 +- .../component/cxf/DefaultCxfBindingTest.java | 3 +- .../camel/component/http/helper/HttpHelper.java | 1 - .../camel/component/http4/HttpProducer.java | 3 - .../component/http4/HttpProxyServerTest.java | 4 - .../jcr/AuthTokenLoginFailureTest.java | 63 -- .../component/jcr/JcrAuthLoginFailureTest.java | 51 ++ .../camel/component/jcr/JcrAuthLoginTest.java | 63 ++ .../jcr/JcrAuthTokenWithLoginTest.java | 51 -- .../JsonPathTransformResultTypeTest.java | 1 - .../netty/http/DefaultNettyHttpBinding.java | 1 + .../netty/http/NettyHttpComponent.java | 19 +- .../component/netty/http/NettyHttpEndpoint.java | 3 + .../netty/http/NettyHttpRawQueryTest.java | 57 ++ .../camel/component/netty/NettyProducer.java | 3 +- .../netty/handlers/ClientChannelHandler.java | 4 + .../component/printer/PrinterConfiguration.java | 76 ++- .../component/printer/PrinterProducer.java | 3 +- .../component/printer/PrinterPrintTest.java | 69 +- .../camel/component/quartz/QuartzComponent.java | 13 +- .../component/quartz/QuartzPropertiesTest.java | 2 +- .../component/quartz2/QuartzComponent.java | 13 +- .../component/quartz2/QuartzPropertiesTest.java | 2 +- .../camel-salesforce-component/pom.xml | 10 +- .../salesforce/SalesforceComponent.java | 56 +- .../salesforce/internal/SalesforceSession.java | 5 +- .../internal/streaming/SubscriptionHelper.java | 31 +- .../src/test/resources/log4j.properties | 38 +- .../camel/component/xslt/SaxonXsltDTDTest.java | 22 +- .../component/sjms/jms/JmsObjectFactory.java | 4 +- .../component/smpp/SmppDefaultSplitterTest.java | 4 +- .../blueprint/BlueprintBeanInjectRoute.java | 1 - .../component/twitter/TwitterConfiguration.java | 14 +- .../component/twitter/UriConfigurationTest.java | 11 + .../processor/XmlVerifierProcessor.java | 652 +++++++++---------- examples/camel-example-mybatis/README.txt | 15 +- examples/camel-example-mybatis/pom.xml | 41 +- .../src/main/resources/features.xml | 5 +- parent/pom.xml | 8 +- .../features/src/main/resources/features.xml | 5 +- .../OSGiJettyCamelContextsClassloaderTest.java | 3 +- .../jetty/OSGiMulitJettyCamelContextsTest.java | 3 +- 78 files changed, 1616 insertions(+), 753 deletions(-) ----------------------------------------------------------------------
