[08/19] git commit: Merge branch 'master' into jms_doc

[jbonofre]

Merge branch 'master' into jms_doc


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/54a50084
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/54a50084
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/54a50084

Branch: refs/heads/master
Commit: 54a50084338ea01514bad89250ab02fc881e3b57
Parents: 46e1403 96b36a6
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Wed Dec 18 18:51:04 2013 +0100
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Wed Dec 18 18:51:04 2013 +0100

----------------------------------------------------------------------
 .../src/main/resources/resources/etc/all.policy |  22 +++
 .../resources/resources/etc/system.properties   |  10 ++
 .../standard/src/main/feature/feature.xml       |   4 +
 .../apache/karaf/jaas/modules/JaasHelper.java   | 137 +++++++++++++++++++
 pom.xml                                         |   8 +-
 .../impl/jline/ConsoleFactoryService.java       |   9 +-
 .../apache/karaf/shell/ssh/ShellCommand.java    |   9 +-
 webconsole/console/pom.xml                      |   5 +
 .../webconsole/internal/KarafOsgiManager.java   |  12 +-
 9 files changed, 211 insertions(+), 5 deletions(-)
----------------------------------------------------------------------