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/06/12 14:30:24 UTC
karaf git commit: Revert "[KARAF-3779] Add property to allow users to
define the kar storage location"
Repository: karaf
Updated Branches:
refs/heads/master ddf9601bc -> 516432d08
Revert "[KARAF-3779] Add property to allow users to define the kar storage location"
This reverts commit 6851ba8acb1cd4a88ac5660feac3dc5e4e83345a.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/516432d0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/516432d0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/516432d0
Branch: refs/heads/master
Commit: 516432d08ac9e1dce03fec1ab95a750e79128247
Parents: ddf9601
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jun 12 14:30:16 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jun 12 14:30:16 2015 +0200
----------------------------------------------------------------------
.../main/resources/resources/etc/org.apache.karaf.kar.cfg | 8 +-------
.../org/apache/karaf/kar/internal/KarServiceImpl.java | 10 +++++-----
.../org/apache/karaf/kar/internal/osgi/Activator.java | 5 +----
3 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/516432d0/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.kar.cfg
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.kar.cfg b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.kar.cfg
index e49d43b..6c7cf16 100644
--- a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.kar.cfg
+++ b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.kar.cfg
@@ -21,10 +21,4 @@
# Enable or disable the refresh of the bundles when installing
# the features contained in a KAR file
#
-noAutoRefreshBundles=false
-
-#
-# By default, the KAR files are copied into KARAF_DATA/kar folder.
-# You can specify the directory of your choice.
-#
-#storage=${karaf.data}/kar
\ No newline at end of file
+noAutoRefreshBundles=false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf/blob/516432d0/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
----------------------------------------------------------------------
diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
index 0fc2640..3f760f9 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
@@ -67,13 +67,13 @@ public class KarServiceImpl implements KarService {
private boolean noAutoRefreshBundles;
- public KarServiceImpl(String storage, FeaturesService featuresService) {
- this.base = new File(storage);
- this.storage = new File(storage);
+ public KarServiceImpl(String karafBase, FeaturesService featuresService) {
+ this.base = new File(karafBase);
+ this.storage = new File(this.base, "data" + File.separator + "kar");
this.featuresService = featuresService;
this.storage.mkdirs();
- if (!this.storage.isDirectory()) {
- throw new IllegalStateException("KAR storage " + this.storage + " is not a directory");
+ if (!storage.isDirectory()) {
+ throw new IllegalStateException("KAR storage " + storage + " is not a directory");
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/516432d0/kar/src/main/java/org/apache/karaf/kar/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/osgi/Activator.java b/kar/src/main/java/org/apache/karaf/kar/internal/osgi/Activator.java
index 5d01456..70c1f13 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/osgi/Activator.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/osgi/Activator.java
@@ -27,8 +27,6 @@ import org.apache.karaf.util.tracker.annotation.RequireService;
import org.apache.karaf.util.tracker.annotation.Services;
import org.osgi.service.cm.ManagedService;
-import java.io.File;
-
@Services(
requires = @RequireService(FeaturesService.class),
provides = @ProvideService(KarService.class)
@@ -43,10 +41,9 @@ public class Activator extends BaseActivator implements ManagedService {
}
boolean noAutoRefreshBundles = getBoolean("noAutoRefreshBundles", false);
- String karStorage = getString("storage", System.getProperty("karaf.base") + File.separator + "kar");
KarServiceImpl karService = new KarServiceImpl(
- karStorage,
+ System.getProperty("karaf.base"),
featuresService
);
karService.setNoAutoRefreshBundles(noAutoRefreshBundles);