You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/03/08 14:19:27 UTC
[1/4] karaf git commit: [KARAF-3744] Configure the Felix logger
correctly
Repository: karaf
Updated Branches:
refs/heads/master 01ffa23d4 -> 010e3aeb4
[KARAF-3744] Configure the Felix logger correctly
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/010e3aeb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/010e3aeb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/010e3aeb
Branch: refs/heads/master
Commit: 010e3aeb430e20796da8f22d9b383e2ad8c7c8bd
Parents: 7194255
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Mar 8 13:16:02 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Mar 8 13:16:33 2016 +0100
----------------------------------------------------------------------
main/src/main/java/org/apache/karaf/main/Main.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/010e3aeb/main/src/main/java/org/apache/karaf/main/Main.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java
index 4b4179e..1eae257 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -22,7 +22,9 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
@@ -33,7 +35,6 @@ import java.util.List;
import org.apache.felix.utils.properties.Properties;
import java.util.StringTokenizer;
-import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -253,7 +254,7 @@ public class Main {
/*
* KARAF-3706: disable the logger related code to avoid the exception
* It needs to be revisited when the FELIX-4871 is fixed.
- *
+ */
// Hack to set felix logger
try {
if (framework.getClass().getName().startsWith("org.apache.felix.")) {
@@ -263,7 +264,7 @@ public class Main {
Method method = logger.getClass().getDeclaredMethod("setLogger", Object.class);
method.setAccessible(true);
method.invoke(logger, new Object() {
- public void log(ServiceReference sr, int level, String message, Throwable exception) {
+ public void log(int level, String message, Throwable exception) {
Level lvl;
switch (level) {
case 1:
@@ -289,7 +290,6 @@ public class Main {
} catch (Throwable t) {
t.printStackTrace();
}
- */
framework.init();
framework.getBundleContext().addFrameworkListener(lockCallback);
[3/4] karaf git commit: [KARAF-3974] Impossible to connect through
SSH after reboot clean
Posted by gn...@apache.org.
[KARAF-3974] Impossible to connect through SSH after reboot clean
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/71942556
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/71942556
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/71942556
Branch: refs/heads/master
Commit: 71942556ca2a7796fa6908aeec069442811d5f45
Parents: 7fe50ce
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Mar 8 13:15:11 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Mar 8 13:16:33 2016 +0100
----------------------------------------------------------------------
.../src/main/filtered-resources/resources/etc/config.properties | 4 ++++
assemblies/features/framework/src/main/feature/feature.xml | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/71942556/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index 1153359..5869113 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -170,6 +170,10 @@ felix.fileinstall.noInitialDelay = true
felix.fileinstall.log.level = 3
felix.fileinstall.log.default = jul
+# Use cached urls for bundle CodeSource to avoid
+# problems with JCE cached informations, see KARAF-3974
+felix.bundlecodesource.usecachedurls = true
+
#
# Delay for writing the framework state to disk in equinox
# must be >= 1000 and <= 1800000
http://git-wip-us.apache.org/repos/asf/karaf/blob/71942556/assemblies/features/framework/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
index 548d9c0..6deab64 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -33,9 +33,6 @@
<bundle start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
<!-- features service -->
<bundle start="true" start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
- <!-- sshd -->
- <bundle start="true" start-level="20">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
-
</feature>
</features>
[2/4] karaf git commit: [KARAF-4405] Upgrade to Felix Framework 5.6.0
Posted by gn...@apache.org.
[KARAF-4405] Upgrade to Felix Framework 5.6.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7fe50ce9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7fe50ce9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7fe50ce9
Branch: refs/heads/master
Commit: 7fe50ce9b3ab9222e5532c9d8844a4dcadc2d33b
Parents: 4eed514
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Mar 8 13:09:31 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Mar 8 13:16:33 2016 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7fe50ce9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef79b63..f2602f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@
<felix.connect.version>0.1.0</felix.connect.version>
<felix.coordinator.version>1.0.2</felix.coordinator.version>
<felix.fileinstall.version>3.5.2</felix.fileinstall.version>
- <felix.framework.version>5.4.0</felix.framework.version>
+ <felix.framework.version>5.5.0-SNAPSHOT</felix.framework.version>
<felix.framework.security.version>2.4.0</felix.framework.security.version>
<felix.gogo.version>0.16.2</felix.gogo.version>
<felix.inventory.version>1.0.4</felix.inventory.version>
@@ -198,7 +198,7 @@
<felix.scr.compat.version>1.0.2</felix.scr.compat.version>
<felix.scr.webconsole.plugin.version>2.0.2</felix.scr.webconsole.plugin.version>
<felix.scr.annotation.version>1.6.0</felix.scr.annotation.version>
- <felix.resolver.version>1.8.0</felix.resolver.version>
+ <felix.resolver.version>1.9.0-SNAPSHOT</felix.resolver.version>
<aries.application.version>1.0.0</aries.application.version>
<aries.application.api.version>1.0.0</aries.application.api.version>
[4/4] karaf git commit: Fix possible NPE
Posted by gn...@apache.org.
Fix possible NPE
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4eed5140
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4eed5140
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4eed5140
Branch: refs/heads/master
Commit: 4eed5140dd6af7f4ab857a8aa54339e9621a4d9f
Parents: 01ffa23
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Mar 8 13:08:59 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Mar 8 13:16:33 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/karaf/features/internal/service/Deployer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/4eed5140/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index 1414b70..b7b7af6 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -961,7 +961,7 @@ public class Deployer {
continue;
}
// Ignore bundles that won't be wired
- List<Wire> newWires = resolution.get(resource);
+ List<Wire> newWires = resolution != null ? resolution.get(resource) : null;
if (newWires == null) {
continue;
}