Repository: karaf-cellar Updated Branches: refs/heads/master 933e17c39 -> 8e045af7c
Fix bundle headers Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/8e045af7 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/8e045af7 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/8e045af7 Branch: refs/heads/master Commit: 8e045af7c6eeaf7e80aba2e4a227728fa36d68d1 Parents: 933e17c Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Aug 26 21:59:27 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Aug 26 21:59:27 2015 +0200 ---------------------------------------------------------------------- assembly/pom.xml | 3 ++- .../org/apache/karaf/cellar/bundle/BundleSynchronizer.java | 2 ++ .../apache/karaf/cellar/config/ConfigurationSynchronizer.java | 2 ++ core/pom.xml | 5 +---- .../apache/karaf/cellar/features/FeaturesSynchronizer.java | 2 ++ hazelcast/pom.xml | 7 +------ .../java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java | 2 ++ shell/pom.xml | 3 --- utils/pom.xml | 4 +--- 9 files changed, 13 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 13f1e6a..c427ba8 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -63,6 +63,7 @@ </resource> </resources> <plugins> + <!-- <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> @@ -94,7 +95,6 @@ <feature>cellar-obr</feature> <feature>cellar-eventadmin</feature> <feature>cellar-cloud</feature> - <!-- <feature>cellar-kubernetes</feature> --> <feature>cellar-webconsole</feature> </features> <verifyTransitive>false</verifyTransitive> @@ -102,6 +102,7 @@ </execution> </executions> </plugin> + --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java index b8278e2..d97a958 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java @@ -42,6 +42,8 @@ public class BundleSynchronizer extends BundleSupport implements Synchronizer { private static final transient Logger LOGGER = LoggerFactory.getLogger(BundleSynchronizer.class); public void init() { + if (groupManager == null) + return; Set<Group> groups = groupManager.listLocalGroups(); if (groups != null && !groups.isEmpty()) { for (Group group : groups) { http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java index 307ae19..5ff6737 100644 --- a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java +++ b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java @@ -43,6 +43,8 @@ public class ConfigurationSynchronizer extends ConfigurationSupport implements S } public void init() { + if (groupManager == null) + return; Set<Group> groups = groupManager.listLocalGroups(); if (groups != null && !groups.isEmpty()) { for (Group group : groups) { http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index acb9cb2..2ab6198 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -98,17 +98,14 @@ <configuration> <instructions> <Export-Package> - !org.apache.karaf.cellar.core.internal.osgi, org.apache.karaf.cellar.core* </Export-Package> <Import-Package> org.slf4j;version="[1.6,2)";resolution:=optional, - org.apache.karaf.shell*;resolution:=optional, * </Import-Package> <Private-Package> - org.apache.karaf.cellar.core.internal.osgi, - org.apache.karaf.util.tracker;-split-package:=merge-first + org.apache.karaf.cellar.core.internal.osgi </Private-Package> </instructions> </configuration> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java ---------------------------------------------------------------------- diff --git a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java index 51534ff..9e22f1f 100644 --- a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java +++ b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java @@ -39,6 +39,8 @@ public class FeaturesSynchronizer extends FeaturesSupport implements Synchronize @Override public void init() { + if (groupManager == null) + return; Set<Group> groups = groupManager.listLocalGroups(); if (groups != null && !groups.isEmpty()) { for (Group group : groups) { http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml index 5fb220e..4ffd5a9 100644 --- a/hazelcast/pom.xml +++ b/hazelcast/pom.xml @@ -92,20 +92,15 @@ <configuration> <instructions> <Export-Package> - !org.apache.karaf.cellar.hazelcast.internal.osgi, - !org.apache.karaf.cellar.hazelcast.management.internal org.apache.karaf.cellar.hazelcast* </Export-Package> <Import-Package> - !org.apache.karaf.cellar.hazelcast*, org.slf4j;version="[1.6,2)";resolution:=optional, - org.apache.karaf.shell*;resolution:=optional, * </Import-Package> <Private-Package> org.apache.karaf.cellar.hazelcast.internal.osgi, - org.apache.karaf.cellar.hazelcast.management.internal, - org.apache.karaf.util.tracker;-split-package:=merge-first + org.apache.karaf.cellar.hazelcast.management.internal </Private-Package> </instructions> </configuration> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java ---------------------------------------------------------------------- diff --git a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java index 73be384..3e7d4a2 100644 --- a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java +++ b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java @@ -37,6 +37,8 @@ public class ObrUrlSynchronizer extends ObrSupport implements Synchronizer { @Override public void init() { + if (groupManager == null) + return; Set<Group> groups = groupManager.listLocalGroups(); if (groups != null && !groups.isEmpty()) { for (Group group : groups) { http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/shell/pom.xml ---------------------------------------------------------------------- diff --git a/shell/pom.xml b/shell/pom.xml index ba55a29..0f5b96c 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -96,9 +96,6 @@ org.slf4j;version="[1.6,2)";resolution:=optional, * </Import-Package> - <Private-Package> - org.apache.karaf.util.tracker;-split-package:=merge-first - </Private-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/8e045af7/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 28d1d64..0ecbd6c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -75,7 +75,6 @@ <configuration> <instructions> <Export-Package> - !org.apache.karaf.cellar.utils.ping.internal, org.apache.karaf.cellar.utils* </Export-Package> <Import-Package> @@ -83,8 +82,7 @@ * </Import-Package> <Private-Package> - org.apache.karaf.cellar.utils.ping.internal, - org.apache.karaf.util.tracker;-split-package:=merge-first + org.apache.karaf.cellar.utils.ping.internal </Private-Package> </instructions> </configuration>
