Repository: karaf-cellar Updated Branches: refs/heads/master a1233c361 -> 82c47ee90
[KARAF-3062] Upgrade to Hazelcast 3.2.3 and better import range Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/82c47ee9 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/82c47ee9 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/82c47ee9 Branch: refs/heads/master Commit: 82c47ee9070f1be68f4c14fd2ee36ce181746c45 Parents: a1233c3 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Jun 20 17:16:34 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Jun 20 17:17:08 2014 +0200 ---------------------------------------------------------------------- bundle/pom.xml | 27 ++++++++++------ cloud/pom.xml | 9 ++++-- config/pom.xml | 24 ++++++++------ core/pom.xml | 23 ++++++------- .../karaf/cellar/core/ClusterManager.java | 5 --- dosgi/pom.xml | 24 ++++++++++---- event/pom.xml | 4 ++- features/pom.xml | 34 +++++++++++--------- hazelcast/pom.xml | 24 +++++++++++--- .../hazelcast/CellarMembershipListener.java | 10 +++--- .../hazelcast/HazelcastClusterManager.java | 7 ---- .../karaf/cellar/hazelcast/QueueConsumer.java | 7 ++-- .../karaf/cellar/hazelcast/TopicConsumer.java | 7 ++-- obr/pom.xml | 23 +++++++++---- pom.xml | 2 +- .../cellar/samples/hazelcast/Activator.java | 5 +-- shell/pom.xml | 16 ++++++--- utils/pom.xml | 9 +++--- 18 files changed, 158 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/bundle/pom.xml ---------------------------------------------------------------------- diff --git a/bundle/pom.xml b/bundle/pom.xml index 4125073..4bb6160 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -39,13 +39,13 @@ 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,4)", - org.apache.karaf.shell.console.commands;version="[3,4)", - org.apache.karaf.shell.console.completer;version="[3,4)", - org.apache.karaf.shell.commands;version="[3,4)", - org.apache.karaf.features;version="[3,4)", + 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.shell.commands;version="[3,5)", + org.apache.karaf.features;version="[3,5)", org.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import> <osgi.export> @@ -61,18 +61,24 @@ <dependency> <groupId>org.apache.karaf.cellar</groupId> <artifactId>org.apache.karaf.cellar.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> </dependency> - - <!-- Configuration Admin --> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <!-- Karaf features --> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.core</artifactId> + <scope>provided</scope> </dependency> <!-- Shell table --> @@ -85,6 +91,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/cloud/pom.xml ---------------------------------------------------------------------- diff --git a/cloud/pom.xml b/cloud/pom.xml index 08bcece..ab74450 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -40,7 +40,7 @@ org.joda.time.chrono;version="${joda-time.version}", org.apache.karaf.cellar.core*;version="${project.version}", org.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,org.jclouds.*,*</osgi.dynamic.import> <osgi.export> @@ -72,28 +72,33 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <!-- Misc Dependencies --> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> + <scope>provided</scope> </dependency> + <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <!-- Testing --> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.junit</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/config/pom.xml ---------------------------------------------------------------------- diff --git a/config/pom.xml b/config/pom.xml index 29a9ea8..33844ee 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -39,12 +39,12 @@ 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,4)", - org.apache.karaf.shell.console.completer;version="[3,4)", - org.apache.karaf.shell.console.commands;version="[3,4)", - org.apache.karaf.shell.commands;version="[3,4)", + org.apache.karaf.shell.console;version="[3,5)", + 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.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import> <osgi.export> @@ -63,22 +63,28 @@ <dependency> <groupId>org.apache.karaf.cellar</groupId> <artifactId>org.apache.karaf.cellar.core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.utils</artifactId> </dependency> - - <!-- Configuration Admin --> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <!-- Logging Dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 3cdf960..af693f3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,9 +35,9 @@ <properties> <osgi.import> - org.apache.karaf.shell.console*;version="[3,4)", + org.apache.karaf.shell.console*;version="[3,5)", org.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import> <osgi.export> @@ -61,12 +61,12 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> </dependency> - - <!-- Configuration Admin --> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <!-- Core dependencies --> @@ -79,25 +79,20 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> + <!-- Testing Dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> + <scope>test</scope> </dependency> - - <!-- Testing Dependencies --> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.junit</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java b/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java index afb475c..926e05b 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java @@ -102,9 +102,4 @@ public interface ClusterManager { */ public void stop(); - /** - * Restart the local node. - */ - public void restart(); - } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/dosgi/pom.xml ---------------------------------------------------------------------- diff --git a/dosgi/pom.xml b/dosgi/pom.xml index 982deda..8afb3e0 100644 --- a/dosgi/pom.xml +++ b/dosgi/pom.xml @@ -39,12 +39,12 @@ 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,4)", - org.apache.karaf.shell.console.commands;version="[3,4)", - org.apache.karaf.shell.console.completer;version="[3,4)", - org.apache.karaf.shell.commands;version="[3,4)", + 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.shell.commands;version="[3,5)", org.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import> <osgi.export> @@ -62,17 +62,29 @@ <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.table</artifactId> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> <!-- Logging Dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> - <!-- JUnit dependencies --> + <!-- Test Dependencies --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/event/pom.xml ---------------------------------------------------------------------- diff --git a/event/pom.xml b/event/pom.xml index 4cab00d..8b5e94f 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -38,7 +38,7 @@ <osgi.import> org.apache.karaf.cellar.core*;version="${project.version}", org.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import> <osgi.export> @@ -55,12 +55,14 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <!-- Logging Dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/features/pom.xml ---------------------------------------------------------------------- diff --git a/features/pom.xml b/features/pom.xml index b992cd6..c3fba66 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -34,18 +34,17 @@ <name>Apache Karaf :: Cellar :: Features</name> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <osgi.import> 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,4)", - org.apache.karaf.shell.console.commands;version="[3,4)", - org.apache.karaf.shell.console.completer;version="[3,4)", - org.apache.karaf.features*;version="[3,4)", - org.apache.karaf.shell.commands;version="[3,4)", + 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.commands;version="[3,5)", org.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import> <osgi.export> @@ -66,11 +65,15 @@ <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.table</artifactId> </dependency> - - <!-- Configuration Admin --> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <!-- Karaf features --> @@ -78,7 +81,6 @@ <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.core</artifactId> </dependency> - <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.command</artifactId> @@ -88,22 +90,24 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> + <!-- Testing --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> + <scope>test</scope> </dependency> - - <!-- Testing --> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.junit</artifactId> + <scope>test</scope> </dependency> - <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml index 3c558b7..1aa4b14 100644 --- a/hazelcast/pom.xml +++ b/hazelcast/pom.xml @@ -34,15 +34,13 @@ <name>Apache Karaf :: Cellar :: Hazelcast</name> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <osgi.ignore>com.hazelcast.merge</osgi.ignore> <osgi.import> com.hazelcast*, org.apache.karaf.cellar.core*;version="${project.version}", org.apache.karaf.cellar.utils.ping;version="${project.version}", - org.apache.karaf.features;version="[3,4)", + org.apache.karaf.features;version="[3,5)", org.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import> <osgi.export> @@ -66,11 +64,29 @@ <groupId>org.apache.karaf.cellar</groupId> <artifactId>org.apache.karaf.cellar.utils</artifactId> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> <!-- Logging Dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Testing Dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java index 0ed94c3..10b40e6 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java @@ -13,10 +13,7 @@ */ package org.apache.karaf.cellar.hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.Member; -import com.hazelcast.core.MembershipEvent; -import com.hazelcast.core.MembershipListener; +import com.hazelcast.core.*; import org.apache.karaf.cellar.core.Group; import org.apache.karaf.cellar.core.GroupManager; import org.apache.karaf.cellar.core.Synchronizer; @@ -70,6 +67,11 @@ public class CellarMembershipListener extends HazelcastInstanceAware implements // nothing to do } + @Override + public void memberAttributeChanged(MemberAttributeEvent event) { + // nothing to do + } + public GroupManager getGroupManager() { return groupManager; } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java index 529aaf6..b9a9619 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java @@ -182,13 +182,6 @@ public class HazelcastClusterManager extends HazelcastInstanceAware implements C } } - @Override - public void restart() { - if (instance != null && instance.getLifecycleService().isRunning()) { - instance.getLifecycleService().restart(); - } - } - public ConfigurationAdmin getConfigurationAdmin() { return configurationAdmin; } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java index 4734d89..0243478 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java @@ -49,6 +49,7 @@ public class QueueConsumer<E extends Event> implements EventConsumer<E>, ItemLis private Boolean isConsuming = Boolean.TRUE; + private String registrationId; private HazelcastInstance instance; private IQueue queue; private Dispatcher dispatcher; @@ -66,10 +67,10 @@ public class QueueConsumer<E extends Event> implements EventConsumer<E>, ItemLis public void init() { if (queue != null) { - queue.addItemListener(this, true); + registrationId = queue.addItemListener(this, true); } else { queue = instance.getQueue(Constants.QUEUE); - queue.addItemListener(this, true); + registrationId = queue.addItemListener(this, true); } executorService.execute(this); } @@ -77,7 +78,7 @@ public class QueueConsumer<E extends Event> implements EventConsumer<E>, ItemLis public void destroy() { isConsuming = false; if (queue != null) { - queue.removeItemListener(this); + queue.removeItemListener(registrationId); } executorService.shutdown(); } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java index a3c09e9..163afff 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java @@ -41,6 +41,7 @@ public class TopicConsumer<E extends Event> implements EventConsumer<E>, Message private final Switch eventSwitch = new BasicSwitch(SWITCH_ID); + private String registrationId; private HazelcastInstance instance; private ITopic topic; private Dispatcher dispatcher; @@ -76,10 +77,10 @@ public class TopicConsumer<E extends Event> implements EventConsumer<E>, Message public void start() { isConsuming = true; if (topic != null) { - topic.addMessageListener(this); + registrationId = topic.addMessageListener(this); } else { topic = instance.getTopic(Constants.TOPIC); - topic.addMessageListener(this); + registrationId = topic.addMessageListener(this); } } @@ -88,7 +89,7 @@ public class TopicConsumer<E extends Event> implements EventConsumer<E>, Message public void stop() { isConsuming = false; if (topic != null) { - topic.removeMessageListener(this); + topic.removeMessageListener(registrationId); } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/obr/pom.xml ---------------------------------------------------------------------- diff --git a/obr/pom.xml b/obr/pom.xml index 23e5fde..e2bcfeb 100644 --- a/obr/pom.xml +++ b/obr/pom.xml @@ -34,19 +34,18 @@ <name>Apache Karaf :: Cellar :: OBR</name> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <osgi.import> 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,4)", - org.apache.karaf.shell.console.commands;version="[3,4)", - org.apache.karaf.shell.console.completer;version="[3,4)", - org.apache.karaf.shell.commands;version="[3,4)", - org.apache.karaf.management;version="[3,4)", + 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.shell.commands;version="[3,5)", + org.apache.karaf.management;version="[3,5)", javax.management*, org.osgi*, - org.slf4j;resolution:=optional + org.slf4j;version="[1.6,2)";resolution:=optional </osgi.import> <osgi.dynamic.import> org.apache.felix.bundlerepository, @@ -71,6 +70,16 @@ <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.table</artifactId> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> <!-- OBR dependency --> <dependency> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dd239f9..716551d 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <felix.configadmin.version>1.6.0</felix.configadmin.version> <felix.utils.version>1.6.0</felix.utils.version> <felix.webconsole.version>4.2.0</felix.webconsole.version> - <hazelcast.version>2.6</hazelcast.version> + <hazelcast.version>3.2.3</hazelcast.version> <jclouds.version>1.4.0</jclouds.version> <joda-time.version>2.1</joda-time.version> <junit.version>4.11</junit.version> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Activator.java ---------------------------------------------------------------------- diff --git a/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Activator.java b/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Activator.java index b6dbd42..74a7167 100644 --- a/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Activator.java +++ b/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Activator.java @@ -29,6 +29,7 @@ public class Activator implements BundleActivator { private static final transient Logger LOGGER = LoggerFactory.getLogger(Activator.class); + private String registrationId; private ITopic topic; private MessageListener messageListener = new MessageListener(); @@ -43,7 +44,7 @@ public class Activator implements BundleActivator { IdGenerator idGenerator = instance.getIdGenerator("cellar-sample-generator"); Long id = idGenerator.newId(); topic = instance.getTopic("cellar-sample-topic"); - topic.addMessageListener(messageListener); + registrationId = topic.addMessageListener(messageListener); topic.publish(new Message("id="+id)); } catch (Exception ex) { ex.printStackTrace(); @@ -53,7 +54,7 @@ public class Activator implements BundleActivator { @Override public void stop(BundleContext context) throws Exception { - topic.removeMessageListener(messageListener); + topic.removeMessageListener(registrationId); } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/shell/pom.xml ---------------------------------------------------------------------- diff --git a/shell/pom.xml b/shell/pom.xml index bd93d8b..c7eb9c5 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -40,10 +40,10 @@ org.apache.karaf.cellar*;version="${project.version}", org.apache.felix.service.command, org.apache.felix.gogo.commands, - org.apache.karaf.shell.console;version="[3,4)", - org.apache.karaf.shell.console.commands;version="[3,4)", - org.apache.karaf.shell.console.completer;version="[3,4)", - org.apache.karaf.shell.commands;version="[3,4)", + 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.shell.commands;version="[3,5)", org.osgi* </osgi.import> <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import> @@ -53,9 +53,13 @@ </properties> <dependencies> - <!-- Internal Dependencies --> <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.karaf.cellar</groupId> <artifactId>org.apache.karaf.cellar.core</artifactId> </dependency> @@ -75,10 +79,12 @@ <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.table</artifactId> </dependency> + <!-- Logging Dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/82c47ee9/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index ce5948b..98e7220 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -34,7 +34,6 @@ <name>Apache Karaf :: Cellar :: Utils</name> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <osgi.import> org.apache.karaf.cellar.core*;version="${project.version}", org.osgi* @@ -51,15 +50,17 @@ <groupId>org.apache.karaf.cellar</groupId> <artifactId>org.apache.karaf.cellar.core</artifactId> </dependency> - <!-- Configuration Admin --> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> + <!-- Logging Dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> </dependencies>
