Merge branch 'karaf-3882-pem' of https://github.com/bimargulies/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d45cc2bf Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d45cc2bf Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d45cc2bf Branch: refs/heads/master Commit: d45cc2bf6ae4b6cb71d8c6cd1745542694fe2f1b Parents: 71f8732 c264abc Author: Jean-Baptiste Onofré <[email protected]> Authored: Sat Aug 22 08:47:14 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sat Aug 22 08:47:14 2015 +0200 ---------------------------------------------------------------------- assemblies/features/standard/pom.xml | 6 ++ .../standard/src/main/feature/feature.xml | 1 + .../karaf/features/internal/service/f01.xml | 1 + .../karaf/features/internal/service/f02.xml | 1 + itests/pom.xml | 14 ++++ .../apache/karaf/itests/SshKeyFormatTest.java | 79 ++++++++++++++++++++ .../resources/org/apache/karaf/itests/test.pem | 27 +++++++ pom.xml | 1 + shell/ssh/pom.xml | 14 ++++ .../org/apache/karaf/shell/ssh/Activator.java | 29 ++++++- .../ssh/OpenSSHGeneratorFileKeyProvider.java | 75 +++++++++++++++++++ .../OpenSSHGeneratorKeyFileProviderTest.java | 34 +++++++++ .../org/apache/karaf/shell/ssh/test.pem | 27 +++++++ 13 files changed, 305 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d45cc2bf/assemblies/features/standard/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d45cc2bf/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d45cc2bf/itests/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d45cc2bf/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d45cc2bf/shell/ssh/pom.xml ----------------------------------------------------------------------
