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:29 UTC

[3/4] karaf git commit: [KARAF-3974] Impossible to connect through SSH after reboot clean

[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>