Merge master # Conflicts: # kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java # pom.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/9152a5e0 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/9152a5e0 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/9152a5e0 Branch: refs/heads/master Commit: 9152a5e0aaeb08afba136793e16074e4e9d334c5 Parents: 77847a1 0de236a Author: Victor Antonovich <[email protected]> Authored: Wed Sep 9 19:42:44 2015 +0400 Committer: Victor Antonovich <[email protected]> Committed: Wed Sep 9 19:42:44 2015 +0400 ---------------------------------------------------------------------- NOTICE | 2 +- assembly/pom.xml | 86 ++-- assembly/src/main/resources/features.xml | 87 ++-- bundle/NOTICE | 2 +- bundle/pom.xml | 41 +- .../karaf/cellar/bundle/BundleSynchronizer.java | 2 + .../cellar/bundle/LocalBundleListener.java | 10 +- .../cellar/bundle/internal/osgi/Activator.java | 144 +++++++ .../karaf/cellar/bundle/shell/BlockCommand.java | 6 +- .../bundle/shell/BundleCommandSupport.java | 10 +- .../bundle/shell/InstallBundleCommand.java | 13 +- .../cellar/bundle/shell/ListBundleCommand.java | 8 +- .../cellar/bundle/shell/StartBundleCommand.java | 6 +- .../cellar/bundle/shell/StopBundleCommand.java | 7 +- .../bundle/shell/UninstallBundleCommand.java | 6 +- .../completers/AllBundlesNameCompleter.java | 14 +- .../completers/AllBundlesVersionCompleter.java | 14 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 67 ---- .../resources/OSGI-INF/blueprint/management.xml | 36 -- .../OSGI-INF/blueprint/shell-bundle.xml | 104 ----- cloud/NOTICE | 2 +- cloud/pom.xml | 23 +- .../apache/karaf/cellar/cloud/Activator.java | 46 --- .../cellar/cloud/internal/osgi/Activator.java | 47 +++ config/NOTICE | 2 +- config/pom.xml | 34 +- .../config/ConfigurationSynchronizer.java | 2 + .../cellar/config/internal/osgi/Activator.java | 143 +++++++ .../karaf/cellar/config/shell/BlockCommand.java | 13 +- .../cellar/config/shell/DeleteCommand.java | 13 +- .../karaf/cellar/config/shell/ListCommand.java | 11 +- .../cellar/config/shell/PropAppendCommand.java | 13 +- .../cellar/config/shell/PropDelCommand.java | 13 +- .../config/shell/PropExcludedCommand.java | 9 +- .../cellar/config/shell/PropListCommand.java | 11 +- .../cellar/config/shell/PropSetCommand.java | 13 +- .../completers/ClusterConfigCompleter.java | 16 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 81 ---- .../resources/OSGI-INF/blueprint/management.xml | 31 -- .../OSGI-INF/blueprint/shell-config.xml | 115 ------ core/NOTICE | 2 +- core/pom.xml | 22 +- .../karaf/cellar/core/command/TimeoutTask.java | 4 +- .../cellar/core/internal/osgi/Activator.java | 76 ++++ .../cellar/core/shell/CellarCommandSupport.java | 17 +- .../shell/completer/AllGroupsCompleter.java | 2 + .../core/shell/completer/AllNodeCompleter.java | 2 + .../shell/completer/GroupCompleterSupport.java | 12 +- .../shell/completer/LocalGroupsCompleter.java | 2 + .../shell/completer/NodeCompleterSupport.java | 12 +- .../shell/completer/OtherGroupsCompleter.java | 2 + .../resources/OSGI-INF/blueprint/blueprint.xml | 27 -- dosgi/NOTICE | 2 +- dosgi/pom.xml | 31 +- .../cellar/dosgi/internal/osgi/Activator.java | 125 ++++++ .../shell/ListDistributedServicesCommand.java | 6 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 58 --- .../resources/OSGI-INF/blueprint/management.xml | 32 -- .../OSGI-INF/blueprint/shell-dosgi.xml | 25 -- event/NOTICE | 2 +- event/pom.xml | 25 +- .../cellar/event/internal/osgi/Activator.java | 107 +++++ .../resources/OSGI-INF/blueprint/blueprint.xml | 60 --- features/NOTICE | 2 +- features/pom.xml | 37 +- .../cellar/features/FeaturesSynchronizer.java | 4 +- .../features/internal/osgi/Activator.java | 160 ++++++++ .../cellar/features/shell/BlockCommand.java | 11 +- .../features/shell/InstallFeatureCommand.java | 15 +- .../features/shell/ListFeaturesCommand.java | 17 +- .../cellar/features/shell/RepoAddCommand.java | 15 +- .../cellar/features/shell/RepoListCommand.java | 15 +- .../features/shell/RepoRemoveCommand.java | 15 +- .../features/shell/UninstallFeatureCommand.java | 13 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 75 ---- .../resources/OSGI-INF/blueprint/management.xml | 36 -- .../OSGI-INF/blueprint/shell-features.xml | 110 ------ hazelcast/NOTICE | 2 +- hazelcast/pom.xml | 27 +- .../factory/HazelcastConfigurationManager.java | 5 + .../hazelcast/internal/osgi/Activator.java | 395 +++++++++++++++++++ .../resources/OSGI-INF/blueprint/blueprint.xml | 197 --------- .../resources/OSGI-INF/blueprint/management.xml | 59 --- itests/pom.xml | 20 +- .../karaf/cellar/itests/CellarTestSupport.java | 167 ++++---- kubernetes/NOTICE | 2 +- kubernetes/pom.xml | 22 +- .../karaf/cellar/kubernetes/Activator.java | 46 --- .../kubernetes/internal/osgi/Activator.java | 45 +++ manual/NOTICE | 2 +- obr/NOTICE | 2 +- obr/pom.xml | 33 +- .../karaf/cellar/obr/ObrUrlSynchronizer.java | 2 + .../cellar/obr/internal/osgi/Activator.java | 140 +++++++ .../cellar/obr/shell/ObrAddUrlCommand.java | 11 +- .../cellar/obr/shell/ObrCommandSupport.java | 3 +- .../cellar/obr/shell/ObrDeployCommand.java | 13 +- .../karaf/cellar/obr/shell/ObrListCommand.java | 13 +- .../cellar/obr/shell/ObrListUrlCommand.java | 9 +- .../cellar/obr/shell/ObrRemoveUrlCommand.java | 11 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 65 --- .../resources/OSGI-INF/blueprint/management.xml | 30 -- .../OSGI-INF/blueprint/shell-commands.xml | 82 ---- pom.xml | 73 ++-- samples/camel-hazelcast-app/NOTICE | 2 +- samples/dosgi-greeter/NOTICE | 2 +- samples/dosgi-greeter/client/pom.xml | 17 +- .../dosgi/greeter/client/GreetCommand.java | 11 +- .../OSGI-INF/blueprint/shell-greeter.xml | 29 -- samples/dosgi-greeter/service/pom.xml | 24 +- .../dosgi/greeter/service/Activator.java | 48 +++ .../resources/OSGI-INF/blueprint/blueprint.xml | 39 -- samples/hazelcast-app/NOTICE | 2 +- samples/hazelcast-app/pom.xml | 4 +- shell/NOTICE | 2 +- shell/pom.xml | 30 +- .../cellar/shell/ClusterCommandSupport.java | 2 + .../karaf/cellar/shell/NodePingCommand.java | 9 +- .../karaf/cellar/shell/NodesListCommand.java | 7 +- .../apache/karaf/cellar/shell/SyncCommand.java | 14 +- .../shell/consumer/ConsumerStartCommand.java | 9 +- .../shell/consumer/ConsumerStatusCommand.java | 9 +- .../shell/consumer/ConsumerStopCommand.java | 9 +- .../cellar/shell/consumer/ConsumerSupport.java | 2 +- .../cellar/shell/group/GroupCreateCommand.java | 6 +- .../cellar/shell/group/GroupDeleteCommand.java | 9 +- .../cellar/shell/group/GroupJoinCommand.java | 11 +- .../cellar/shell/group/GroupListCommand.java | 9 +- .../cellar/shell/group/GroupPickCommand.java | 11 +- .../cellar/shell/group/GroupQuitCommand.java | 11 +- .../cellar/shell/group/GroupSetCommand.java | 11 +- .../karaf/cellar/shell/group/GroupSupport.java | 2 +- .../shell/handler/HandlersStartCommand.java | 9 +- .../shell/handler/HandlersStatusCommand.java | 9 +- .../shell/handler/HandlersStopCommand.java | 9 +- .../cellar/shell/handler/HandlersSupport.java | 2 +- .../shell/producer/ProducerStartCommand.java | 9 +- .../shell/producer/ProducerStatusCommand.java | 9 +- .../shell/producer/ProducerStopCommand.java | 9 +- .../cellar/shell/producer/ProducerSupport.java | 2 +- .../OSGI-INF/blueprint/shell-cluster.xml | 208 ---------- utils/NOTICE | 2 +- utils/pom.xml | 23 +- .../utils/ping/internal/osgi/Activator.java | 63 +++ .../resources/OSGI-INF/blueprint/blueprint.xml | 35 -- webconsole/NOTICE | 2 +- webconsole/pom.xml | 24 +- .../webconsole/internal/osgi/Activator.java | 74 ++++ .../OSGI-INF/blueprint/webconsole-cellar.xml | 37 -- 149 files changed, 2575 insertions(+), 2249 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9152a5e0/kubernetes/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9152a5e0/pom.xml ----------------------------------------------------------------------
