commit a4b227d4d2eaf5ed51ad7300ef10a3a38caad8fc
author Simon Hunt <simon@onlab.us> Thu Nov 06 12:01:53 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Nov 06 12:01:53 2014 -0800
tree 45cc070141b9747d3d22c030177c7d057e8fcc58
parent 826101201264a83fa2258d3311d1b1b38e24c9d8
parent 929f77b021c049568975b302134d2cd5e1c1bfcb

Merge "Set boolean to true for live data."

core/api/src/main/java/org/onlab/onos/store/service/DatabaseAdminService.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/DatabaseAdminService.java b/core/api/src/main/java/org/onlab/onos/store/service/DatabaseAdminService.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/DatabaseAdminService.java
rename to core/api/src/main/java/org/onlab/onos/store/service/DatabaseAdminService.java

core/api/src/main/java/org/onlab/onos/store/service/DatabaseException.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/DatabaseException.java b/core/api/src/main/java/org/onlab/onos/store/service/DatabaseException.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/DatabaseException.java
rename to core/api/src/main/java/org/onlab/onos/store/service/DatabaseException.java

core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/DatabaseService.java b/core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/DatabaseService.java
rename to core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java

core/api/src/main/java/org/onlab/onos/store/service/NoSuchTableException.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/NoSuchTableException.java b/core/api/src/main/java/org/onlab/onos/store/service/NoSuchTableException.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/NoSuchTableException.java
rename to core/api/src/main/java/org/onlab/onos/store/service/NoSuchTableException.java

core/api/src/main/java/org/onlab/onos/store/service/OptimisticLockException.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/OptimisticLockException.java b/core/api/src/main/java/org/onlab/onos/store/service/OptimisticLockException.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/OptimisticLockException.java
rename to core/api/src/main/java/org/onlab/onos/store/service/OptimisticLockException.java

core/api/src/main/java/org/onlab/onos/store/service/OptionalResult.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/OptionalResult.java b/core/api/src/main/java/org/onlab/onos/store/service/OptionalResult.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/OptionalResult.java
rename to core/api/src/main/java/org/onlab/onos/store/service/OptionalResult.java

core/api/src/main/java/org/onlab/onos/store/service/PreconditionFailedException.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/PreconditionFailedException.java b/core/api/src/main/java/org/onlab/onos/store/service/PreconditionFailedException.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/PreconditionFailedException.java
rename to core/api/src/main/java/org/onlab/onos/store/service/PreconditionFailedException.java

core/api/src/main/java/org/onlab/onos/store/service/ReadRequest.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/ReadRequest.java b/core/api/src/main/java/org/onlab/onos/store/service/ReadRequest.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/ReadRequest.java
rename to core/api/src/main/java/org/onlab/onos/store/service/ReadRequest.java

core/api/src/main/java/org/onlab/onos/store/service/ReadResult.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/ReadResult.java b/core/api/src/main/java/org/onlab/onos/store/service/ReadResult.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/ReadResult.java
rename to core/api/src/main/java/org/onlab/onos/store/service/ReadResult.java

core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/VersionedValue.java b/core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/VersionedValue.java
rename to core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java

core/api/src/main/java/org/onlab/onos/store/service/WriteAborted.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/WriteAborted.java b/core/api/src/main/java/org/onlab/onos/store/service/WriteAborted.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/WriteAborted.java
rename to core/api/src/main/java/org/onlab/onos/store/service/WriteAborted.java

core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/WriteRequest.java b/core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/WriteRequest.java
rename to core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java

core/api/src/main/java/org/onlab/onos/store/service/WriteResult.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/WriteResult.java b/core/api/src/main/java/org/onlab/onos/store/service/WriteResult.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/WriteResult.java
rename to core/api/src/main/java/org/onlab/onos/store/service/WriteResult.java

core/api/src/main/java/org/onlab/onos/store/service/package-info.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/package-info.java b/core/api/src/main/java/org/onlab/onos/store/service/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/package-info.java
rename to core/api/src/main/java/org/onlab/onos/store/service/package-info.java

core/store/dist/src/test/java/org/onlab/onos/store/service/impl/MapDBLogTest.java

diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/service/impl/MapDBLogTest.java b/core/store/dist/src/test/java/org/onlab/onos/store/service/impl/MapDBLogTest.java
index 75beefd..4ad98798 100644
--- a/core/store/dist/src/test/java/org/onlab/onos/store/service/impl/MapDBLogTest.java
+++ b/core/store/dist/src/test/java/org/onlab/onos/store/service/impl/MapDBLogTest.java
@@ -45,6 +45,8 @@
     @After
     public void tearDown() throws Exception {
         Files.deleteIfExists(new File(DB_FILE_NAME).toPath());
+        Files.deleteIfExists(new File(DB_FILE_NAME + ".t").toPath());
+        Files.deleteIfExists(new File(DB_FILE_NAME + ".p").toPath());
     }
 
     @Test(expected = IllegalStateException.class)