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/6dd8246c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6dd8246c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6dd8246c Branch: refs/heads/master Commit: 6dd8246c37836ca2c3f9d08a162a956eeeb83cbc Parents: a821523 fa48ad8 Author: Scott England-Sullivan <sully6...@apache.org> Authored: Mon Dec 2 06:59:34 2013 -0600 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Mon Dec 2 06:59:34 2013 -0600 ---------------------------------------------------------------------- .../camel/converter/jaxp/StaxConverter.java | 14 ++++- .../camel/converter/jaxp/StaxConverterTest.java | 3 +- .../util/jsse/SSLContextParametersTest.java | 51 +++++++++++-------- ...tCamelTestNGSpringContextTestsPlainTest.java | 5 +- components/camel-zipfile/pom.xml | 10 ++++ .../zipfile/SpringZipSplitterRouteTest.java | 39 ++++++++++++++ .../ZipFileMultipleFilesSplitterTest.java | 2 +- .../zipfile/ZipSplitterRouteTest.java | 2 +- .../zipfile/SpringZipSplitterRouteTest.xml | 43 ++++++++++++++++ .../camel/dataformat/zipfile/data/resources.zip | Bin 0 -> 306 bytes .../camel/dataformat/zipfile/resources.zip | Bin 306 -> 0 bytes .../org/apache/camel/maven/EmbeddedMojo.java | 4 +- .../java/org/apache/camel/maven/HawtioMojo.java | 10 ++-- .../java/org/apache/camel/maven/RunMojo.java | 10 ++-- 14 files changed, 148 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
