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

core/api/src/main/java/org/onosproject/net/intent/IntentId.java

diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentId.java b/core/api/src/main/java/org/onosproject/net/intent/IntentId.java
index 4494eea..567af95 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentId.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentId.java
@@ -17,7 +17,7 @@
 
 import com.google.common.annotations.Beta;
 import org.onlab.util.Identifier;
-import org.onosproject.net.newresource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceConsumer;
 
 /**
  * Intent identifier suitable as an external key.

core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java

diff --git a/core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java b/core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java
index 0193c61..e4f108c 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java
@@ -16,7 +16,7 @@
 package org.onosproject.net.intent;
 
 import com.google.common.annotations.Beta;
-import org.onosproject.net.newresource.Resource;
+import org.onosproject.net.resource.Resource;
 
 /**
  * Class providing resource information to constraints.

core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java

diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java
index 9ef0243..ee2ecee 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java
@@ -21,7 +21,7 @@
 import org.onlab.util.DataRateUnit;
 import org.onosproject.net.Link;
 import org.onosproject.net.intent.ResourceContext;
-import org.onosproject.net.newresource.Resources;
+import org.onosproject.net.resource.Resources;
 
 import java.util.Objects;
 import java.util.stream.Stream;