You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/04/01 15:01:58 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0e458989
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0e458989
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0e458989
Branch: refs/heads/master
Commit: 0e45898946986cb4ca0b6bf4aa382a9f6cd47399
Parents: 49f897b 1709527
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Apr 1 15:01:35 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Apr 1 15:01:35 2014 +0200
----------------------------------------------------------------------
.../apache/karaf/bundle/command/LoadTest.java | 14 +-
.../bundle/core/internal/osgi/Activator.java | 124 +------
.../karaf/config/core/impl/osgi/Activator.java | 122 +------
deployer/blueprint/pom.xml | 3 +-
.../deployer/blueprint/osgi/Activator.java | 31 +-
.../karaf/deployer/features/osgi/Activator.java | 99 +-----
.../karaf/deployer/kar/osgi/Activator.java | 55 +--
deployer/spring/pom.xml | 3 +-
.../karaf/deployer/spring/osgi/Activator.java | 31 +-
.../karaf/deployer/wrap/osgi/Activator.java | 42 +--
features/core/pom.xml | 12 -
.../karaf/features/RegionsPersistence.java | 26 ++
.../karaf/features/internal/BundleManager.java | 21 +-
.../internal/PersistentBundleManager.java | 59 ----
.../karaf/features/internal/osgi/Activator.java | 217 +++---------
instance/core/pom.xml | 3 +-
.../instance/core/internal/osgi/Activator.java | 57 +---
.../apache/karaf/itests/KarafTestSupport.java | 2 +-
.../itests/features/EnterpriseFeaturesTest.java | 24 +-
.../itests/features/Spring3FeaturesTest.java | 8 +-
.../itests/features/StandardFeaturesTest.java | 40 +--
.../karaf/jaas/modules/impl/Activator.java | 14 +
.../karaf/kar/internal/osgi/Activator.java | 158 +--------
.../karaf/log/core/internal/osgi/Activator.java | 196 ++---------
.../main/java/org/apache/karaf/main/Main.java | 34 +-
.../apache/karaf/main/ShutdownSocketThread.java | 1 +
.../org/apache/karaf/main/util/StringMap.java | 103 ------
.../apache/karaf/main/util/StringMapTest.java | 39 ---
.../karaf/management/internal/Activator.java | 238 ++-----------
package/core/pom.xml | 7 +
.../packages/core/internal/osgi/Activator.java | 60 +---
region/core/pom.xml | 8 +-
.../region/persist/RegionsPersistence.java | 26 --
.../region/persist/internal/Activator.java | 8 +-
.../persist/internal/RegionsBundleTracker.java | 12 +-
.../internal/RegionsPersistenceImpl.java | 3 +-
service/core/pom.xml | 9 +-
.../service/core/internal/osgi/Activator.java | 44 +--
.../shell/impl/action/command/ManagerImpl.java | 2 +-
.../action/osgi/AggregateServiceTracker.java | 123 ++++---
.../shell/impl/action/osgi/CommandExtender.java | 1 +
.../impl/action/osgi/CommandExtension.java | 141 ++++----
.../impl/action/osgi/MultiServiceTracker.java | 96 +++---
.../shell/impl/action/osgi/Satisfiable.java | 30 --
.../impl/action/osgi/SingleServiceTracker.java | 86 ++---
.../org/apache/karaf/shell/ssh/Activator.java | 158 +++------
system/core/pom.xml | 5 +
.../karaf/system/internal/osgi/Activator.java | 63 +---
util/pom.xml | 9 +
.../karaf/util/tracker/BaseActivator.java | 337 +++++++++++++++++++
wrapper/core/pom.xml | 3 +-
.../karaf/wrapper/internal/osgi/Activator.java | 60 +---
52 files changed, 1000 insertions(+), 2067 deletions(-)
----------------------------------------------------------------------