Repository: karaf-cellar Updated Branches: refs/heads/master a8afd4e91 -> 00605745d
[KARAF-3677] Avoid DynamicImport-Package as workaround for Felix Framework issue Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/00605745 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/00605745 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/00605745 Branch: refs/heads/master Commit: 00605745d6cc01e1855d9a6e9966ad79720c0b3f Parents: a8afd4e Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon May 4 18:27:11 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon May 4 18:27:11 2015 +0200 ---------------------------------------------------------------------- bundle/pom.xml | 3 +- .../karaf/cellar/bundle/shell/BlockCommand.java | 127 ++++++++++--------- cloud/pom.xml | 2 +- config/pom.xml | 3 +- core/pom.xml | 2 +- dosgi/pom.xml | 3 +- event/pom.xml | 1 - features/pom.xml | 5 +- hazelcast/pom.xml | 3 +- kubernetes/pom.xml | 2 +- obr/pom.xml | 5 +- shell/pom.xml | 2 +- .../cellar/shell/group/GroupJoinCommand.java | 2 +- utils/pom.xml | 1 - webconsole/pom.xml | 1 - 15 files changed, 85 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/bundle/pom.xml ---------------------------------------------------------------------- diff --git a/bundle/pom.xml b/bundle/pom.xml index a0a660e..0889b88 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -83,6 +83,7 @@ org.apache.karaf.cellar.bundle*;version="${project.version}" </Export-Package> <Import-Package> + javax.management*, org.apache.karaf.cellar.core*;version="${project.version}", org.apache.felix.service.command, org.apache.felix.gogo.commands, @@ -90,11 +91,11 @@ org.apache.karaf.shell.console.commands;version="[3,5)", org.apache.karaf.shell.console.completer;version="[3,5)", org.apache.karaf.shell.commands;version="[3,5)", + org.apache.karaf.shell.table;version="[3,5)", org.apache.karaf.features;version="[3,5)", org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> <Private-Package> org.apache.karaf.cellar.bundle.management.internal </Private-Package> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java index 098d38a..7ad11eb 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java @@ -48,85 +48,92 @@ public class BlockCommand extends BundleCommandSupport { List<String> patterns = new ArrayList<String>(); - Map<String, ExtendedBundleState> bundles = gatherBundles(); - List<String> selectedBundles = selector(bundles); - for (String selectedBundle : selectedBundles) { - patterns.add(bundles.get(selectedBundle).getLocation()); - } - - if (patterns.isEmpty() && ids != null) { - for (String id : ids) { - patterns.add(id); + ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); + + try { + Map<String, ExtendedBundleState> bundles = gatherBundles(); + List<String> selectedBundles = selector(bundles); + for (String selectedBundle : selectedBundles) { + patterns.add(bundles.get(selectedBundle).getLocation()); } - } - CellarSupport support = new CellarSupport(); - support.setClusterManager(clusterManager); - support.setGroupManager(groupManager); - support.setConfigurationAdmin(configurationAdmin); + if (patterns.isEmpty() && ids != null) { + for (String id : ids) { + patterns.add(id); + } + } - if (!in && !out) { - in = true; - out = true; - } - if (!whitelist && !blacklist) { - whitelist = true; - blacklist = true; - } + CellarSupport support = new CellarSupport(); + support.setClusterManager(clusterManager); + support.setGroupManager(groupManager); + support.setConfigurationAdmin(configurationAdmin); - if (patterns.isEmpty()) { - // display mode - if (in) { - System.out.println("INBOUND:"); - if (whitelist) { - System.out.print("\twhitelist: "); - Set<String> list = support.getListEntries(Configurations.WHITELIST, groupName, Constants.CATEGORY, EventType.INBOUND); - System.out.println(list.toString()); - } - if (blacklist) { - System.out.print("\tblacklist: "); - Set<String> list = support.getListEntries(Configurations.BLACKLIST, groupName, Constants.CATEGORY, EventType.INBOUND); - System.out.println(list.toString()); - } + if (!in && !out) { + in = true; + out = true; } - if (out) { - System.out.println("OUTBOUND:"); - if (whitelist) { - System.out.print("\twhitelist: "); - Set<String> list = support.getListEntries(Configurations.WHITELIST, groupName, Constants.CATEGORY, EventType.OUTBOUND); - System.out.println(list.toString()); - } - if (blacklist) { - System.out.print("\tblacklist: "); - Set<String> list = support.getListEntries(Configurations.BLACKLIST, groupName, Constants.CATEGORY, EventType.OUTBOUND); - System.out.println(list.toString()); - } + if (!whitelist && !blacklist) { + whitelist = true; + blacklist = true; } - } else { - // edit mode - for (String pattern : patterns) { - System.out.println("Updating blocking policy for " + pattern); + + if (patterns.isEmpty()) { + // display mode if (in) { + System.out.println("INBOUND:"); if (whitelist) { - System.out.println("\tinbound whitelist ..."); - support.switchListEntry(Configurations.WHITELIST, groupName, Constants.CATEGORY, EventType.INBOUND, pattern); + System.out.print("\twhitelist: "); + Set<String> list = support.getListEntries(Configurations.WHITELIST, groupName, Constants.CATEGORY, EventType.INBOUND); + System.out.println(list.toString()); } if (blacklist) { - System.out.println("\tinbound blacklist ..."); - support.switchListEntry(Configurations.BLACKLIST, groupName, Constants.CATEGORY, EventType.INBOUND, pattern); + System.out.print("\tblacklist: "); + Set<String> list = support.getListEntries(Configurations.BLACKLIST, groupName, Constants.CATEGORY, EventType.INBOUND); + System.out.println(list.toString()); } } if (out) { + System.out.println("OUTBOUND:"); if (whitelist) { - System.out.println("\toutbound whitelist ..."); - support.switchListEntry(Configurations.WHITELIST, groupName, Constants.CATEGORY, EventType.OUTBOUND, pattern); + System.out.print("\twhitelist: "); + Set<String> list = support.getListEntries(Configurations.WHITELIST, groupName, Constants.CATEGORY, EventType.OUTBOUND); + System.out.println(list.toString()); } if (blacklist) { - System.out.println("\toutbound blacklist ..."); - support.switchListEntry(Configurations.BLACKLIST, groupName, Constants.CATEGORY, EventType.OUTBOUND, pattern); + System.out.print("\tblacklist: "); + Set<String> list = support.getListEntries(Configurations.BLACKLIST, groupName, Constants.CATEGORY, EventType.OUTBOUND); + System.out.println(list.toString()); + } + } + } else { + // edit mode + for (String pattern : patterns) { + System.out.println("Updating blocking policy for " + pattern); + if (in) { + if (whitelist) { + System.out.println("\tinbound whitelist ..."); + support.switchListEntry(Configurations.WHITELIST, groupName, Constants.CATEGORY, EventType.INBOUND, pattern); + } + if (blacklist) { + System.out.println("\tinbound blacklist ..."); + support.switchListEntry(Configurations.BLACKLIST, groupName, Constants.CATEGORY, EventType.INBOUND, pattern); + } + } + if (out) { + if (whitelist) { + System.out.println("\toutbound whitelist ..."); + support.switchListEntry(Configurations.WHITELIST, groupName, Constants.CATEGORY, EventType.OUTBOUND, pattern); + } + if (blacklist) { + System.out.println("\toutbound blacklist ..."); + support.switchListEntry(Configurations.BLACKLIST, groupName, Constants.CATEGORY, EventType.OUTBOUND, pattern); + } } } } + } finally { + Thread.currentThread().setContextClassLoader(originalClassLoader); } return null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/cloud/pom.xml ---------------------------------------------------------------------- diff --git a/cloud/pom.xml b/cloud/pom.xml index 856f0c5..b47c5d0 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -103,7 +103,7 @@ org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,org.jclouds.*,*</DynamicImport-Package> + <DynamicImport-Package>org.jclouds.*</DynamicImport-Package> <Bundle-Activator>org.apache.karaf.cellar.cloud.Activator</Bundle-Activator> </instructions> </configuration> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/config/pom.xml ---------------------------------------------------------------------- diff --git a/config/pom.xml b/config/pom.xml index 591aa1d..ec925c8 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -75,6 +75,7 @@ org.apache.karaf.cellar.config*;version="${project.version}" </Export-Package> <Import-Package> + javax.management*, org.apache.karaf.cellar.core*;version="${project.version}", org.apache.felix.service.command, org.apache.felix.gogo.commands, @@ -82,10 +83,10 @@ org.apache.karaf.shell.console.completer;version="[3,5)", org.apache.karaf.shell.console.commands;version="[3,5)", org.apache.karaf.shell.commands;version="[3,5)", + org.apache.karaf.shell.table;version="[3,5)", org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> <Private-Package> org.apache.karaf.cellar.config.management.internal, org.apache.felix.utils*;-split-package:=merge-first http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 94824e7..499d543 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -94,11 +94,11 @@ org.apache.karaf.cellar.core*;version="${project.version}" </Export-Package> <Import-Package> + org.apache.aries.proxy, org.apache.karaf.shell.console*;version="[3,5)", org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/dosgi/pom.xml ---------------------------------------------------------------------- diff --git a/dosgi/pom.xml b/dosgi/pom.xml index 54233b6..da0e5ba 100644 --- a/dosgi/pom.xml +++ b/dosgi/pom.xml @@ -80,6 +80,7 @@ org.apache.karaf.cellar.dosgi*;version="${project.version}" </Export-Package> <Import-Package> + javax.management*, org.apache.karaf.cellar.core*;version="${project.version}", org.apache.felix.service.command, org.apache.felix.gogo.commands, @@ -87,10 +88,10 @@ org.apache.karaf.shell.console.commands;version="[3,5)", org.apache.karaf.shell.console.completer;version="[3,5)", org.apache.karaf.shell.commands;version="[3,5)", + org.apache.karaf.shell.table;version="[3,5)", org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/event/pom.xml ---------------------------------------------------------------------- diff --git a/event/pom.xml b/event/pom.xml index 81ff773..5c01fb2 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -68,7 +68,6 @@ org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/features/pom.xml ---------------------------------------------------------------------- diff --git a/features/pom.xml b/features/pom.xml index 7b701bb..ed3f00a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -100,18 +100,19 @@ org.apache.karaf.cellar.features*;version="${project.version}" </Export-Package> <Import-Package> + javax.management*, org.apache.karaf.cellar.core*;version="${project.version}", org.apache.felix.service.command, org.apache.felix.gogo.commands, org.apache.karaf.shell.console;version="[3,5)", org.apache.karaf.shell.console.commands;version="[3,5)", org.apache.karaf.shell.console.completer;version="[3,5)", - org.apache.karaf.features*;version="[3,5)", + org.apache.karaf.shell.table;version="[3,5)", org.apache.karaf.shell.commands;version="[3,5)", + org.apache.karaf.features*;version="[3,5)", org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> <Private-Package> org.apache.karaf.cellar.features.management.internal </Private-Package> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml index ebe6c99..363ea3d 100644 --- a/hazelcast/pom.xml +++ b/hazelcast/pom.xml @@ -84,13 +84,14 @@ </Export-Package> <Import-Package> com.hazelcast*, + javax.management*, + org.apache.aries.proxy, org.apache.karaf.cellar.core*;version="${project.version}", org.apache.karaf.cellar.utils.ping;version="${project.version}", org.apache.karaf.features;version="[3,5)", org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> <Private-Package> org.apache.karaf.cellar.hazelcast.management.internal </Private-Package> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/kubernetes/pom.xml ---------------------------------------------------------------------- diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml index 9cc8e68..e6dcec7 100644 --- a/kubernetes/pom.xml +++ b/kubernetes/pom.xml @@ -77,7 +77,7 @@ org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,io.fabric8.*,*</DynamicImport-Package> + <DynamicImport-Package>io.fabric8.*</DynamicImport-Package> <Bundle-Activator>org.apache.karaf.cellar.kubernetes.Activator</Bundle-Activator> </instructions> </configuration> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/obr/pom.xml ---------------------------------------------------------------------- diff --git a/obr/pom.xml b/obr/pom.xml index 43e36ea..9866995 100644 --- a/obr/pom.xml +++ b/obr/pom.xml @@ -79,15 +79,14 @@ org.apache.karaf.shell.console.commands;version="[3,5)", org.apache.karaf.shell.console.completer;version="[3,5)", org.apache.karaf.shell.commands;version="[3,5)", + org.apache.karaf.shell.table;version="[3,5)", org.apache.karaf.management;version="[3,5)", javax.management*, org.osgi*, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> <DynamicImport-Package> - org.apache.felix.bundlerepository, - org.osgi.service.obr, - * + org.apache.felix.bundlerepository, org.osgi.service.obr </DynamicImport-Package> <Private-Package> org.apache.karaf.cellar.obr.management.internal http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/shell/pom.xml ---------------------------------------------------------------------- diff --git a/shell/pom.xml b/shell/pom.xml index ce1d023..0a0eb85 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -93,9 +93,9 @@ org.apache.karaf.shell.console.commands;version="[3,5)", org.apache.karaf.shell.console.completer;version="[3,5)", org.apache.karaf.shell.commands;version="[3,5)", + org.apache.karaf.shell.table;version="[3,5)", org.osgi* </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java b/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java index c04dfff..5542ead 100644 --- a/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java +++ b/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java @@ -26,7 +26,7 @@ public class GroupJoinCommand extends GroupSupport { @Argument(index = 0, name = "group", description = "The cluster group name", required = true, multiValued = false) String groupName; - @Argument(index = 1, name = "node", description = "The node(s) ID", required = true, multiValued = true) + @Argument(index = 1, name = "node", description = "The node(s) ID", required = false, multiValued = true) List<String> nodes; @Override http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index fc37aff..3c861bb 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -67,7 +67,6 @@ org.apache.karaf.cellar.core*;version="${project.version}", org.osgi* </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/00605745/webconsole/pom.xml ---------------------------------------------------------------------- diff --git a/webconsole/pom.xml b/webconsole/pom.xml index 3268e59..6073a33 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -110,7 +110,6 @@ org.osgi.service.blueprint, org.slf4j;version="[1.6,2)";resolution:=optional </Import-Package> - <DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package> <Embed-Dependency>json</Embed-Dependency> </instructions> </configuration>
