You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2014/07/11 11:42:45 UTC
[2/2] git commit: Merge branch 'karaf-2.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/45c3e409
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/45c3e409
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/45c3e409
Branch: refs/heads/karaf-2.x
Commit: 45c3e4096ac3f33fffb08b961045425ffdfa8480
Parents: f6ebe33 9d10031
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Jul 11 17:39:27 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Jul 11 17:39:27 2014 +0800
----------------------------------------------------------------------
.../admin/command/AdminCommandSupport.java | 19 ++++
.../karaf/admin/command/CloneCommand.java | 17 +++-
.../karaf/admin/command/CreateCommand.java | 22 ++++-
.../apache/karaf/admin/InstanceSettings.java | 29 ++++++-
.../karaf/admin/internal/AdminServiceImpl.java | 91 +++++++++++---------
.../admin/internal/AdminServiceImplTest.java | 15 ++++
admin/core/src/test/resources/myresource | 20 +++++
.../distribution/text/etc/system.properties | 16 +++-
.../bundles/internal/BundlesSelector.java | 10 +--
.../src/main/webapp/users-guide/failover.conf | 16 ++--
pom.xml | 4 +-
shell/config/pom.xml | 8 +-
.../shell/config/ConfigCommandSupport.java | 22 ++---
.../config/ConfigPropertyCommandSupport.java | 10 ++-
.../apache/karaf/shell/config/EditCommand.java | 5 +-
.../karaf/shell/config/PropAppendCommand.java | 2 +-
.../karaf/shell/config/PropDelCommand.java | 2 +-
.../karaf/shell/config/PropListCommand.java | 6 +-
.../karaf/shell/config/PropSetCommand.java | 2 +-
.../karaf/shell/config/UpdateCommand.java | 2 +-
.../console/commands/NamespaceHandler.java | 4 +-
.../apache/karaf/shell/osgi/BundleSelector.java | 10 +--
.../main/resources/res/karaf/ui/webconsole.css | 30 +++++--
23 files changed, 253 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/45c3e409/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
----------------------------------------------------------------------