Move files under newresource package to resource package
Change-Id: Ifedb99be4671ada97fafe3ecfd196939207baa86
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
index f92be7b..4fe5343 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
@@ -35,13 +35,13 @@
import org.onosproject.net.flow.instructions.Instruction;
import org.onosproject.net.flow.instructions.Instructions;
import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction;
-import org.onosproject.net.newresource.DiscreteResourceId;
-import org.onosproject.net.newresource.Resource;
-import org.onosproject.net.newresource.ResourceAllocation;
-import org.onosproject.net.newresource.ResourceConsumer;
-import org.onosproject.net.newresource.ResourceId;
-import org.onosproject.net.newresource.ResourceListener;
-import org.onosproject.net.newresource.ResourceService;
+import org.onosproject.net.resource.DiscreteResourceId;
+import org.onosproject.net.resource.Resource;
+import org.onosproject.net.resource.ResourceAllocation;
+import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceId;
+import org.onosproject.net.resource.ResourceListener;
+import org.onosproject.net.resource.ResourceService;
import org.onosproject.net.topology.DefaultTopologyEdge;
import org.onosproject.net.topology.DefaultTopologyVertex;
import org.onosproject.net.topology.LinkWeight;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceIdTest.java
similarity index 97%
rename from core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceIdTest.java
index 1e79f81..8b91bbd 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceTest.java b/core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceTest.java
similarity index 98%
rename from core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceTest.java
index 29f5350..88f0a1c 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceIdTest.java
similarity index 97%
rename from core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceIdTest.java
index aeb950d..7dfcb9f 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java b/core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceTest.java
similarity index 98%
rename from core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceTest.java
index 612ef1a..bb019a7 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java b/core/api/src/test/java/org/onosproject/net/resource/ResourceAllocationTest.java
similarity index 94%
rename from core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/ResourceAllocationTest.java
index 4a5a450..4e3afce 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/ResourceAllocationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-2016 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/resource/ResourceIdTest.java
similarity index 97%
rename from core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/ResourceIdTest.java
index aa97892..2a0818a 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/ResourceIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import org.junit.Test;
import org.onlab.util.Bandwidth;