You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2017/12/11 14:27:06 UTC
[karaf] branch karaf-4.1.x updated (2252b64 -> 7856321)
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a change to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git.
from 2252b64 [KARAF-5464] Add KARAF_SYSTEM_OPTS on karaf.bat and add corresponding comments in setenv
new 2dd0101 [KARAF-5528] Stop refreshed bundles together with updated and deleted ones
new 7856321 [KARAF-5528] Add jansi as startup bundle, so pax-logging-log4j2 is not refreshed after installing "shell" feature
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
assemblies/features/framework/src/main/feature/feature.xml | 1 +
assemblies/features/static/src/main/feature/feature.xml | 1 +
.../java/org/apache/karaf/features/internal/service/Deployer.java | 7 ++++++-
3 files changed, 8 insertions(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].
[karaf] 01/02: [KARAF-5528] Stop refreshed bundles together with
updated and deleted ones
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 2dd0101d5c58e58f7a558a746aa7ae0b803eff61
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Mon Dec 11 13:53:48 2017 +0100
[KARAF-5528] Stop refreshed bundles together with updated and deleted ones
(cherry picked from commit 367d6c9e586a288966283de29f57435c4c63030c)
---
.../java/org/apache/karaf/features/internal/service/Deployer.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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 8cfd439..c482e80 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
@@ -556,7 +556,7 @@ public class Deployer {
//
// Execute deployment
//
- // #1: stop bundles that needs to be updated or uninstalled in order
+ // #1: stop bundles that needs to be updated or uninstalled or refreshed in order
// #2: uninstall needed bundles
// #3: update regions
// #4: update bundles
@@ -630,6 +630,11 @@ public class Deployer {
toStop.addAll(regionDeployment.toUpdate.keySet());
toStop.addAll(regionDeployment.toDelete);
}
+ if (!noRefresh) {
+ Set<Bundle> toRefreshToStopEarly = new HashSet<>(toRefresh.keySet());
+ toRefreshToStopEarly.remove(dstate.serviceBundle);
+ toStop.addAll(toRefreshToStopEarly);
+ }
removeFragmentsAndBundlesInState(toStop, UNINSTALLED | RESOLVED | STOPPING);
if (!toStop.isEmpty()) {
print("Stopping bundles:", verbose);
--
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.
[karaf] 02/02: [KARAF-5528] Add jansi as startup bundle,
so pax-logging-log4j2 is not refreshed after installing "shell"
feature
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 7856321ccc7feab7c4745c6397d94a0c3757ae33
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Mon Dec 11 13:54:06 2017 +0100
[KARAF-5528] Add jansi as startup bundle, so pax-logging-log4j2 is not refreshed after installing "shell" feature
(cherry picked from commit f0125908341f2d18ffb634f145192965db0f1c75)
---
assemblies/features/framework/src/main/feature/feature.xml | 1 +
assemblies/features/static/src/main/feature/feature.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
index 6dbe1a1..ac158ae 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -29,6 +29,7 @@
<!-- logging -->
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version}</bundle>
+ <bundle start="true" start-level="8">mvn:org.fusesource.jansi/jansi/${jansi.version}</bundle>
<!-- config admin -->
<bundle start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<!-- file install -->
diff --git a/assemblies/features/static/src/main/feature/feature.xml b/assemblies/features/static/src/main/feature/feature.xml
index 375f75e..9ff34e7 100644
--- a/assemblies/features/static/src/main/feature/feature.xml
+++ b/assemblies/features/static/src/main/feature/feature.xml
@@ -22,6 +22,7 @@
<!-- logging -->
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version}</bundle>
+ <bundle start="true" start-level="8">mvn:org.fusesource.jansi/jansi/${jansi.version}</bundle>
<!-- static config admin -->
<bundle start="true" start-level="10">mvn:org.apache.karaf.services/org.apache.karaf.services.staticcm/${project.version}</bundle>
</feature>
--
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.