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/331a48b8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/331a48b8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/331a48b8 Branch: refs/heads/master Commit: 331a48b86565fa22bbc51d0eb6203a375ea3bd3e Parents: d9a036c 68fc1ac Author: Scott England-Sullivan <sully6...@apache.org> Authored: Thu Jan 2 09:09:38 2014 -0600 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Thu Jan 2 09:09:38 2014 -0600 ---------------------------------------------------------------------- .../camel/builder/xml/XsltUriResolver.java | 4 ++ .../file/remote/sftp/SftpChmodTest.java | 5 ++ components/camel-jcr/pom.xml | 11 +++++ .../apache/camel/component/jcr/JcrProducer.java | 2 +- .../jcr/AuthTokenLoginFailureTest.java | 2 - .../camel/component/jcr/JcrAuthTestBase.java | 17 ++++--- .../jcr/JcrAuthTokenWithLoginTest.java | 5 +- .../component/jcr/JcrRouteTestSupport.java | 1 + .../camel/component/jgroups/JGroupsFilters.java | 9 +++- .../xslt/SaxonXslIncludetEmptyHrefTest.java | 49 ++++++++++++++++++++ .../component/xslt/transform_includes_data.xsl | 29 ++++++++++++ 11 files changed, 119 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
