commit e18cb12e9454b845461a926541be3a8019fa419a
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Feb 22 21:04:56 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 24 23:16:59 2016 +0000
tree f9daf0c81e769d20c8d3d96cd23dc6c294b67ec2
parent c6ecc636c0384e7e3dc2a08d90612e4fb53ba5cd

Move files under newresource package to resource package

Change-Id: Ifedb99be4671ada97fafe3ecfd196939207baa86

cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java b/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
index 611f51a..b71b145 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
@@ -23,6 +23,7 @@
 import java.util.Set;
 import java.util.stream.StreamSupport;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
@@ -36,13 +37,11 @@
 import org.onosproject.net.Port;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.device.DeviceService;
-import org.onosproject.net.newresource.DiscreteResourceId;
 import org.onosproject.net.intent.IntentId;
-import org.onosproject.net.newresource.ResourceAllocation;
-import org.onosproject.net.newresource.ResourceService;
-
-import com.google.common.base.Strings;
-import org.onosproject.net.newresource.Resources;
+import org.onosproject.net.resource.Resources;
+import org.onosproject.net.resource.DiscreteResourceId;
+import org.onosproject.net.resource.ResourceAllocation;
+import org.onosproject.net.resource.ResourceService;
 
 /**
  * Lists allocated resources.

cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java b/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
index 7c8c761..76aaa5c 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
@@ -34,11 +34,11 @@
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.TributarySlot;
-import org.onosproject.net.newresource.ContinuousResource;
-import org.onosproject.net.newresource.DiscreteResource;
-import org.onosproject.net.newresource.Resource;
-import org.onosproject.net.newresource.Resources;
-import org.onosproject.net.newresource.ResourceService;
+import org.onosproject.net.resource.ContinuousResource;
+import org.onosproject.net.resource.DiscreteResource;
+import org.onosproject.net.resource.Resource;
+import org.onosproject.net.resource.Resources;
+import org.onosproject.net.resource.ResourceService;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ArrayListMultimap;

cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java b/cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java
index 984987f..5d09718 100644
--- a/cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java
+++ b/cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java
@@ -27,11 +27,11 @@
 import org.onosproject.net.OchSignal;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.intent.IntentId;
-import org.onosproject.net.newresource.ResourceAllocation;
-import org.onosproject.net.newresource.ResourceConsumer;
-import org.onosproject.net.newresource.Resource;
-import org.onosproject.net.newresource.ResourceService;
-import org.onosproject.net.newresource.Resources;
+import org.onosproject.net.resource.ResourceAllocation;
+import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.Resource;
+import org.onosproject.net.resource.ResourceService;
+import org.onosproject.net.resource.Resources;
 
 /**
  * Test tool to allocate resources.