홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
b5df76dc 1 parent 2e96389a

split onos-core-hz into 

  onos-core-hz-common
  onos-core-hz-cluster
  onos-core-hz-net

Change-Id: Ie0ceb0de8e9e8af119433fef6f802444591eb4a4
Inline Side-by-side
Showing 32 changed files with 230 additions and 49 deletions
...@@ -40,14 +40,14 @@ ...@@ -40,14 +40,14 @@
40 Currently required for DistributedDeviceManagerTest. --> 40 Currently required for DistributedDeviceManagerTest. -->
41 <dependency> 41 <dependency>
42 <groupId>org.onlab.onos</groupId> 42 <groupId>org.onlab.onos</groupId>
43 - <artifactId>onos-core-hz</artifactId> 43 + <artifactId>onos-core-hz-net</artifactId>
44 <version>${project.version}</version> 44 <version>${project.version}</version>
45 <scope>test</scope> 45 <scope>test</scope>
46 </dependency> 46 </dependency>
47 <dependency> 47 <dependency>
48 <groupId>org.onlab.onos</groupId> 48 <groupId>org.onlab.onos</groupId>
49 <!-- FIXME: should be somewhere else --> 49 <!-- FIXME: should be somewhere else -->
50 - <artifactId>onos-core-hz</artifactId> 50 + <artifactId>onos-core-hz-common</artifactId>
51 <version>${project.version}</version> 51 <version>${project.version}</version>
52 <classifier>tests</classifier> 52 <classifier>tests</classifier>
53 <scope>test</scope> 53 <scope>test</scope>
......
...@@ -32,9 +32,9 @@ import org.onlab.onos.net.device.DeviceService; ...@@ -32,9 +32,9 @@ import org.onlab.onos.net.device.DeviceService;
32 import org.onlab.onos.net.device.PortDescription; 32 import org.onlab.onos.net.device.PortDescription;
33 import org.onlab.onos.net.provider.AbstractProvider; 33 import org.onlab.onos.net.provider.AbstractProvider;
34 import org.onlab.onos.net.provider.ProviderId; 34 import org.onlab.onos.net.provider.ProviderId;
35 +import org.onlab.onos.store.common.StoreManager;
36 +import org.onlab.onos.store.common.TestStoreManager;
35 import org.onlab.onos.store.device.impl.DistributedDeviceStore; 37 import org.onlab.onos.store.device.impl.DistributedDeviceStore;
36 -import org.onlab.onos.store.impl.StoreManager;
37 -import org.onlab.onos.store.impl.TestStoreManager;
38 import org.onlab.packet.IpPrefix; 38 import org.onlab.packet.IpPrefix;
39 39
40 import java.util.ArrayList; 40 import java.util.ArrayList;
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5 + <modelVersion>4.0.0</modelVersion>
6 +
7 + <parent>
8 + <groupId>org.onlab.onos</groupId>
9 + <artifactId>onos-core-hz</artifactId>
10 + <version>1.0.0-SNAPSHOT</version>
11 + <relativePath>../pom.xml</relativePath>
12 + </parent>
13 +
14 + <artifactId>onos-core-hz-cluster</artifactId>
15 + <packaging>bundle</packaging>
16 +
17 + <description>ONOS Hazelcast based distributed store subsystems</description>
18 +
19 + <dependencies>
20 + <dependency>
21 + <groupId>org.onlab.onos</groupId>
22 + <artifactId>onos-api</artifactId>
23 + </dependency>
24 + <dependency>
25 + <groupId>org.onlab.onos</groupId>
26 + <artifactId>onos-core-serializers</artifactId>
27 + <version>${project.version}</version>
28 + </dependency>
29 + <dependency>
30 + <groupId>org.onlab.onos</groupId>
31 + <artifactId>onos-core-hz-common</artifactId>
32 + <version>${project.version}</version>
33 + </dependency>
34 + <dependency>
35 + <groupId>org.onlab.onos</groupId>
36 + <artifactId>onos-core-hz-common</artifactId>
37 + <classifier>tests</classifier>
38 + <scope>test</scope>
39 + <version>${project.version}</version>
40 + </dependency>
41 + <dependency>
42 + <groupId>org.apache.felix</groupId>
43 + <artifactId>org.apache.felix.scr.annotations</artifactId>
44 + </dependency>
45 + <dependency>
46 + <groupId>com.hazelcast</groupId>
47 + <artifactId>hazelcast</artifactId>
48 + </dependency>
49 + <dependency>
50 + <groupId>de.javakaffee</groupId>
51 + <artifactId>kryo-serializers</artifactId>
52 + </dependency>
53 + </dependencies>
54 +
55 + <build>
56 + <plugins>
57 + <plugin>
58 + <groupId>org.apache.felix</groupId>
59 + <artifactId>maven-scr-plugin</artifactId>
60 + </plugin>
61 + </plugins>
62 + </build>
63 +
64 +</project>
...@@ -8,6 +8,7 @@ import com.hazelcast.core.Member; ...@@ -8,6 +8,7 @@ import com.hazelcast.core.Member;
8 import com.hazelcast.core.MemberAttributeEvent; 8 import com.hazelcast.core.MemberAttributeEvent;
9 import com.hazelcast.core.MembershipEvent; 9 import com.hazelcast.core.MembershipEvent;
10 import com.hazelcast.core.MembershipListener; 10 import com.hazelcast.core.MembershipListener;
11 +
11 import org.apache.felix.scr.annotations.Activate; 12 import org.apache.felix.scr.annotations.Activate;
12 import org.apache.felix.scr.annotations.Component; 13 import org.apache.felix.scr.annotations.Component;
13 import org.apache.felix.scr.annotations.Deactivate; 14 import org.apache.felix.scr.annotations.Deactivate;
...@@ -18,9 +19,9 @@ import org.onlab.onos.cluster.ClusterStoreDelegate; ...@@ -18,9 +19,9 @@ import org.onlab.onos.cluster.ClusterStoreDelegate;
18 import org.onlab.onos.cluster.ControllerNode; 19 import org.onlab.onos.cluster.ControllerNode;
19 import org.onlab.onos.cluster.DefaultControllerNode; 20 import org.onlab.onos.cluster.DefaultControllerNode;
20 import org.onlab.onos.cluster.NodeId; 21 import org.onlab.onos.cluster.NodeId;
21 -import org.onlab.onos.store.impl.AbsentInvalidatingLoadingCache; 22 +import org.onlab.onos.store.common.AbsentInvalidatingLoadingCache;
22 -import org.onlab.onos.store.impl.AbstractHazelcastStore; 23 +import org.onlab.onos.store.common.AbstractHazelcastStore;
23 -import org.onlab.onos.store.impl.OptionalCacheLoader; 24 +import org.onlab.onos.store.common.OptionalCacheLoader;
24 import org.onlab.packet.IpPrefix; 25 import org.onlab.packet.IpPrefix;
25 26
26 import java.util.Map; 27 import java.util.Map;
......
...@@ -21,9 +21,9 @@ import org.onlab.onos.cluster.MastershipTerm; ...@@ -21,9 +21,9 @@ import org.onlab.onos.cluster.MastershipTerm;
21 import org.onlab.onos.cluster.NodeId; 21 import org.onlab.onos.cluster.NodeId;
22 import org.onlab.onos.net.DeviceId; 22 import org.onlab.onos.net.DeviceId;
23 import org.onlab.onos.net.MastershipRole; 23 import org.onlab.onos.net.MastershipRole;
24 -import org.onlab.onos.store.impl.AbsentInvalidatingLoadingCache; 24 +import org.onlab.onos.store.common.AbsentInvalidatingLoadingCache;
25 -import org.onlab.onos.store.impl.AbstractHazelcastStore; 25 +import org.onlab.onos.store.common.AbstractHazelcastStore;
26 -import org.onlab.onos.store.impl.OptionalCacheLoader; 26 +import org.onlab.onos.store.common.OptionalCacheLoader;
27 27
28 import com.google.common.base.Optional; 28 import com.google.common.base.Optional;
29 import com.google.common.cache.LoadingCache; 29 import com.google.common.cache.LoadingCache;
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5 + <modelVersion>4.0.0</modelVersion>
6 +
7 + <parent>
8 + <groupId>org.onlab.onos</groupId>
9 + <artifactId>onos-core-hz</artifactId>
10 + <version>1.0.0-SNAPSHOT</version>
11 + <relativePath>../pom.xml</relativePath>
12 + </parent>
13 +
14 + <artifactId>onos-core-hz-common</artifactId>
15 + <packaging>bundle</packaging>
16 +
17 + <description>ONOS Hazelcast based distributed store subsystems</description>
18 +
19 + <dependencies>
20 + <dependency>
21 + <groupId>org.onlab.onos</groupId>
22 + <artifactId>onos-api</artifactId>
23 + </dependency>
24 + <dependency>
25 + <groupId>org.onlab.onos</groupId>
26 + <artifactId>onos-core-serializers</artifactId>
27 + <version>${project.version}</version>
28 + </dependency>
29 + <dependency>
30 + <groupId>org.apache.felix</groupId>
31 + <artifactId>org.apache.felix.scr.annotations</artifactId>
32 + </dependency>
33 + <dependency>
34 + <groupId>com.hazelcast</groupId>
35 + <artifactId>hazelcast</artifactId>
36 + </dependency>
37 + <dependency>
38 + <groupId>de.javakaffee</groupId>
39 + <artifactId>kryo-serializers</artifactId>
40 + </dependency>
41 + </dependencies>
42 +
43 + <build>
44 + <plugins>
45 + <plugin>
46 + <groupId>org.apache.felix</groupId>
47 + <artifactId>maven-scr-plugin</artifactId>
48 + </plugin>
49 + </plugins>
50 + </build>
51 +
52 +</project>
1 -package org.onlab.onos.store.impl; 1 +package org.onlab.onos.store.common;
2 2
3 import java.util.concurrent.Callable; 3 import java.util.concurrent.Callable;
4 import java.util.concurrent.ExecutionException; 4 import java.util.concurrent.ExecutionException;
......
1 -package org.onlab.onos.store.impl; 1 +package org.onlab.onos.store.common;
2 2
3 import com.google.common.base.Optional; 3 import com.google.common.base.Optional;
4 import com.google.common.cache.LoadingCache; 4 import com.google.common.cache.LoadingCache;
...@@ -6,6 +6,7 @@ import com.hazelcast.core.EntryAdapter; ...@@ -6,6 +6,7 @@ import com.hazelcast.core.EntryAdapter;
6 import com.hazelcast.core.EntryEvent; 6 import com.hazelcast.core.EntryEvent;
7 import com.hazelcast.core.HazelcastInstance; 7 import com.hazelcast.core.HazelcastInstance;
8 import com.hazelcast.core.MapEvent; 8 import com.hazelcast.core.MapEvent;
9 +
9 import org.apache.felix.scr.annotations.Activate; 10 import org.apache.felix.scr.annotations.Activate;
10 import org.apache.felix.scr.annotations.Component; 11 import org.apache.felix.scr.annotations.Component;
11 import org.apache.felix.scr.annotations.Reference; 12 import org.apache.felix.scr.annotations.Reference;
...@@ -13,7 +14,6 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -13,7 +14,6 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
13 import org.onlab.onos.event.Event; 14 import org.onlab.onos.event.Event;
14 import org.onlab.onos.store.AbstractStore; 15 import org.onlab.onos.store.AbstractStore;
15 import org.onlab.onos.store.StoreDelegate; 16 import org.onlab.onos.store.StoreDelegate;
16 -import org.onlab.onos.store.common.StoreService;
17 import org.slf4j.Logger; 17 import org.slf4j.Logger;
18 18
19 import static com.google.common.base.Preconditions.checkNotNull; 19 import static com.google.common.base.Preconditions.checkNotNull;
......
1 -package org.onlab.onos.store.impl; 1 +package org.onlab.onos.store.common;
2 2
3 import static com.google.common.base.Preconditions.checkNotNull; 3 import static com.google.common.base.Preconditions.checkNotNull;
4 4
5 -import org.onlab.onos.store.common.StoreService;
6 -
7 import com.google.common.base.Optional; 5 import com.google.common.base.Optional;
8 import com.google.common.cache.CacheLoader; 6 import com.google.common.cache.CacheLoader;
9 import com.hazelcast.core.IMap; 7 import com.hazelcast.core.IMap;
......
1 -package org.onlab.onos.store.impl; 1 +package org.onlab.onos.store.common;
2 2
3 import com.hazelcast.config.Config; 3 import com.hazelcast.config.Config;
4 import com.hazelcast.config.FileSystemXmlConfig; 4 import com.hazelcast.config.FileSystemXmlConfig;
...@@ -27,7 +27,6 @@ import org.onlab.onos.net.MastershipRole; ...@@ -27,7 +27,6 @@ import org.onlab.onos.net.MastershipRole;
27 import org.onlab.onos.net.Port; 27 import org.onlab.onos.net.Port;
28 import org.onlab.onos.net.PortNumber; 28 import org.onlab.onos.net.PortNumber;
29 import org.onlab.onos.net.provider.ProviderId; 29 import org.onlab.onos.net.provider.ProviderId;
30 -import org.onlab.onos.store.common.StoreService;
31 import org.onlab.onos.store.serializers.ConnectPointSerializer; 30 import org.onlab.onos.store.serializers.ConnectPointSerializer;
32 import org.onlab.onos.store.serializers.DefaultLinkSerializer; 31 import org.onlab.onos.store.serializers.DefaultLinkSerializer;
33 import org.onlab.onos.store.serializers.DefaultPortSerializer; 32 import org.onlab.onos.store.serializers.DefaultPortSerializer;
......
1 -package org.onlab.onos.store.impl; 1 +package org.onlab.onos.store.common;
2 2
3 import java.io.FileNotFoundException; 3 import java.io.FileNotFoundException;
4 import java.util.UUID; 4 import java.util.UUID;
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5 + <modelVersion>4.0.0</modelVersion>
6 +
7 + <parent>
8 + <groupId>org.onlab.onos</groupId>
9 + <artifactId>onos-core-hz</artifactId>
10 + <version>1.0.0-SNAPSHOT</version>
11 + <relativePath>../pom.xml</relativePath>
12 + </parent>
13 +
14 + <artifactId>onos-core-hz-net</artifactId>
15 + <packaging>bundle</packaging>
16 +
17 + <description>ONOS Hazelcast based distributed store subsystems</description>
18 +
19 + <dependencies>
20 + <dependency>
21 + <groupId>org.onlab.onos</groupId>
22 + <artifactId>onos-api</artifactId>
23 + </dependency>
24 + <dependency>
25 + <groupId>org.onlab.onos</groupId>
26 + <artifactId>onos-core-serializers</artifactId>
27 + <version>${project.version}</version>
28 + </dependency>
29 + <dependency>
30 + <groupId>org.onlab.onos</groupId>
31 + <artifactId>onos-core-hz-common</artifactId>
32 + <version>${project.version}</version>
33 + </dependency>
34 + <dependency>
35 + <groupId>org.onlab.onos</groupId>
36 + <artifactId>onos-core-hz-common</artifactId>
37 + <classifier>tests</classifier>
38 + <scope>test</scope>
39 + <version>${project.version}</version>
40 + </dependency>
41 + <dependency>
42 + <groupId>org.apache.felix</groupId>
43 + <artifactId>org.apache.felix.scr.annotations</artifactId>
44 + </dependency>
45 + <dependency>
46 + <groupId>com.hazelcast</groupId>
47 + <artifactId>hazelcast</artifactId>
48 + </dependency>
49 + <dependency>
50 + <groupId>de.javakaffee</groupId>
51 + <artifactId>kryo-serializers</artifactId>
52 + </dependency>
53 + </dependencies>
54 +
55 + <build>
56 + <plugins>
57 + <plugin>
58 + <groupId>org.apache.felix</groupId>
59 + <artifactId>maven-scr-plugin</artifactId>
60 + </plugin>
61 + </plugins>
62 + </build>
63 +
64 +</project>
1 package org.onlab.onos.store.device.impl; 1 package org.onlab.onos.store.device.impl;
2 2
3 import static com.google.common.base.Predicates.notNull; 3 import static com.google.common.base.Predicates.notNull;
4 +
4 import com.google.common.base.Optional; 5 import com.google.common.base.Optional;
5 import com.google.common.cache.LoadingCache; 6 import com.google.common.cache.LoadingCache;
6 import com.google.common.collect.FluentIterable; 7 import com.google.common.collect.FluentIterable;
...@@ -26,9 +27,9 @@ import org.onlab.onos.net.device.DeviceStore; ...@@ -26,9 +27,9 @@ import org.onlab.onos.net.device.DeviceStore;
26 import org.onlab.onos.net.device.DeviceStoreDelegate; 27 import org.onlab.onos.net.device.DeviceStoreDelegate;
27 import org.onlab.onos.net.device.PortDescription; 28 import org.onlab.onos.net.device.PortDescription;
28 import org.onlab.onos.net.provider.ProviderId; 29 import org.onlab.onos.net.provider.ProviderId;
29 -import org.onlab.onos.store.impl.AbsentInvalidatingLoadingCache; 30 +import org.onlab.onos.store.common.AbsentInvalidatingLoadingCache;
30 -import org.onlab.onos.store.impl.AbstractHazelcastStore; 31 +import org.onlab.onos.store.common.AbstractHazelcastStore;
31 -import org.onlab.onos.store.impl.OptionalCacheLoader; 32 +import org.onlab.onos.store.common.OptionalCacheLoader;
32 import org.slf4j.Logger; 33 import org.slf4j.Logger;
33 34
34 import java.util.ArrayList; 35 import java.util.ArrayList;
......
1 -package org.onlab.onos.store.common; 1 +package org.onlab.onos.store.device.impl;
2 2
3 import org.apache.felix.scr.annotations.Component; 3 import org.apache.felix.scr.annotations.Component;
4 import org.apache.felix.scr.annotations.Service; 4 import org.apache.felix.scr.annotations.Service;
...@@ -7,7 +7,7 @@ import org.onlab.onos.net.DeviceId; ...@@ -7,7 +7,7 @@ import org.onlab.onos.net.DeviceId;
7 import org.onlab.onos.store.ClockService; 7 import org.onlab.onos.store.ClockService;
8 import org.onlab.onos.store.Timestamp; 8 import org.onlab.onos.store.Timestamp;
9 9
10 -// FIXME: Code clone in onos-core-trivial, onos-core-hz 10 +// FIXME: Code clone in onos-core-trivial, onos-core-hz-net
11 /** 11 /**
12 * Dummy implementation of {@link ClockService}. 12 * Dummy implementation of {@link ClockService}.
13 */ 13 */
......
...@@ -10,6 +10,7 @@ import static org.slf4j.LoggerFactory.getLogger; ...@@ -10,6 +10,7 @@ import static org.slf4j.LoggerFactory.getLogger;
10 10
11 import java.util.HashSet; 11 import java.util.HashSet;
12 import java.util.Set; 12 import java.util.Set;
13 +
13 import org.apache.felix.scr.annotations.Activate; 14 import org.apache.felix.scr.annotations.Activate;
14 import org.apache.felix.scr.annotations.Component; 15 import org.apache.felix.scr.annotations.Component;
15 import org.apache.felix.scr.annotations.Deactivate; 16 import org.apache.felix.scr.annotations.Deactivate;
...@@ -24,9 +25,9 @@ import org.onlab.onos.net.link.LinkEvent; ...@@ -24,9 +25,9 @@ import org.onlab.onos.net.link.LinkEvent;
24 import org.onlab.onos.net.link.LinkStore; 25 import org.onlab.onos.net.link.LinkStore;
25 import org.onlab.onos.net.link.LinkStoreDelegate; 26 import org.onlab.onos.net.link.LinkStoreDelegate;
26 import org.onlab.onos.net.provider.ProviderId; 27 import org.onlab.onos.net.provider.ProviderId;
27 -import org.onlab.onos.store.impl.AbsentInvalidatingLoadingCache; 28 +import org.onlab.onos.store.common.AbsentInvalidatingLoadingCache;
28 -import org.onlab.onos.store.impl.AbstractHazelcastStore; 29 +import org.onlab.onos.store.common.AbstractHazelcastStore;
29 -import org.onlab.onos.store.impl.OptionalCacheLoader; 30 +import org.onlab.onos.store.common.OptionalCacheLoader;
30 import org.slf4j.Logger; 31 import org.slf4j.Logger;
31 32
32 import com.google.common.base.Optional; 33 import com.google.common.base.Optional;
......
...@@ -32,9 +32,9 @@ import org.onlab.onos.net.device.DeviceEvent; ...@@ -32,9 +32,9 @@ import org.onlab.onos.net.device.DeviceEvent;
32 import org.onlab.onos.net.device.DeviceStoreDelegate; 32 import org.onlab.onos.net.device.DeviceStoreDelegate;
33 import org.onlab.onos.net.device.PortDescription; 33 import org.onlab.onos.net.device.PortDescription;
34 import org.onlab.onos.net.provider.ProviderId; 34 import org.onlab.onos.net.provider.ProviderId;
35 +import org.onlab.onos.store.common.StoreManager;
35 import org.onlab.onos.store.common.StoreService; 36 import org.onlab.onos.store.common.StoreService;
36 -import org.onlab.onos.store.impl.StoreManager; 37 +import org.onlab.onos.store.common.TestStoreManager;
37 -import org.onlab.onos.store.impl.TestStoreManager;
38 38
39 import com.google.common.collect.Iterables; 39 import com.google.common.collect.Iterables;
40 import com.google.common.collect.Sets; 40 import com.google.common.collect.Sets;
......
...@@ -26,9 +26,9 @@ import org.onlab.onos.net.link.DefaultLinkDescription; ...@@ -26,9 +26,9 @@ import org.onlab.onos.net.link.DefaultLinkDescription;
26 import org.onlab.onos.net.link.LinkEvent; 26 import org.onlab.onos.net.link.LinkEvent;
27 import org.onlab.onos.net.link.LinkStoreDelegate; 27 import org.onlab.onos.net.link.LinkStoreDelegate;
28 import org.onlab.onos.net.provider.ProviderId; 28 import org.onlab.onos.net.provider.ProviderId;
29 +import org.onlab.onos.store.common.StoreManager;
29 import org.onlab.onos.store.common.StoreService; 30 import org.onlab.onos.store.common.StoreService;
30 -import org.onlab.onos.store.impl.StoreManager; 31 +import org.onlab.onos.store.common.TestStoreManager;
31 -import org.onlab.onos.store.impl.TestStoreManager;
32 32
33 import com.google.common.collect.Iterables; 33 import com.google.common.collect.Iterables;
34 import com.hazelcast.config.Config; 34 import com.hazelcast.config.Config;
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<project xmlns="http://maven.apache.org/POM/4.0.0" 2 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5 <modelVersion>4.0.0</modelVersion> 3 <modelVersion>4.0.0</modelVersion>
6 4
7 <parent> 5 <parent>
...@@ -12,39 +10,40 @@ ...@@ -12,39 +10,40 @@
12 </parent> 10 </parent>
13 11
14 <artifactId>onos-core-hz</artifactId> 12 <artifactId>onos-core-hz</artifactId>
15 - <packaging>bundle</packaging> 13 + <packaging>pom</packaging>
16 14
17 - <description>ONOS Hazelcast based distributed store subsystems</description> 15 + <description>ONOS Core Hazelcast Store subsystem</description>
16 +
17 + <modules>
18 + <module>common</module>
19 + <module>cluster</module>
20 + <module>net</module>
21 + </modules>
18 22
19 <dependencies> 23 <dependencies>
20 <dependency> 24 <dependency>
21 - <groupId>org.onlab.onos</groupId> 25 + <groupId>com.google.guava</groupId>
22 - <artifactId>onos-api</artifactId> 26 + <artifactId>guava</artifactId>
23 </dependency> 27 </dependency>
24 <dependency> 28 <dependency>
25 <groupId>org.onlab.onos</groupId> 29 <groupId>org.onlab.onos</groupId>
26 - <artifactId>onos-core-serializers</artifactId> 30 + <artifactId>onlab-misc</artifactId>
27 - <version>${project.version}</version>
28 </dependency> 31 </dependency>
29 <dependency> 32 <dependency>
30 - <groupId>org.apache.felix</groupId> 33 + <groupId>org.onlab.onos</groupId>
31 - <artifactId>org.apache.felix.scr.annotations</artifactId> 34 + <artifactId>onlab-junit</artifactId>
32 </dependency> 35 </dependency>
33 <dependency> 36 <dependency>
34 <groupId>com.hazelcast</groupId> 37 <groupId>com.hazelcast</groupId>
35 <artifactId>hazelcast</artifactId> 38 <artifactId>hazelcast</artifactId>
36 </dependency> 39 </dependency>
37 - <dependency>
38 - <groupId>de.javakaffee</groupId>
39 - <artifactId>kryo-serializers</artifactId>
40 - </dependency>
41 </dependencies> 40 </dependencies>
42 41
43 <build> 42 <build>
44 <plugins> 43 <plugins>
45 <plugin> 44 <plugin>
46 <groupId>org.apache.felix</groupId> 45 <groupId>org.apache.felix</groupId>
47 - <artifactId>maven-scr-plugin</artifactId> 46 + <artifactId>maven-bundle-plugin</artifactId>
48 </plugin> 47 </plugin>
49 </plugins> 48 </plugins>
50 </build> 49 </build>
......
...@@ -7,7 +7,7 @@ import org.onlab.onos.net.DeviceId; ...@@ -7,7 +7,7 @@ import org.onlab.onos.net.DeviceId;
7 import org.onlab.onos.store.ClockService; 7 import org.onlab.onos.store.ClockService;
8 import org.onlab.onos.store.Timestamp; 8 import org.onlab.onos.store.Timestamp;
9 9
10 -//FIXME: Code clone in onos-core-trivial, onos-core-hz 10 +//FIXME: Code clone in onos-core-trivial, onos-core-hz-net
11 /** 11 /**
12 * Dummy implementation of {@link ClockService}. 12 * Dummy implementation of {@link ClockService}.
13 */ 13 */
......
...@@ -48,8 +48,10 @@ ...@@ -48,8 +48,10 @@
48 description="ONOS core components"> 48 description="ONOS core components">
49 <feature>onos-api</feature> 49 <feature>onos-api</feature>
50 <bundle>mvn:org.onlab.onos/onos-core-net/1.0.0-SNAPSHOT</bundle> 50 <bundle>mvn:org.onlab.onos/onos-core-net/1.0.0-SNAPSHOT</bundle>
51 - <bundle>mvn:org.onlab.onos/onos-core-hz/1.0.0-SNAPSHOT</bundle> 51 + <bundle>mvn:org.onlab.onos/onos-core-hz-common/1.0.0-SNAPSHOT</bundle>
52 <bundle>mvn:org.onlab.onos/onos-core-serializers/1.0.0-SNAPSHOT</bundle> 52 <bundle>mvn:org.onlab.onos/onos-core-serializers/1.0.0-SNAPSHOT</bundle>
53 + <bundle>mvn:org.onlab.onos/onos-core-hz-cluster/1.0.0-SNAPSHOT</bundle>
54 + <bundle>mvn:org.onlab.onos/onos-core-hz-net/1.0.0-SNAPSHOT</bundle>
53 </feature> 55 </feature>
54 56
55 <feature name="onos-core-trivial" version="1.0.0" 57 <feature name="onos-core-trivial" version="1.0.0"
......