commit | 63939a369f35b9742bab5c406c370320f3b42efc | [log] [tgz] |
---|---|---|
author | Jonathan Hart <jono@onlab.us> | Fri May 08 11:57:03 2015 -0700 |
committer | Gerrit Code Review <gerrit@onlab.us> | Fri May 08 23:06:15 2015 +0000 |
tree | fcd9c9825e972e188b4a2013a7c171cfb8874e4a | |
parent | d7f7bcc9d4e957a7d9f434ba6cb0e7115ffb6627 [diff] |
Moved generic Timestamp/ClockManager classes to onos-api so they are usable by applications. Change-Id: Icf0e92d12434dec782332e91b632da8066a85b60
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java index 7de2d17..9412dac 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java +++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -36,8 +36,8 @@ import org.onosproject.net.intent.Key; import org.onosproject.net.intent.PartitionService; import org.onosproject.store.AbstractStore; -import org.onosproject.store.impl.MultiValuedTimestamp; -import org.onosproject.store.impl.WallClockTimestamp; +import org.onosproject.store.service.MultiValuedTimestamp; +import org.onosproject.store.service.WallClockTimestamp; import org.onosproject.store.serializers.KryoNamespaces; import org.onosproject.store.service.EventuallyConsistentMap; import org.onosproject.store.service.EventuallyConsistentMapEvent;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentClockManager.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentClockManager.java index 7dea4df..a0d7d2f 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentClockManager.java +++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentClockManager.java
@@ -22,7 +22,7 @@ import org.onosproject.net.intent.IntentClockService; import org.onosproject.net.intent.IntentId; import org.onosproject.store.Timestamp; -import org.onosproject.store.impl.WallClockTimestamp; +import org.onosproject.store.service.WallClockTimestamp; import org.slf4j.Logger; import static org.slf4j.LoggerFactory.getLogger;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentDataClockManager.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentDataClockManager.java index 1c4ffbf..d828988 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentDataClockManager.java +++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentDataClockManager.java
@@ -18,7 +18,7 @@ import org.onosproject.net.intent.IntentData; import org.onosproject.store.Timestamp; import org.onosproject.store.service.ClockService; -import org.onosproject.store.impl.MultiValuedTimestamp; +import org.onosproject.store.service.MultiValuedTimestamp; /** * ClockService that uses IntentData versions as timestamps.
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentDataLogicalClockManager.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentDataLogicalClockManager.java index 9d21223..8d78138 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentDataLogicalClockManager.java +++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/IntentDataLogicalClockManager.java
@@ -18,7 +18,7 @@ import org.onosproject.net.intent.IntentData; import org.onosproject.store.Timestamp; import org.onosproject.store.service.ClockService; -import org.onosproject.store.impl.MultiValuedTimestamp; +import org.onosproject.store.service.MultiValuedTimestamp; import java.util.concurrent.atomic.AtomicLong;