ONOS-1793 Moved trivial stores to onos-core-common/src/test; onos-core-trivial is no longer.

Change-Id: Ie4824db36e3a7eb6db3b953ee1f2786d3e22194f

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static org.onlab.graph.GraphPathSearch.ALL_PATHS;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.onlab.graph.AdjacencyListsGraph;
 import org.onosproject.net.topology.TopologyEdge;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.junit.Before;
 import org.junit.Test;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import java.util.Set;
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.onosproject.net.DeviceId;
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Component;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.ImmutableSet;
 import org.junit.After;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;

@@ -17,7 +17,7 @@
 /**
  *
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.junit.Assert.*;
 import static org.onosproject.net.Device.Type.SWITCH;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.base.Function;
 import com.google.common.cache.Cache;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked;
 import static org.slf4j.LoggerFactory.getLogger;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.junit.Assert.assertEquals;
 import static org.onosproject.net.DeviceId.deviceId;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.onosproject.net.DefaultAnnotations.merge;
 import static org.onosproject.net.host.HostEvent.Type.HOST_ADDED;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import java.util.Collections;
 import java.util.HashMap;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import java.util.Collection;
 import java.util.HashSet;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.base.Function;
 import com.google.common.collect.FluentIterable;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.Iterables;
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.onosproject.mastership.MastershipEvent.Type.BACKUPS_CHANGED;
 import static org.onosproject.mastership.MastershipEvent.Type.MASTER_CHANGED;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import java.util.ArrayList;
 import java.util.List;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.Sets;
 import org.apache.felix.scr.annotations.Component;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.Sets;
 import org.apache.felix.scr.annotations.Activate;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ComparisonChain;

@@ -18,4 +18,4 @@
  * Implementations of in-memory stores suitable for unit testing and
  * experimentation; not for production use.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;

@@ -46,17 +46,8 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-trivial</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- FIXME remove when we figure out the trivial store -->
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-dist</artifactId>
+            <artifactId>onos-core-common</artifactId>
             <version>${project.version}</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>

@@ -31,7 +31,7 @@ import org.onosproject.mastership.MastershipService;
 import org.onosproject.mastership.MastershipStore;
 import org.onosproject.mastership.MastershipTermService;
 import org.onosproject.net.DeviceId;
-import org.onosproject.store.trivial.impl.SimpleMastershipStore;
+import org.onosproject.store.trivial.SimpleMastershipStore;
 
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Futures;

@@ -54,7 +54,7 @@ import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.device.PortDescription;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.store.trivial.impl.SimpleDeviceStore;
+import org.onosproject.store.trivial.SimpleDeviceStore;
 
 import com.google.common.collect.Sets;
 

@@ -62,7 +62,7 @@ import org.onosproject.net.flow.instructions.Instructions;
 import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.store.trivial.impl.SimpleFlowRuleStore;
+import org.onosproject.store.trivial.SimpleFlowRuleStore;
 
 import java.util.ArrayList;
 import java.util.Collections;

@@ -61,7 +61,7 @@ import org.onosproject.net.group.GroupService;
 import org.onosproject.net.group.StoredGroupEntry;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.store.trivial.impl.SimpleGroupStore;
+import org.onosproject.store.trivial.SimpleGroupStore;
 
 import com.google.common.collect.Iterables;
 

@@ -54,7 +54,7 @@ import org.onosproject.net.host.InterfaceIpAddress;
 import org.onosproject.net.host.PortAddresses;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.store.trivial.impl.SimpleHostStore;
+import org.onosproject.store.trivial.SimpleHostStore;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;

@@ -29,8 +29,8 @@ import org.onosproject.net.intent.IntentStore;
 import org.onosproject.net.intent.IntentStoreDelegate;
 import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.store.Timestamp;
-import org.onosproject.store.trivial.impl.SimpleIntentStore;
-import org.onosproject.store.trivial.impl.SystemClockTimestamp;
+import org.onosproject.store.trivial.SimpleIntentStore;
+import org.onosproject.store.trivial.SystemClockTimestamp;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

@@ -29,8 +29,8 @@ import org.onosproject.net.intent.IntentStore;
 import org.onosproject.net.intent.IntentStoreDelegate;
 import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.store.Timestamp;
-import org.onosproject.store.trivial.impl.SimpleIntentStore;
-import org.onosproject.store.trivial.impl.SystemClockTimestamp;
+import org.onosproject.store.trivial.SimpleIntentStore;
+import org.onosproject.store.trivial.SystemClockTimestamp;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;

@@ -45,7 +45,7 @@ import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentState;
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.resource.link.LinkResourceAllocations;
-import org.onosproject.store.trivial.impl.SimpleIntentStore;
+import org.onosproject.store.trivial.SimpleIntentStore;
 
 import java.util.Collection;
 import java.util.Collections;

@@ -44,7 +44,7 @@ import org.onosproject.net.intent.IntentExtensionService;
 import org.onosproject.net.intent.IntentTestsMocks;
 import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.net.intent.MplsPathIntent;
-import org.onosproject.store.trivial.impl.SimpleLinkStore;
+import org.onosproject.store.trivial.SimpleLinkStore;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;

@@ -39,7 +39,7 @@ import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
 import org.onosproject.common.event.impl.TestEventDispatcher;
 import org.onosproject.net.device.impl.DeviceManager;
-import org.onosproject.store.trivial.impl.SimpleLinkStore;
+import org.onosproject.store.trivial.SimpleLinkStore;
 
 import java.util.ArrayList;
 import java.util.HashMap;

@@ -38,7 +38,7 @@ import org.onosproject.net.topology.TopologyProvider;
 import org.onosproject.net.topology.TopologyProviderRegistry;
 import org.onosproject.net.topology.TopologyProviderService;
 import org.onosproject.net.topology.TopologyService;
-import org.onosproject.store.trivial.impl.SimpleTopologyStore;
+import org.onosproject.store.trivial.SimpleTopologyStore;
 
 import java.util.ArrayList;
 import java.util.List;

@@ -32,7 +32,6 @@
     <description>ONOS Core Store subsystem</description>
 
     <modules>
-        <module>trivial</module>
         <module>dist</module>
         <module>serializers</module>
     </modules>

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014 Open Networking Laboratory
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onosproject</groupId>
-        <artifactId>onos-core-store</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-core-trivial</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS network control trivial implementations of core subsystems</description>
-
-    <dependencies>
-        <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-common</artifactId>
-        </dependency>
-
-        <dependency>
-          <groupId>org.onosproject</groupId>
-          <artifactId>onos-api</artifactId>
-          <classifier>tests</classifier>
-          <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>

@@ -138,13 +138,4 @@
         <bundle>mvn:org.onosproject/onos-security-impl/@ONOS-VERSION</bundle>
     </feature>
 
-    <!-- Deprecated! For standalone testing only. -->
-    <feature name="onos-core-trivial" version="@FEATURE-VERSION"
-             description="ONOS trivial core components">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-core-net/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-core-common/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-core-trivial/@ONOS-VERSION</bundle>
-    </feature>
-    
 </features>

@@ -49,16 +49,9 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-trivial</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- FIXME remove when we figure out the trivial store -->
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-dist</artifactId>
+            <artifactId>onos-core-common</artifactId>
             <version>${project.version}</version>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>