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/071c82df Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/071c82df Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/071c82df Branch: refs/heads/master Commit: 071c82dfec5636b07d3faf1b8f46620b8ff306d4 Parents: 331a48b 7538854 Author: Scott England-Sullivan <sully6...@apache.org> Authored: Tue Jan 14 13:12:32 2014 -0600 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Tue Jan 14 13:12:32 2014 -0600 ---------------------------------------------------------------------- .../apache/camel/builder/PredicateBuilder.java | 21 ++- .../apache/camel/builder/xml/XsltBuilder.java | 2 +- .../camel/component/xslt/XsltConstants.java | 3 + .../camel/component/xslt/XsltEndpoint.java | 15 +- .../camel/converter/jaxp/XmlConverter.java | 13 ++ .../camel/impl/ActiveMQUuidGenerator.java | 10 +- .../org/apache/camel/impl/DefaultMessage.java | 4 +- .../apache/camel/model/MulticastDefinition.java | 11 +- .../camel/model/dataformat/CsvDataFormat.java | 16 ++- .../org/apache/camel/processor/Splitter.java | 11 +- .../UseOriginalAggregationStrategy.java | 8 +- .../org/apache/camel/util/GroupIterator.java | 26 ++-- .../java/org/apache/camel/util/IOHelper.java | 17 +++ .../apache/camel/util/IntrospectionSupport.java | 1 + .../util/toolbox/AggregationStrategies.java | 13 +- .../camel/builder/PredicateBuilderTest.java | 29 ++++ .../camel/builder/xml/XPathFeatureTest.java | 30 +++- .../camel/component/xslt/XsltDTDTest.java | 78 +++++++++++ .../component/xslt/XsltFeatureRouteTest.java | 62 ++++++++ .../XsltFromHeaderOverrideEndpointUriTest.java | 5 +- .../camel/component/xslt/XsltRouteTest.java | 7 +- .../xslt/XsltTransformingExceptionTest.java | 15 +- .../apache/camel/impl/DefaultMessageTest.java | 39 ++++++ .../MulticastSingleAggregateIssueTest.java | 79 +++++++++++ ...lticastKeepOriginalMessageUnchangedTest.java | 62 ++++++++ .../SplitterWithScannerIoExceptionTest.java | 2 +- .../camel/component/xslt/transform_dtd.xsl | 30 ++++ .../camel/component/xslt/transform_text.xsl | 31 ++++ .../component/xslt/transform_text_imported.xsl | 25 ++++ .../avro/AvroGenericMarshaAndUnmarshaTest.java | 84 +++++++++++ .../org/apache/camel/dataformat/avro/user.avsc | 7 + .../camel/component/aws/ses/SesConstants.java | 1 + .../camel/component/aws/ses/SesProducer.java | 8 +- .../camel/component/aws/sqs/SqsConsumer.java | 28 +++- .../camel/component/aws/sqs/SqsEndpoint.java | 4 +- .../org/apache/camel/bam/EntityManagers.java | 46 ++++++ .../bam/processor/JpaBamProcessorSupport.java | 35 +++-- .../bindy/fixed/BindyFixedLengthDataFormat.java | 2 +- .../converter/crypto/PGPDataFormatUtil.java | 58 +++++--- .../camel/dataformat/csv/CsvDataFormat.java | 40 ++++-- .../camel/dataformat/csv/CsvIterator.java | 12 +- .../camel/dataformat/csv/CsvLineConverter.java | 33 +++++ .../camel/dataformat/csv/CsvLineConverters.java | 102 ++++++++++++++ .../camel/dataformat/csv/CsvIteratorTest.java | 23 ++- .../dataformat/csv/CsvLineConvertersTest.java | 68 +++++++++ .../dataformat/csv/CsvUnmarshalMapLineTest.java | 73 ++++++++++ .../CsvUnmarshalMapLineSpringTest-context.xml | 32 +++++ components/camel-cxf-transport/pom.xml | 5 - .../cxf/transport/CamelDestination.java | 6 +- .../cxf/transport/CamelTransportFactory.java | 87 ++++++++++-- .../cxf/transport/CamelDestinationTest.java | 8 +- components/camel-cxf/pom.xml | 5 + .../apache/camel/component/cxf/CxfConsumer.java | 16 ++- .../apache/camel/component/cxf/CxfEndpoint.java | 83 +++++++---- .../camel/component/cxf/CxfEndpointUtils.java | 41 ------ .../camel/component/cxf/CxfSpringEndpoint.java | 23 ++- .../camel/component/cxf/DefaultCxfBinding.java | 55 ++++++-- .../component/cxf/WSDLServiceConfiguration.java | 106 -------------- .../component/cxf/WSDLServiceFactoryBean.java | 82 +++++++++-- .../component/cxf/cxfbean/CxfBeanEndpoint.java | 4 +- .../cxf/cxfbean/CxfBeanTransportFactory.java | 5 +- .../ConfigureDocLitWrapperInterceptor.java | 7 +- .../spring/SpringJAXRSClientFactoryBean.java | 14 +- .../spring/SpringJAXRSServerFactoryBean.java | 14 +- .../cxf/util/WSDLSoapServiceFactoryBean.java | 123 ---------------- .../cxf/CxfConsumerPayLoadFaultMessageTest.java | 4 +- .../cxf/CxfConsumerPayLoadMarshalFaultTest.java | 4 +- .../cxf/CxfConsumerPayloadFaultTest.java | 4 +- .../camel/component/cxf/CxfEndpointTest.java | 6 +- .../component/cxf/CxfMixedModeRouterTest.java | 5 +- .../camel/component/cxf/SoapTargetBean.java | 5 +- .../mtom/CxfMtomConsumerPayloadModeTest.java | 7 +- .../CxfMtomDisabledConsumerPayloadModeTest.java | 6 +- .../CxfMtomDisabledProducerPayloadModeTest.java | 4 +- .../mtom/CxfMtomProducerPayloadModeTest.java | 4 +- .../headers/CxfMessageHeadersRelayTest.java | 14 +- .../cxf/wsrm/MessageLossSimulator.java | 21 ++- .../wssecurity/client/UTPasswordCallback.java | 18 ++- .../wssecurity/server/UTPasswordCallback.java | 17 ++- .../cxf/spring/SpringBusFactoryBeans.xml | 4 +- .../component/facebook/FacebookComponent.java | 2 +- .../camel/component/jetty/CamelHttpClient.java | 18 +++ .../component/jetty/JettyHttpComponent.java | 7 +- .../component/jetty/JettyHttpProducer.java | 11 ++ ...oducerRecipientListCustomThreadPoolTest.java | 70 ++++++++++ .../HttpJettyProducerRecipientListTest.java | 70 ++++++++++ .../component/jgroups/JGroupsExpressions.java | 37 +++++ .../component/jgroups/JGroupsProducer.java | 11 ++ .../jgroups/JGroupsClusterRouteTest.java | 140 +++++++++++++++++++ .../apache/camel/component/jms/JmsBinding.java | 5 +- .../camel/component/jms/JmsMessageHelper.java | 46 +++++- .../JmsInOnlyWithReplyToHeaderTopicTest.java | 74 ++++++++++ .../camel/component/quartz/QuartzComponent.java | 24 +++- .../camel/component/quartz/QuartzConstants.java | 6 + .../component/quartz/QuartzCronRouteTest.java | 7 + .../quartz/QuartzRouteFireNowTest.java | 26 +++- .../camel/component/quartz/QuartzRouteTest.java | 8 ++ .../component/quartz2/QuartzConstants.java | 6 + .../camel/component/quartz2/QuartzEndpoint.java | 14 +- .../QuartzScheduledPollConsumerScheduler.java | 5 + .../component/quartz2/QuartzCronRouteTest.java | 3 + .../quartz2/QuartzSimpleRouteTest.java | 4 + .../component/restlet/RestletEndpoint.java | 20 +++ .../component/restlet/RestletProducer.java | 5 +- .../restlet/RestletProducerTimeoutTest.java | 54 +++++++ .../camel/component/xslt/SaxonXsltDTDTest.java | 80 +++++++++++ .../xslt/SaxonXsltFeatureRouteTest.java | 66 +++++++++ .../camel/component/xslt/transform_dtd.xsl | 30 ++++ .../camel/component/xslt/transform_text.xsl | 31 ++++ .../component/xslt/transform_text_imported.xsl | 25 ++++ .../camel/builder/script/ScriptBuilder.java | 33 ++++- .../org/apache/camel/script/osgi/Activator.java | 22 ++- .../LanguageECMAScriptAsJavaScriptTest.java | 51 +++++++ .../shiro/security/ShiroSecurityPolicy.java | 9 ++ .../shiro/security/ShiroSecurityProcessor.java | 12 +- .../shiro/security/ShiroAuthorizationTest.java | 112 +++++++++++++-- .../component/sjms/producer/InOnlyProducer.java | 33 +++-- components/camel-soap/pom.xml | 6 - .../camel/testng/patterns/DebugSpringTest.java | 4 +- .../xmljson/JsonToXmlAttributesTest.java | 92 ++++++++++++ .../xmljson/SpringXmlJsonDataFormatTest.java | 4 +- .../xmljson/XmlJsonDataFormatTest.java | 16 +-- .../xmljson/jsonToXmlAttributesMessage.json | 1 + .../jsonToXmlElementWithAttributeMessage.json | 4 + parent/pom.xml | 18 +-- .../features/src/main/resources/features.xml | 6 +- pom.xml | 2 +- 127 files changed, 2808 insertions(+), 650 deletions(-) ----------------------------------------------------------------------
