Committed by
Gerrit Code Review
ONOS-1793 Moved trivial stores to onos-core-common/src/test; onos-core-trivial is no longer.
Change-Id: Ie4824db36e3a7eb6db3b953ee1f2786d3e22194f
Showing
46 changed files
with
46 additions
and
125 deletions
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import static com.google.common.base.MoreObjects.toStringHelper; | 18 | import static com.google.common.base.MoreObjects.toStringHelper; |
19 | import static org.onlab.graph.GraphPathSearch.ALL_PATHS; | 19 | import static org.onlab.graph.GraphPathSearch.ALL_PATHS; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import org.onlab.graph.AdjacencyListsGraph; | 18 | import org.onlab.graph.AdjacencyListsGraph; |
19 | import org.onosproject.net.topology.TopologyEdge; | 19 | import org.onosproject.net.topology.TopologyEdge; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import org.junit.Before; | 18 | import org.junit.Before; |
19 | import org.junit.Test; | 19 | import org.junit.Test; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import java.util.Set; | 18 | import java.util.Set; |
19 | 19 | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import org.onosproject.net.DeviceId; | 18 | import org.onosproject.net.DeviceId; |
19 | 19 | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.collect.ImmutableSet; | 18 | import com.google.common.collect.ImmutableSet; |
19 | import org.apache.felix.scr.annotations.Component; | 19 | import org.apache.felix.scr.annotations.Component; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.collect.ImmutableSet; | 18 | import com.google.common.collect.ImmutableSet; |
19 | import org.apache.felix.scr.annotations.Activate; | 19 | import org.apache.felix.scr.annotations.Activate; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.collect.ImmutableSet; | 18 | import com.google.common.collect.ImmutableSet; |
19 | import org.junit.After; | 19 | import org.junit.After; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.collect.ImmutableSet; | 18 | import com.google.common.collect.ImmutableSet; |
19 | import org.apache.felix.scr.annotations.Activate; | 19 | import org.apache.felix.scr.annotations.Activate; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import org.apache.felix.scr.annotations.Activate; | 18 | import org.apache.felix.scr.annotations.Activate; |
19 | import org.apache.felix.scr.annotations.Component; | 19 | import org.apache.felix.scr.annotations.Component; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.base.Predicate; | 18 | import com.google.common.base.Predicate; |
19 | import com.google.common.collect.FluentIterable; | 19 | import com.google.common.collect.FluentIterable; | ... | ... |
... | @@ -17,7 +17,7 @@ | ... | @@ -17,7 +17,7 @@ |
17 | /** | 17 | /** |
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | -package org.onosproject.store.trivial.impl; | 20 | +package org.onosproject.store.trivial; |
21 | 21 | ||
22 | import static org.junit.Assert.*; | 22 | import static org.junit.Assert.*; |
23 | import static org.onosproject.net.Device.Type.SWITCH; | 23 | import static org.onosproject.net.Device.Type.SWITCH; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.base.Function; | 18 | import com.google.common.base.Function; |
19 | import com.google.common.cache.Cache; | 19 | import com.google.common.cache.Cache; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked; | 18 | import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked; |
19 | import static org.slf4j.LoggerFactory.getLogger; | 19 | import static org.slf4j.LoggerFactory.getLogger; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import static org.junit.Assert.assertEquals; | 18 | import static org.junit.Assert.assertEquals; |
19 | import static org.onosproject.net.DeviceId.deviceId; | 19 | import static org.onosproject.net.DeviceId.deviceId; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import static org.onosproject.net.DefaultAnnotations.merge; | 18 | import static org.onosproject.net.DefaultAnnotations.merge; |
19 | import static org.onosproject.net.host.HostEvent.Type.HOST_ADDED; | 19 | import static org.onosproject.net.host.HostEvent.Type.HOST_ADDED; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import org.apache.felix.scr.annotations.Component; | 18 | import org.apache.felix.scr.annotations.Component; |
19 | import org.apache.felix.scr.annotations.Service; | 19 | import org.apache.felix.scr.annotations.Service; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.collect.Lists; | 18 | import com.google.common.collect.Lists; |
19 | import com.google.common.collect.Maps; | 19 | import com.google.common.collect.Maps; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import static com.google.common.base.Preconditions.checkArgument; | 18 | import static com.google.common.base.Preconditions.checkArgument; |
19 | 19 | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import java.util.Collections; | 18 | import java.util.Collections; |
19 | import java.util.HashMap; | 19 | import java.util.HashMap; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import java.util.Collection; | 18 | import java.util.Collection; |
19 | import java.util.HashSet; | 19 | import java.util.HashSet; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.base.Function; | 18 | import com.google.common.base.Function; |
19 | import com.google.common.collect.FluentIterable; | 19 | import com.google.common.collect.FluentIterable; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.collect.Iterables; | 18 | import com.google.common.collect.Iterables; |
19 | 19 | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import static org.onosproject.mastership.MastershipEvent.Type.BACKUPS_CHANGED; | 18 | import static org.onosproject.mastership.MastershipEvent.Type.BACKUPS_CHANGED; |
19 | import static org.onosproject.mastership.MastershipEvent.Type.MASTER_CHANGED; | 19 | import static org.onosproject.mastership.MastershipEvent.Type.MASTER_CHANGED; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import java.util.ArrayList; | 18 | import java.util.ArrayList; |
19 | import java.util.List; | 19 | import java.util.List; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.collect.Sets; | 18 | import com.google.common.collect.Sets; |
19 | import org.apache.felix.scr.annotations.Component; | 19 | import org.apache.felix.scr.annotations.Component; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.collect.Sets; | 18 | import com.google.common.collect.Sets; |
19 | import org.apache.felix.scr.annotations.Activate; | 19 | import org.apache.felix.scr.annotations.Activate; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import org.apache.felix.scr.annotations.Activate; | 18 | import org.apache.felix.scr.annotations.Activate; |
19 | import org.apache.felix.scr.annotations.Component; | 19 | import org.apache.felix.scr.annotations.Component; | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.onosproject.store.trivial.impl; | 16 | +package org.onosproject.store.trivial; |
17 | 17 | ||
18 | import com.google.common.base.MoreObjects; | 18 | import com.google.common.base.MoreObjects; |
19 | import com.google.common.collect.ComparisonChain; | 19 | import com.google.common.collect.ComparisonChain; | ... | ... |
... | @@ -18,4 +18,4 @@ | ... | @@ -18,4 +18,4 @@ |
18 | * Implementations of in-memory stores suitable for unit testing and | 18 | * Implementations of in-memory stores suitable for unit testing and |
19 | * experimentation; not for production use. | 19 | * experimentation; not for production use. |
20 | */ | 20 | */ |
21 | -package org.onosproject.store.trivial.impl; | 21 | +package org.onosproject.store.trivial; | ... | ... |
... | @@ -46,17 +46,8 @@ | ... | @@ -46,17 +46,8 @@ |
46 | 46 | ||
47 | <dependency> | 47 | <dependency> |
48 | <groupId>org.onosproject</groupId> | 48 | <groupId>org.onosproject</groupId> |
49 | - <artifactId>onos-core-trivial</artifactId> | 49 | + <artifactId>onos-core-common</artifactId> |
50 | - <version>${project.version}</version> | ||
51 | - <scope>test</scope> | ||
52 | - </dependency> | ||
53 | - | ||
54 | - <!-- FIXME remove when we figure out the trivial store --> | ||
55 | - <dependency> | ||
56 | - <groupId>org.onosproject</groupId> | ||
57 | - <artifactId>onos-core-dist</artifactId> | ||
58 | <version>${project.version}</version> | 50 | <version>${project.version}</version> |
59 | - <scope>test</scope> | ||
60 | </dependency> | 51 | </dependency> |
61 | 52 | ||
62 | <dependency> | 53 | <dependency> | ... | ... |
... | @@ -31,7 +31,7 @@ import org.onosproject.mastership.MastershipService; | ... | @@ -31,7 +31,7 @@ import org.onosproject.mastership.MastershipService; |
31 | import org.onosproject.mastership.MastershipStore; | 31 | import org.onosproject.mastership.MastershipStore; |
32 | import org.onosproject.mastership.MastershipTermService; | 32 | import org.onosproject.mastership.MastershipTermService; |
33 | import org.onosproject.net.DeviceId; | 33 | import org.onosproject.net.DeviceId; |
34 | -import org.onosproject.store.trivial.impl.SimpleMastershipStore; | 34 | +import org.onosproject.store.trivial.SimpleMastershipStore; |
35 | 35 | ||
36 | import com.google.common.collect.Sets; | 36 | import com.google.common.collect.Sets; |
37 | import com.google.common.util.concurrent.Futures; | 37 | import com.google.common.util.concurrent.Futures; | ... | ... |
... | @@ -54,7 +54,7 @@ import org.onosproject.net.device.DeviceService; | ... | @@ -54,7 +54,7 @@ import org.onosproject.net.device.DeviceService; |
54 | import org.onosproject.net.device.PortDescription; | 54 | import org.onosproject.net.device.PortDescription; |
55 | import org.onosproject.net.provider.AbstractProvider; | 55 | import org.onosproject.net.provider.AbstractProvider; |
56 | import org.onosproject.net.provider.ProviderId; | 56 | import org.onosproject.net.provider.ProviderId; |
57 | -import org.onosproject.store.trivial.impl.SimpleDeviceStore; | 57 | +import org.onosproject.store.trivial.SimpleDeviceStore; |
58 | 58 | ||
59 | import com.google.common.collect.Sets; | 59 | import com.google.common.collect.Sets; |
60 | 60 | ... | ... |
... | @@ -62,7 +62,7 @@ import org.onosproject.net.flow.instructions.Instructions; | ... | @@ -62,7 +62,7 @@ import org.onosproject.net.flow.instructions.Instructions; |
62 | import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction; | 62 | import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction; |
63 | import org.onosproject.net.provider.AbstractProvider; | 63 | import org.onosproject.net.provider.AbstractProvider; |
64 | import org.onosproject.net.provider.ProviderId; | 64 | import org.onosproject.net.provider.ProviderId; |
65 | -import org.onosproject.store.trivial.impl.SimpleFlowRuleStore; | 65 | +import org.onosproject.store.trivial.SimpleFlowRuleStore; |
66 | 66 | ||
67 | import java.util.ArrayList; | 67 | import java.util.ArrayList; |
68 | import java.util.Collections; | 68 | import java.util.Collections; | ... | ... |
... | @@ -61,7 +61,7 @@ import org.onosproject.net.group.GroupService; | ... | @@ -61,7 +61,7 @@ import org.onosproject.net.group.GroupService; |
61 | import org.onosproject.net.group.StoredGroupEntry; | 61 | import org.onosproject.net.group.StoredGroupEntry; |
62 | import org.onosproject.net.provider.AbstractProvider; | 62 | import org.onosproject.net.provider.AbstractProvider; |
63 | import org.onosproject.net.provider.ProviderId; | 63 | import org.onosproject.net.provider.ProviderId; |
64 | -import org.onosproject.store.trivial.impl.SimpleGroupStore; | 64 | +import org.onosproject.store.trivial.SimpleGroupStore; |
65 | 65 | ||
66 | import com.google.common.collect.Iterables; | 66 | import com.google.common.collect.Iterables; |
67 | 67 | ... | ... |
... | @@ -54,7 +54,7 @@ import org.onosproject.net.host.InterfaceIpAddress; | ... | @@ -54,7 +54,7 @@ import org.onosproject.net.host.InterfaceIpAddress; |
54 | import org.onosproject.net.host.PortAddresses; | 54 | import org.onosproject.net.host.PortAddresses; |
55 | import org.onosproject.net.provider.AbstractProvider; | 55 | import org.onosproject.net.provider.AbstractProvider; |
56 | import org.onosproject.net.provider.ProviderId; | 56 | import org.onosproject.net.provider.ProviderId; |
57 | -import org.onosproject.store.trivial.impl.SimpleHostStore; | 57 | +import org.onosproject.store.trivial.SimpleHostStore; |
58 | 58 | ||
59 | import com.google.common.collect.Lists; | 59 | import com.google.common.collect.Lists; |
60 | import com.google.common.collect.Sets; | 60 | import com.google.common.collect.Sets; | ... | ... |
... | @@ -29,8 +29,8 @@ import org.onosproject.net.intent.IntentStore; | ... | @@ -29,8 +29,8 @@ import org.onosproject.net.intent.IntentStore; |
29 | import org.onosproject.net.intent.IntentStoreDelegate; | 29 | import org.onosproject.net.intent.IntentStoreDelegate; |
30 | import org.onosproject.net.intent.MockIdGenerator; | 30 | import org.onosproject.net.intent.MockIdGenerator; |
31 | import org.onosproject.store.Timestamp; | 31 | import org.onosproject.store.Timestamp; |
32 | -import org.onosproject.store.trivial.impl.SimpleIntentStore; | 32 | +import org.onosproject.store.trivial.SimpleIntentStore; |
33 | -import org.onosproject.store.trivial.impl.SystemClockTimestamp; | 33 | +import org.onosproject.store.trivial.SystemClockTimestamp; |
34 | 34 | ||
35 | import static org.junit.Assert.assertEquals; | 35 | import static org.junit.Assert.assertEquals; |
36 | import static org.junit.Assert.assertTrue; | 36 | import static org.junit.Assert.assertTrue; | ... | ... |
... | @@ -29,8 +29,8 @@ import org.onosproject.net.intent.IntentStore; | ... | @@ -29,8 +29,8 @@ import org.onosproject.net.intent.IntentStore; |
29 | import org.onosproject.net.intent.IntentStoreDelegate; | 29 | import org.onosproject.net.intent.IntentStoreDelegate; |
30 | import org.onosproject.net.intent.MockIdGenerator; | 30 | import org.onosproject.net.intent.MockIdGenerator; |
31 | import org.onosproject.store.Timestamp; | 31 | import org.onosproject.store.Timestamp; |
32 | -import org.onosproject.store.trivial.impl.SimpleIntentStore; | 32 | +import org.onosproject.store.trivial.SimpleIntentStore; |
33 | -import org.onosproject.store.trivial.impl.SystemClockTimestamp; | 33 | +import org.onosproject.store.trivial.SystemClockTimestamp; |
34 | 34 | ||
35 | import static org.easymock.EasyMock.*; | 35 | import static org.easymock.EasyMock.*; |
36 | import static org.junit.Assert.assertTrue; | 36 | import static org.junit.Assert.assertTrue; | ... | ... |
... | @@ -45,7 +45,7 @@ import org.onosproject.net.intent.IntentService; | ... | @@ -45,7 +45,7 @@ import org.onosproject.net.intent.IntentService; |
45 | import org.onosproject.net.intent.IntentState; | 45 | import org.onosproject.net.intent.IntentState; |
46 | import org.onosproject.net.intent.Key; | 46 | import org.onosproject.net.intent.Key; |
47 | import org.onosproject.net.resource.link.LinkResourceAllocations; | 47 | import org.onosproject.net.resource.link.LinkResourceAllocations; |
48 | -import org.onosproject.store.trivial.impl.SimpleIntentStore; | 48 | +import org.onosproject.store.trivial.SimpleIntentStore; |
49 | 49 | ||
50 | import java.util.Collection; | 50 | import java.util.Collection; |
51 | import java.util.Collections; | 51 | import java.util.Collections; | ... | ... |
... | @@ -44,7 +44,7 @@ import org.onosproject.net.intent.IntentExtensionService; | ... | @@ -44,7 +44,7 @@ import org.onosproject.net.intent.IntentExtensionService; |
44 | import org.onosproject.net.intent.IntentTestsMocks; | 44 | import org.onosproject.net.intent.IntentTestsMocks; |
45 | import org.onosproject.net.intent.MockIdGenerator; | 45 | import org.onosproject.net.intent.MockIdGenerator; |
46 | import org.onosproject.net.intent.MplsPathIntent; | 46 | import org.onosproject.net.intent.MplsPathIntent; |
47 | -import org.onosproject.store.trivial.impl.SimpleLinkStore; | 47 | +import org.onosproject.store.trivial.SimpleLinkStore; |
48 | 48 | ||
49 | import static org.easymock.EasyMock.createMock; | 49 | import static org.easymock.EasyMock.createMock; |
50 | import static org.easymock.EasyMock.expect; | 50 | import static org.easymock.EasyMock.expect; | ... | ... |
... | @@ -39,7 +39,7 @@ import org.onosproject.net.provider.AbstractProvider; | ... | @@ -39,7 +39,7 @@ import org.onosproject.net.provider.AbstractProvider; |
39 | import org.onosproject.net.provider.ProviderId; | 39 | import org.onosproject.net.provider.ProviderId; |
40 | import org.onosproject.common.event.impl.TestEventDispatcher; | 40 | import org.onosproject.common.event.impl.TestEventDispatcher; |
41 | import org.onosproject.net.device.impl.DeviceManager; | 41 | import org.onosproject.net.device.impl.DeviceManager; |
42 | -import org.onosproject.store.trivial.impl.SimpleLinkStore; | 42 | +import org.onosproject.store.trivial.SimpleLinkStore; |
43 | 43 | ||
44 | import java.util.ArrayList; | 44 | import java.util.ArrayList; |
45 | import java.util.HashMap; | 45 | import java.util.HashMap; | ... | ... |
... | @@ -38,7 +38,7 @@ import org.onosproject.net.topology.TopologyProvider; | ... | @@ -38,7 +38,7 @@ import org.onosproject.net.topology.TopologyProvider; |
38 | import org.onosproject.net.topology.TopologyProviderRegistry; | 38 | import org.onosproject.net.topology.TopologyProviderRegistry; |
39 | import org.onosproject.net.topology.TopologyProviderService; | 39 | import org.onosproject.net.topology.TopologyProviderService; |
40 | import org.onosproject.net.topology.TopologyService; | 40 | import org.onosproject.net.topology.TopologyService; |
41 | -import org.onosproject.store.trivial.impl.SimpleTopologyStore; | 41 | +import org.onosproject.store.trivial.SimpleTopologyStore; |
42 | 42 | ||
43 | import java.util.ArrayList; | 43 | import java.util.ArrayList; |
44 | import java.util.List; | 44 | import java.util.List; | ... | ... |
... | @@ -32,7 +32,6 @@ | ... | @@ -32,7 +32,6 @@ |
32 | <description>ONOS Core Store subsystem</description> | 32 | <description>ONOS Core Store subsystem</description> |
33 | 33 | ||
34 | <modules> | 34 | <modules> |
35 | - <module>trivial</module> | ||
36 | <module>dist</module> | 35 | <module>dist</module> |
37 | <module>serializers</module> | 36 | <module>serializers</module> |
38 | </modules> | 37 | </modules> | ... | ... |
core/store/trivial/pom.xml
deleted
100644 → 0
1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
2 | -<!-- | ||
3 | - ~ Copyright 2014 Open Networking Laboratory | ||
4 | - ~ | ||
5 | - ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
6 | - ~ you may not use this file except in compliance with the License. | ||
7 | - ~ You may obtain a copy of the License at | ||
8 | - ~ | ||
9 | - ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
10 | - ~ | ||
11 | - ~ Unless required by applicable law or agreed to in writing, software | ||
12 | - ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
13 | - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
14 | - ~ See the License for the specific language governing permissions and | ||
15 | - ~ limitations under the License. | ||
16 | - --> | ||
17 | -<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
18 | - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
19 | - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
20 | - <modelVersion>4.0.0</modelVersion> | ||
21 | - | ||
22 | - <parent> | ||
23 | - <groupId>org.onosproject</groupId> | ||
24 | - <artifactId>onos-core-store</artifactId> | ||
25 | - <version>1.3.0-SNAPSHOT</version> | ||
26 | - <relativePath>../pom.xml</relativePath> | ||
27 | - </parent> | ||
28 | - | ||
29 | - <artifactId>onos-core-trivial</artifactId> | ||
30 | - <packaging>bundle</packaging> | ||
31 | - | ||
32 | - <description>ONOS network control trivial implementations of core subsystems</description> | ||
33 | - | ||
34 | - <dependencies> | ||
35 | - <dependency> | ||
36 | - <groupId>org.apache.commons</groupId> | ||
37 | - <artifactId>commons-lang3</artifactId> | ||
38 | - </dependency> | ||
39 | - | ||
40 | - <dependency> | ||
41 | - <groupId>org.onosproject</groupId> | ||
42 | - <artifactId>onos-core-common</artifactId> | ||
43 | - </dependency> | ||
44 | - | ||
45 | - <dependency> | ||
46 | - <groupId>org.onosproject</groupId> | ||
47 | - <artifactId>onos-api</artifactId> | ||
48 | - <classifier>tests</classifier> | ||
49 | - <scope>test</scope> | ||
50 | - </dependency> | ||
51 | - </dependencies> | ||
52 | - | ||
53 | -</project> |
... | @@ -138,13 +138,4 @@ | ... | @@ -138,13 +138,4 @@ |
138 | <bundle>mvn:org.onosproject/onos-security-impl/@ONOS-VERSION</bundle> | 138 | <bundle>mvn:org.onosproject/onos-security-impl/@ONOS-VERSION</bundle> |
139 | </feature> | 139 | </feature> |
140 | 140 | ||
141 | - <!-- Deprecated! For standalone testing only. --> | ||
142 | - <feature name="onos-core-trivial" version="@FEATURE-VERSION" | ||
143 | - description="ONOS trivial core components"> | ||
144 | - <feature>onos-api</feature> | ||
145 | - <bundle>mvn:org.onosproject/onos-core-net/@ONOS-VERSION</bundle> | ||
146 | - <bundle>mvn:org.onosproject/onos-core-common/@ONOS-VERSION</bundle> | ||
147 | - <bundle>mvn:org.onosproject/onos-core-trivial/@ONOS-VERSION</bundle> | ||
148 | - </feature> | ||
149 | - | ||
150 | </features> | 141 | </features> | ... | ... |
... | @@ -49,16 +49,9 @@ | ... | @@ -49,16 +49,9 @@ |
49 | 49 | ||
50 | <dependency> | 50 | <dependency> |
51 | <groupId>org.onosproject</groupId> | 51 | <groupId>org.onosproject</groupId> |
52 | - <artifactId>onos-core-trivial</artifactId> | 52 | + <artifactId>onos-core-common</artifactId> |
53 | - <version>${project.version}</version> | ||
54 | - <scope>test</scope> | ||
55 | - </dependency> | ||
56 | - | ||
57 | - <!-- FIXME remove when we figure out the trivial store --> | ||
58 | - <dependency> | ||
59 | - <groupId>org.onosproject</groupId> | ||
60 | - <artifactId>onos-core-dist</artifactId> | ||
61 | <version>${project.version}</version> | 53 | <version>${project.version}</version> |
54 | + <classifier>tests</classifier> | ||
62 | <scope>test</scope> | 55 | <scope>test</scope> |
63 | </dependency> | 56 | </dependency> |
64 | 57 | ... | ... |
-
Please register or login to post a comment