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 2015/11/27 11:17:28 UTC
[1/2] karaf git commit: [KARAF-3278] Display warning message when
trying to install an already installed bundle
Repository: karaf
Updated Branches:
refs/heads/master 7ccf06c01 -> 74f3b6ac5
[KARAF-3278] Display warning message when trying to install an already installed bundle
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d4615df8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d4615df8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d4615df8
Branch: refs/heads/master
Commit: d4615df81b93b8e5d495f5e6bd327f90d6e242d7
Parents: 66eeed5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 24 17:04:30 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 24 23:41:23 2015 +0100
----------------------------------------------------------------------
.../karaf/features/internal/service/FeaturesServiceImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d4615df8/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
index d7042ec..5558970 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
@@ -832,6 +832,12 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
if (f != null) {
String req = f.getName() + "/" + new VersionRange(f.getVersion(), true);
featuresToAdd.add(req);
+ Feature[] installedFeatures = listInstalledFeatures();
+ for (int i=0;i<installedFeatures.length;i++) {
+ if (installedFeatures[i].getName().equals(f.getName()) && installedFeatures[i].getVersion().equals(f.getVersion())) {
+ System.out.println("The specified feature: '" + installedFeatures[i].getName() + "' version '" + installedFeatures[i].getVersion() + "' is already installed");
+ }
+ }
matched = true;
}
}
[2/2] karaf git commit: Merge branch 'KARAF-3278' of
https://github.com/oscerd/karaf
Posted by jb...@apache.org.
Merge branch 'KARAF-3278' of https://github.com/oscerd/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/74f3b6ac
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/74f3b6ac
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/74f3b6ac
Branch: refs/heads/master
Commit: 74f3b6ac5b54298c47338a71b80de260b665c59d
Parents: 7ccf06c d4615df
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Nov 27 11:01:46 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Nov 27 11:01:46 2015 +0100
----------------------------------------------------------------------
.../karaf/features/internal/service/FeaturesServiceImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------