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/09/22 10:08:56 UTC

[1/8] karaf git commit: Fix exception in grep with colored output

Repository: karaf
Updated Branches:
  refs/heads/master a8049e01f -> 858920dd0


Fix exception in grep with colored output

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b6e09858
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b6e09858
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b6e09858

Branch: refs/heads/master
Commit: b6e09858a96c7fc384bf10b9dc7b05db7add5f30
Parents: a8049e0
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Sep 21 10:34:06 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Sep 21 10:34:06 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/karaf/shell/commands/impl/GrepAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/b6e09858/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
index d15d4e9..6dcb054 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/GrepAction.java
@@ -175,9 +175,9 @@ public class GrepAction implements Action {
                             sbl.append(String.format("%6d  ", lineno));
                         }
                         sbl.style(AttributedStyle.DEFAULT);
-                        Matcher matcher2 = p2.matcher(line);
                         AttributedString aLine = AttributedString.fromAnsi(line);
                         AttributedStyle style;
+                        Matcher matcher2 = p2.matcher(aLine.toString());
                         if (!invertMatch && color != ColorOption.never) {
                             style = getMatchingStyle();
                         } else {


[4/8] karaf git commit: Small simplification of the bin/karaf script to avoid duplicate launch code

Posted by gn...@apache.org.
Small simplification of the bin/karaf script to avoid duplicate launch code

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/500f79f1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/500f79f1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/500f79f1

Branch: refs/heads/master
Commit: 500f79f134bf3bfb56f4e17db75d0847773aed12
Parents: 311a08f
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Sep 21 10:37:23 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Sep 21 10:37:23 2016 +0200

----------------------------------------------------------------------
 .../base/src/main/resources/resources/bin/karaf | 57 ++++++++------------
 1 file changed, 23 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/500f79f1/assemblies/features/base/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf
index 7a2a507..f78f8c7 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -477,7 +477,6 @@ run() {
         KARAF_EXEC=""
     fi
 
-    echo $CLASSPATH
     while true; do
         # When users want to update the lib version of, they just need to create
         # a lib.next directory and on the new restart, it will replace the current lib directory.
@@ -495,41 +494,31 @@ run() {
 
         if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then
             if [ "${VERSION}" -gt "80" ]; then
-                $KARAF_EXEC "$JAVA" $JAVA_OPTS \
-                    --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED \
-                    -Dkaraf.instances="${KARAF_HOME}/instances" \
-                    -Dkaraf.home="$KARAF_HOME" \
-                    -Dkaraf.base="$KARAF_BASE" \
-                    -Dkaraf.data="$KARAF_DATA" \
-                    -Dkaraf.etc="$KARAF_ETC" \
-                    -Dkaraf.restart.jvm.supported=true \
-                    -Djava.io.tmpdir="$KARAF_DATA/tmp" \
-                    -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" \
-                    -Dorg.apache.servicemix.specs.debug=true \
-                    --add-modules java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws,jdk.xml.bind \
-                    $KARAF_SYSTEM_OPTS \
-                    $KARAF_OPTS \
-                    $OPTS \
-                    -classpath "$CLASSPATH" \
-                    $MAIN "$@"
+                JDK_89_OPTS="--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"
+                JDK_89_OPTS="${JDK_89_OPTS} --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"
+                JDK_89_OPTS="${JDK_89_OPTS} --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED"
+                JDK_89_OPTS="${JDK_89_OPTS} --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED"
+                JDK_89_OPTS="${JDK_89_OPTS} --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"
+                JDK_89_OPTS="${JDK_89_OPTS} --add-modules java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws,jdk.xml.bind"
             else
-                ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
-                    -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" \
-                    -Djava.ext.dirs="${JAVA_EXT_DIRS}" \
-                    -Dkaraf.instances="${KARAF_HOME}/instances" \
-                    -Dkaraf.home="${KARAF_HOME}" \
-                    -Dkaraf.base="${KARAF_BASE}" \
-                    -Dkaraf.data="${KARAF_DATA}" \
-                    -Dkaraf.etc="${KARAF_ETC}" \
-                    -Dkaraf.restart.jvm.supported=true \
-                    -Djava.io.tmpdir="${KARAF_DATA}/tmp" \
-                    -Djava.util.logging.config.file="${KARAF_BASE}/etc/java.util.logging.properties" \
-                    ${KARAF_SYSTEM_OPTS} \
-                    ${KARAF_OPTS} \
-                    ${OPTS} \
-                    -classpath "${CLASSPATH}" \
-                    ${MAIN} "$@"
+                JDK_89_OPTS="-Djava.endorsed.dirs=${JAVA_ENDORSED_DIRS}"
+                JDK_89_OPTS="${JDK_89_OPTS} -Djava.ext.dirs=${JAVA_EXT_DIRS}"
             fi
+            ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
+                ${JDK_89_OPTS} \
+                -Dkaraf.instances="${KARAF_HOME}/instances" \
+                -Dkaraf.home="${KARAF_HOME}" \
+                -Dkaraf.base="${KARAF_BASE}" \
+                -Dkaraf.data="${KARAF_DATA}" \
+                -Dkaraf.etc="${KARAF_ETC}" \
+                -Dkaraf.restart.jvm.supported=true \
+                -Djava.io.tmpdir="${KARAF_DATA}/tmp" \
+                -Djava.util.logging.config.file="${KARAF_BASE}/etc/java.util.logging.properties" \
+                ${KARAF_SYSTEM_OPTS} \
+                ${KARAF_OPTS} \
+                ${OPTS} \
+                -classpath "${CLASSPATH}" \
+                ${MAIN} "$@"
         else
             die "There is a Root instance already running with name ${ROOT_INSTANCE_NAME} and pid ${ROOT_INSTANCE_PID}"
         fi


[5/8] karaf git commit: Add back the xerces / xalan endorsed libraries

Posted by gn...@apache.org.
Add back the xerces / xalan endorsed libraries

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0f199973
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0f199973
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0f199973

Branch: refs/heads/master
Commit: 0f199973bf44601dcc1ed9324c301d75c6b0aded
Parents: 500f79f
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Sep 21 10:38:25 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Sep 21 10:38:25 2016 +0200

----------------------------------------------------------------------
 assemblies/apache-karaf/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/0f199973/assemblies/apache-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index 596303c..758a090 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -191,13 +191,14 @@
                         <feature>system</feature>
                     </bootFeatures>
                     <libraries>
-                        <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true</library>
+                        <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true;delegate:=true</library>
                         <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version};type:=endorsed;export:=true</library>
                         <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
                         <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
                         <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version};type:=endorsed;export:=true</library>
                         <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version};type:=endorsed;export:=true</library>
                         <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
+                        <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version};type:=endorsed;export:=true</library>
                         <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalan-serializer.bundle.version};type:=endorsed;export:=true</library>
                         <library>mvn:javax.annotation/javax.annotation-api/1.2;type:=endorsed;export:=true</library>
 


[7/8] karaf git commit: [KARAF-4723] Make sure satisfied activators are started synchronously

Posted by gn...@apache.org.
[KARAF-4723] Make sure satisfied activators are started synchronously

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bff44499
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bff44499
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bff44499

Branch: refs/heads/master
Commit: bff4449972dc991e572681d1278249a05d7c2166
Parents: 3062a86
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Sep 22 12:06:52 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Sep 22 12:06:52 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/karaf/util/tracker/BaseActivator.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/bff44499/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
----------------------------------------------------------------------
diff --git a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
index b6e457d..d2c09e1 100644
--- a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
+++ b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
@@ -71,7 +71,9 @@ public class BaseActivator implements BundleActivator, Runnable {
         scheduled.set(true);
         doOpen();
         scheduled.set(false);
-        if (managedServiceRegistration == null && trackers.isEmpty()) {
+        if (managedServiceRegistration == null
+                && trackers.values().stream()
+                    .allMatch(t -> t.getService() != null)) {
             try {
                 doStart();
             } catch (Exception e) {


[2/8] karaf git commit: Restore « la -l » command behavior

Posted by gn...@apache.org.
Restore ��la -l�� command behavior 

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7f5b904d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7f5b904d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7f5b904d

Branch: refs/heads/master
Commit: 7f5b904d6a206e37991e2f2d8ecb468b8b086558
Parents: b6e0985
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Sep 21 10:35:13 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Sep 21 10:35:13 2016 +0200

----------------------------------------------------------------------
 .../base/src/main/resources/resources/etc/shell.init.script        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/7f5b904d/assemblies/features/base/src/main/resources/resources/etc/shell.init.script
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/etc/shell.init.script b/assemblies/features/base/src/main/resources/resources/etc/shell.init.script
index 35afc12..5977a44 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/shell.init.script
+++ b/assemblies/features/base/src/main/resources/resources/etc/shell.init.script
@@ -22,7 +22,7 @@
 //
 ld = { log:display $args } ;
 lde = { log:exception-display $args } ;
-la = { bundle:list -t 0 $args } ;
+la = { if { $argv contains "-l" } { bundle:list -t 0 --no-name $args } { bundle:list -t -0 $args } } ;
 ls = { service:list $args } ;
 cl = { config:list "(service.pid=$args)" } ;
 halt = { system:shutdown -h -f $args } ;


[6/8] karaf git commit: Add a way to override config/system properties from the pom More complicated operations require the use of the propertyEdits.

Posted by gn...@apache.org.
Add a way to override config/system properties from the pom
More complicated operations require the use of the propertyEdits.

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3062a86c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3062a86c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3062a86c

Branch: refs/heads/master
Commit: 3062a86cf412cc6361555738c7d8828c89363130
Parents: 0f19997
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Sep 21 13:35:16 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Sep 21 13:35:16 2016 +0200

----------------------------------------------------------------------
 .../apache/karaf/profile/assembly/Builder.java   | 19 +++++++++++++++++--
 .../org/apache/karaf/tooling/AssemblyMojo.java   | 14 ++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/3062a86c/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 033714b..e3678d2 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -156,6 +156,8 @@ public class Builder {
     boolean offline;
     String localRepository;
     String mavenRepositories;
+    Map<String, String> config = new LinkedHashMap<>();
+    Map<String, String> system = new LinkedHashMap<>();
 
     private ScheduledExecutorService executor;
     private DownloadManager manager;
@@ -378,6 +380,16 @@ public class Builder {
         return this;
     }
 
+    public Builder config(String key, String value) {
+        this.config.put(key, value);
+        return this;
+    }
+
+    public Builder system(String key, String value) {
+        this.system.put(key, value);
+        return this;
+    }
+
     public List<String> getBlacklistedProfiles() {
         return blacklistedProfiles;
     }
@@ -516,8 +528,11 @@ public class Builder {
         //
         // Compute overall profile
         //
-        Profile overallProfile = ProfileBuilder.Factory.create(UUID.randomUUID().toString())
-                .setParents(Arrays.asList(startupProfile.getId(), bootProfile.getId(), installedProfile.getId()))
+        ProfileBuilder builder = ProfileBuilder.Factory.create(UUID.randomUUID().toString())
+                .setParents(Arrays.asList(startupProfile.getId(), bootProfile.getId(), installedProfile.getId()));
+        config.forEach((k ,v) -> builder.addConfiguration(Profile.INTERNAL_PID, Profile.CONFIG_PREFIX + k, v));
+        system.forEach((k ,v) -> builder.addConfiguration(Profile.INTERNAL_PID, Profile.SYSTEM_PREFIX + k, v));
+        Profile overallProfile = builder
                 .getProfile();
         Profile overallOverlay = Profiles.getOverlay(overallProfile, allProfiles, environment);
         Profile overallEffective = Profiles.getEffective(overallOverlay, false);

http://git-wip-us.apache.org/repos/asf/karaf/blob/3062a86c/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
index 8620c30..8880f98 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
@@ -230,6 +230,12 @@ public class AssemblyMojo extends MojoSupport {
     @Parameter
     protected Map<String, String> translatedUrls;
 
+    @Parameter
+    protected Map<String, String> config;
+
+    @Parameter
+    protected Map<String, String> system;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         try {
@@ -295,6 +301,14 @@ public class AssemblyMojo extends MojoSupport {
         builder.mavenRepositories(remote.toString());
         builder.javase(javase);
 
+        // Set up config and system props
+        if (config != null) {
+            config.forEach(builder::config);
+        }
+        if (system != null) {
+            system.forEach(builder::system);
+        }
+
         // Set up blacklisted items
         builder.blacklistBundles(blacklistedBundles);
         builder.blacklistFeatures(blacklistedFeatures);


[8/8] karaf git commit: [KARAF-4727] SCR bundle state should not report SATISFIED components

Posted by gn...@apache.org.
[KARAF-4727] SCR bundle state should not report SATISFIED components

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/858920dd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/858920dd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/858920dd

Branch: refs/heads/master
Commit: 858920dd0a50af2d52003c3e75ac5063b027ddac
Parents: bff4449
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Sep 22 12:08:34 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Sep 22 12:08:34 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/karaf/scr/state/ScrBundleStateService.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/858920dd/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java
----------------------------------------------------------------------
diff --git a/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java b/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java
index 67cc045..03485a4 100644
--- a/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java
+++ b/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java
@@ -42,7 +42,8 @@ public class ScrBundleStateService implements BundleStateService {
         StringBuilder sb = new StringBuilder();
         for (ComponentDescriptionDTO desc : scr.getComponentDescriptionDTOs(bundle)) {
             for (ComponentConfigurationDTO cfg : scr.getComponentConfigurationDTOs(desc)) {
-                if (cfg.state != ComponentConfigurationDTO.ACTIVE) {
+                if (cfg.state != ComponentConfigurationDTO.ACTIVE
+                        && cfg.state != ComponentConfigurationDTO.SATISFIED) {
                     sb.append(cfg.description.name).append(" (").append(cfg.id).append(")\n");
                     if ((cfg.state & ComponentConfigurationDTO.UNSATISFIED_CONFIGURATION) != 0) {
                         sb.append("  missing configurations: ");
@@ -79,7 +80,8 @@ public class ScrBundleStateService implements BundleStateService {
         if (bundle.getState() == Bundle.ACTIVE) {
             for (ComponentDescriptionDTO desc : scr.getComponentDescriptionDTOs(bundle)) {
                 for (ComponentConfigurationDTO cfg : scr.getComponentConfigurationDTOs(desc)) {
-                    if (cfg.state != ComponentConfigurationDTO.ACTIVE) {
+                    if (cfg.state != ComponentConfigurationDTO.ACTIVE
+                            && cfg.state != ComponentConfigurationDTO.SATISFIED) {
                         return BundleState.Waiting;
                     }
                 }


[3/8] karaf git commit: Add back the README in lib/endorsed We’ll have to improve it with JDK 9 informations

Posted by gn...@apache.org.
Add back the README in lib/endorsed
We\u2019ll have to improve it with JDK 9 informations

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/311a08f5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/311a08f5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/311a08f5

Branch: refs/heads/master
Commit: 311a08f53e961b514a92e86490f5db623c08de9d
Parents: 7f5b904
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Sep 21 10:36:39 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Sep 21 10:36:39 2016 +0200

----------------------------------------------------------------------
 .../resources/resources/lib/endorsed/README     | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/311a08f5/assemblies/features/base/src/main/resources/resources/lib/endorsed/README
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/lib/endorsed/README b/assemblies/features/base/src/main/resources/resources/lib/endorsed/README
new file mode 100644
index 0000000..0665a52
--- /dev/null
+++ b/assemblies/features/base/src/main/resources/resources/lib/endorsed/README
@@ -0,0 +1,23 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+This directory is the Java endorsed directory.
+Any jar in this folder will be used to override classes defined by the JVM.
+For more information, see:
+   http://download.oracle.com/javase/6/docs/technotes/guides/standards/