홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
e279be89 2 parents d3576893 3215ebd1

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Inline Side-by-side
Showing 2 changed files with 11 additions and 4 deletions
...@@ -7,11 +7,9 @@ import com.google.common.cache.RemovalNotification; ...@@ -7,11 +7,9 @@ import com.google.common.cache.RemovalNotification;
7 import com.google.common.collect.ImmutableSet; 7 import com.google.common.collect.ImmutableSet;
8 8
9 import org.apache.felix.scr.annotations.Activate; 9 import org.apache.felix.scr.annotations.Activate;
10 -import org.apache.felix.scr.annotations.Component;
11 import org.apache.felix.scr.annotations.Deactivate; 10 import org.apache.felix.scr.annotations.Deactivate;
12 import org.apache.felix.scr.annotations.Reference; 11 import org.apache.felix.scr.annotations.Reference;
13 import org.apache.felix.scr.annotations.ReferenceCardinality; 12 import org.apache.felix.scr.annotations.ReferenceCardinality;
14 -import org.apache.felix.scr.annotations.Service;
15 import org.onlab.onos.cluster.ClusterEvent; 13 import org.onlab.onos.cluster.ClusterEvent;
16 import org.onlab.onos.cluster.ClusterStore; 14 import org.onlab.onos.cluster.ClusterStore;
17 import org.onlab.onos.cluster.ClusterStoreDelegate; 15 import org.onlab.onos.cluster.ClusterStoreDelegate;
...@@ -37,8 +35,8 @@ import static org.onlab.packet.IpPrefix.valueOf; ...@@ -37,8 +35,8 @@ import static org.onlab.packet.IpPrefix.valueOf;
37 /** 35 /**
38 * Distributed implementation of the cluster nodes store. 36 * Distributed implementation of the cluster nodes store.
39 */ 37 */
40 -@Component(immediate = true) 38 +//@Component(immediate = true)
41 -@Service 39 +//@Service
42 public class DistributedClusterStore 40 public class DistributedClusterStore
43 extends AbstractStore<ClusterEvent, ClusterStoreDelegate> 41 extends AbstractStore<ClusterEvent, ClusterStoreDelegate>
44 implements ClusterStore { 42 implements ClusterStore {
......
...@@ -9,6 +9,12 @@ ...@@ -9,6 +9,12 @@
9 <bundle>mvn:org.apache.commons/commons-lang3/3.3.2</bundle> 9 <bundle>mvn:org.apache.commons/commons-lang3/3.3.2</bundle>
10 <bundle>mvn:com.google.guava/guava/18.0</bundle> 10 <bundle>mvn:com.google.guava/guava/18.0</bundle>
11 <bundle>mvn:io.netty/netty/3.9.2.Final</bundle> 11 <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
12 + <bundle>mvn:io.netty/netty-common/4.0.23.Final</bundle>
13 + <bundle>mvn:io.netty/netty-buffer/4.0.23.Final</bundle>
14 + <bundle>mvn:io.netty/netty-transport/4.0.23.Final</bundle>
15 + <bundle>mvn:io.netty/netty-handler/4.0.23.Final</bundle>
16 + <bundle>mvn:io.netty/netty-codec/4.0.23.Final</bundle>
17 + <bundle>mvn:commons-pool/commons-pool/1.6</bundle>
12 18
13 <bundle>mvn:com.hazelcast/hazelcast/3.3</bundle> 19 <bundle>mvn:com.hazelcast/hazelcast/3.3</bundle>
14 <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle> 20 <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle>
...@@ -55,6 +61,9 @@ ...@@ -55,6 +61,9 @@
55 <bundle>mvn:org.onlab.onos/onos-core-dist/1.0.0-SNAPSHOT</bundle> 61 <bundle>mvn:org.onlab.onos/onos-core-dist/1.0.0-SNAPSHOT</bundle>
56 <bundle>mvn:org.onlab.onos/onos-core-serializers/1.0.0-SNAPSHOT</bundle> 62 <bundle>mvn:org.onlab.onos/onos-core-serializers/1.0.0-SNAPSHOT</bundle>
57 <bundle>mvn:org.onlab.onos/onlab-netty/1.0.0-SNAPSHOT</bundle> 63 <bundle>mvn:org.onlab.onos/onlab-netty/1.0.0-SNAPSHOT</bundle>
64 +
65 + <bundle>mvn:org.onlab.onos/onos-core-hz-common/1.0.0-SNAPSHOT</bundle>
66 + <bundle>mvn:org.onlab.onos/onos-core-hz-cluster/1.0.0-SNAPSHOT</bundle>
58 </feature> 67 </feature>
59 68
60 <feature name="onos-core-hazelcast" version="1.0.0" 69 <feature name="onos-core-hazelcast" version="1.0.0"
......