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 2016/08/23 13:41:18 UTC
[1/2] karaf git commit: Fix compilation issue due to last commit on
features/core
Repository: karaf
Updated Branches:
refs/heads/master a51072133 -> 45ec65bf0
Fix compilation issue due to last commit on features/core
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/da6183b0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/da6183b0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/da6183b0
Branch: refs/heads/master
Commit: da6183b0515ff2c1789b58722c24c93b37dbabc2
Parents: a510721
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Tue Aug 23 15:36:50 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Tue Aug 23 15:36:50 2016 +0200
----------------------------------------------------------------------
.../karaf/features/internal/service/FeaturesServiceImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/da6183b0/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 7ade50c..81b1241 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
@@ -110,10 +110,11 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
private static final String FEATURE_OSGI_REQUIREMENT_PREFIX = "feature:";
/**
- * Our bundle.
+ * Our bundle and corresponding bundle context.
* We use it to check bundle operations affecting our own bundle.
*/
private final Bundle bundle;
+ private final BundleContext bundleContext;
/**
* The system bundle context.
[2/2] karaf git commit: [KARAF-4648] Use KARAF_BASE in wrapper
classpath/library instead of KARAF_HOME
Posted by jb...@apache.org.
[KARAF-4648] Use KARAF_BASE in wrapper classpath/library instead of KARAF_HOME
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/45ec65bf
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/45ec65bf
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/45ec65bf
Branch: refs/heads/master
Commit: 45ec65bf03aeb523c90ab25908b139f3610b5a7b
Parents: da6183b
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Tue Aug 23 15:37:11 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Tue Aug 23 15:37:11 2016 +0200
----------------------------------------------------------------------
.../org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf | 6 +++---
.../apache/karaf/wrapper/internal/windows/karaf-wrapper.conf | 6 +++---
.../apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/45ec65bf/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
index 6da4ac8..4432b1d 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
@@ -28,9 +28,9 @@ set.default.KARAF_ETC=${karaf.etc}
wrapper.working.dir=%KARAF_BASE%
wrapper.java.command=%JAVA_HOME%/bin/java
wrapper.java.mainclass=org.apache.karaf.wrapper.internal.service.Main
-wrapper.java.classpath.1=%KARAF_HOME%/lib/boot/*.jar
-wrapper.java.classpath.2=%KARAF_HOME%/lib/wrapper/*.jar
-wrapper.java.library.path.1=%KARAF_HOME%/lib/wrapper/
+wrapper.java.classpath.1=%KARAF_BASE%/lib/boot/*.jar
+wrapper.java.classpath.2=%KARAF_BASE%/lib/wrapper/*.jar
+wrapper.java.library.path.1=%KARAF_BASE%/lib/wrapper/
# Application Parameters. Add parameters as needed starting from 1
#wrapper.app.parameter.1=
http://git-wip-us.apache.org/repos/asf/karaf/blob/45ec65bf/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
index acff6ac..260b510 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
@@ -28,9 +28,9 @@ set.default.KARAF_ETC=${karaf.etc}
wrapper.working.dir=%KARAF_BASE%
wrapper.java.command=%JAVA_HOME%/bin/java
wrapper.java.mainclass=org.apache.karaf.wrapper.internal.service.Main
-wrapper.java.classpath.1=%KARAF_HOME%/lib/boot/*.jar
-wrapper.java.classpath.2=%KARAF_HOME%/lib/wrapper/*.jar
-wrapper.java.library.path.1=%KARAF_HOME%/lib/wrapper/
+wrapper.java.classpath.1=%KARAF_BASE%/lib/boot/*.jar
+wrapper.java.classpath.2=%KARAF_BASE%/lib/wrapper/*.jar
+wrapper.java.library.path.1=%KARAF_BASE%/lib/wrapper/
# Application Parameters. Add parameters as needed starting from 1
#wrapper.app.parameter.1=
http://git-wip-us.apache.org/repos/asf/karaf/blob/45ec65bf/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
index acff6ac..260b510 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
@@ -28,9 +28,9 @@ set.default.KARAF_ETC=${karaf.etc}
wrapper.working.dir=%KARAF_BASE%
wrapper.java.command=%JAVA_HOME%/bin/java
wrapper.java.mainclass=org.apache.karaf.wrapper.internal.service.Main
-wrapper.java.classpath.1=%KARAF_HOME%/lib/boot/*.jar
-wrapper.java.classpath.2=%KARAF_HOME%/lib/wrapper/*.jar
-wrapper.java.library.path.1=%KARAF_HOME%/lib/wrapper/
+wrapper.java.classpath.1=%KARAF_BASE%/lib/boot/*.jar
+wrapper.java.classpath.2=%KARAF_BASE%/lib/wrapper/*.jar
+wrapper.java.library.path.1=%KARAF_BASE%/lib/wrapper/
# Application Parameters. Add parameters as needed starting from 1
#wrapper.app.parameter.1=