From 0b2c16be673e4db76a05419deaf96b00123b9f3c Mon Sep 17 00:00:00 2001
From: "rick.parker" <rick.parker@r3cev.com>
Date: Tue, 24 May 2016 11:48:04 +0100
Subject: [PATCH] Changes to packages after refactor

---
 .../kotlin/com/r3corda/node/internal/testing}/TestClock.kt    | 4 ++--
 .../kotlin/com/r3corda/{core => node}/utilities/ClockUtils.kt | 2 +-
 .../kotlin/com/r3corda/{core => node}/utilities/FiberBox.kt   | 2 +-
 .../com/r3corda/{core => node}/utilities/ClockUtilsTest.kt    | 4 ++--
 .../com/r3corda/{core => node}/utilities/FiberBoxTest.kt      | 4 ++--
 src/main/kotlin/com/r3corda/demos/DemoClock.kt                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename node/src/{test/kotlin/com/r3corda/core/testutils => main/kotlin/com/r3corda/node/internal/testing}/TestClock.kt (91%)
 rename node/src/main/kotlin/com/r3corda/{core => node}/utilities/ClockUtils.kt (99%)
 rename node/src/main/kotlin/com/r3corda/{core => node}/utilities/FiberBox.kt (98%)
 rename node/src/test/kotlin/com/r3corda/{core => node}/utilities/ClockUtilsTest.kt (98%)
 rename node/src/test/kotlin/com/r3corda/{core => node}/utilities/FiberBoxTest.kt (98%)

diff --git a/node/src/test/kotlin/com/r3corda/core/testutils/TestClock.kt b/node/src/main/kotlin/com/r3corda/node/internal/testing/TestClock.kt
similarity index 91%
rename from node/src/test/kotlin/com/r3corda/core/testutils/TestClock.kt
rename to node/src/main/kotlin/com/r3corda/node/internal/testing/TestClock.kt
index d7f4e73cee..68fcdb04ff 100644
--- a/node/src/test/kotlin/com/r3corda/core/testutils/TestClock.kt
+++ b/node/src/main/kotlin/com/r3corda/node/internal/testing/TestClock.kt
@@ -1,6 +1,6 @@
-package com.r3corda.core.testutils
+package com.r3corda.node.internal.testing
 
-import com.r3corda.core.utilities.MutableClock
+import com.r3corda.node.utilities.MutableClock
 import java.time.Clock
 import java.time.Duration
 import java.time.Instant
diff --git a/node/src/main/kotlin/com/r3corda/core/utilities/ClockUtils.kt b/node/src/main/kotlin/com/r3corda/node/utilities/ClockUtils.kt
similarity index 99%
rename from node/src/main/kotlin/com/r3corda/core/utilities/ClockUtils.kt
rename to node/src/main/kotlin/com/r3corda/node/utilities/ClockUtils.kt
index d2e0d7769b..490aa062ec 100644
--- a/node/src/main/kotlin/com/r3corda/core/utilities/ClockUtils.kt
+++ b/node/src/main/kotlin/com/r3corda/node/utilities/ClockUtils.kt
@@ -1,4 +1,4 @@
-package com.r3corda.core.utilities
+package com.r3corda.node.utilities
 
 import co.paralleluniverse.fibers.Suspendable
 import co.paralleluniverse.strands.AbstractFuture
diff --git a/node/src/main/kotlin/com/r3corda/core/utilities/FiberBox.kt b/node/src/main/kotlin/com/r3corda/node/utilities/FiberBox.kt
similarity index 98%
rename from node/src/main/kotlin/com/r3corda/core/utilities/FiberBox.kt
rename to node/src/main/kotlin/com/r3corda/node/utilities/FiberBox.kt
index 4dd8ba19e2..0a9c5e75d7 100644
--- a/node/src/main/kotlin/com/r3corda/core/utilities/FiberBox.kt
+++ b/node/src/main/kotlin/com/r3corda/node/utilities/FiberBox.kt
@@ -1,4 +1,4 @@
-package com.r3corda.core.utilities
+package com.r3corda.node.utilities
 
 import co.paralleluniverse.fibers.Suspendable
 import co.paralleluniverse.strands.concurrent.ReentrantLock
diff --git a/node/src/test/kotlin/com/r3corda/core/utilities/ClockUtilsTest.kt b/node/src/test/kotlin/com/r3corda/node/utilities/ClockUtilsTest.kt
similarity index 98%
rename from node/src/test/kotlin/com/r3corda/core/utilities/ClockUtilsTest.kt
rename to node/src/test/kotlin/com/r3corda/node/utilities/ClockUtilsTest.kt
index 958e9a9017..faf7b1a7ee 100644
--- a/node/src/test/kotlin/com/r3corda/core/utilities/ClockUtilsTest.kt
+++ b/node/src/test/kotlin/com/r3corda/node/utilities/ClockUtilsTest.kt
@@ -1,11 +1,11 @@
-package com.r3corda.core.utilities
+package com.r3corda.node.utilities
 
 
 import co.paralleluniverse.fibers.FiberExecutorScheduler
 import co.paralleluniverse.fibers.Suspendable
 import co.paralleluniverse.strands.Strand
 import com.google.common.util.concurrent.SettableFuture
-import com.r3corda.core.testutils.TestClock
+import com.r3corda.node.internal.testing.TestClock
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
diff --git a/node/src/test/kotlin/com/r3corda/core/utilities/FiberBoxTest.kt b/node/src/test/kotlin/com/r3corda/node/utilities/FiberBoxTest.kt
similarity index 98%
rename from node/src/test/kotlin/com/r3corda/core/utilities/FiberBoxTest.kt
rename to node/src/test/kotlin/com/r3corda/node/utilities/FiberBoxTest.kt
index fa9a083e99..1702422398 100644
--- a/node/src/test/kotlin/com/r3corda/core/utilities/FiberBoxTest.kt
+++ b/node/src/test/kotlin/com/r3corda/node/utilities/FiberBoxTest.kt
@@ -1,11 +1,11 @@
-package com.r3corda.core.utilities
+package com.r3corda.node.utilities
 
 
 import co.paralleluniverse.fibers.FiberExecutorScheduler
 import co.paralleluniverse.fibers.Suspendable
 import co.paralleluniverse.strands.Strand
 import com.r3corda.core.RetryableException
-import com.r3corda.core.testutils.TestClock
+import com.r3corda.node.internal.testing.TestClock
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
diff --git a/src/main/kotlin/com/r3corda/demos/DemoClock.kt b/src/main/kotlin/com/r3corda/demos/DemoClock.kt
index 0c2cd78382..3021a4e7aa 100644
--- a/src/main/kotlin/com/r3corda/demos/DemoClock.kt
+++ b/src/main/kotlin/com/r3corda/demos/DemoClock.kt
@@ -1,6 +1,6 @@
 package com.r3corda.demos
 
-import com.r3corda.core.utilities.MutableClock
+import com.r3corda.node.utilities.MutableClock
 import java.time.*
 import javax.annotation.concurrent.ThreadSafe