From a9f684014f3b4e2278d86ed8702619c8e1b009cf Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 20 May 2015 13:56:25 +0000
Subject: [PATCH] OPENDJ-1936 - move common changelog classes and tests out of JE implementation packages
---
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexer.java | 7 +--
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursorTest.java | 7 ++-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java | 4 --
opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java | 2
opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/MultiDomainDBCursor.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/CompositeDBCursorTest.java | 3 +
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/CompositeDBCursor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 4 ++
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java | 8 +++-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/DomainDBCursor.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicaCursor.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursor.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/SequentialDBCursor.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java | 4 +-
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FakeUpdateMsg.java | 6 +-
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ReplicaCursorTest.java | 5 +-
20 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index b09861c..2ee636e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -88,9 +88,9 @@
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
-import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
-import org.opends.server.replication.server.changelog.je.ECLMultiDomainDBCursor;
-import org.opends.server.replication.server.changelog.je.MultiDomainDBCursor;
+import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
+import org.opends.server.replication.server.changelog.file.ECLMultiDomainDBCursor;
+import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.Attributes;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
index 6e634be..67bebbc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
@@ -59,8 +59,8 @@
import org.opends.server.replication.server.changelog.api.ChangeNumberIndexRecord;
import org.opends.server.replication.server.changelog.api.ChangelogDB;
import org.opends.server.replication.server.changelog.api.ChangelogException;
+import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.file.FileChangelogDB;
-import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.je.JEChangelogDB;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
index 8f61a3d..7d6d9e8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
@@ -33,7 +33,7 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy;
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
-import org.opends.server.replication.server.changelog.je.MultiDomainDBCursor;
+import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.DN;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexer.java
similarity index 98%
rename from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexer.java
index 2cfb708..327b87e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexer.java
@@ -21,9 +21,9 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS
+ * Copyright 2013-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.util.Map.Entry;
import java.util.Set;
@@ -43,7 +43,6 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy.*;
@@ -302,7 +301,7 @@
* Restores in memory data needed to build the CNIndexDB. In particular,
* initializes the changes cursor to the medium consistency point.
*/
- private void initialize() throws ChangelogException, DirectoryException
+ private void initialize() throws ChangelogException
{
final ReplicationDomainDB domainDB = changelogDB.getReplicationDomainDB();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/CompositeDBCursor.java
similarity index 98%
rename from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/CompositeDBCursor.java
index 35e2869..15b5a7d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/CompositeDBCursor.java
@@ -23,7 +23,7 @@
*
* Copyright 2013-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.util.*;
import java.util.Map.Entry;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DomainDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/DomainDBCursor.java
similarity index 97%
rename from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DomainDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/DomainDBCursor.java
index 28acc78..a726598 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DomainDBCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/DomainDBCursor.java
@@ -20,9 +20,9 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.util.Iterator;
import java.util.Map.Entry;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java
similarity index 94%
rename from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java
index 9a9972d..8ec4558 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java
@@ -20,9 +20,9 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.types.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursor.java
similarity index 98%
rename from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursor.java
index a7fb077..19e1ab5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursor.java
@@ -22,7 +22,7 @@
*
* Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.util.ArrayList;
import java.util.List;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
index 2ad6c0d..37f0d08 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
@@ -64,10 +64,6 @@
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
-import org.opends.server.replication.server.changelog.je.ChangeNumberIndexer;
-import org.opends.server.replication.server.changelog.je.DomainDBCursor;
-import org.opends.server.replication.server.changelog.je.MultiDomainDBCursor;
-import org.opends.server.replication.server.changelog.je.ReplicaCursor;
import org.opends.server.types.DN;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/MultiDomainDBCursor.java
similarity index 97%
rename from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/MultiDomainDBCursor.java
index f15cf48..eec9266 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/MultiDomainDBCursor.java
@@ -20,9 +20,9 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.util.Iterator;
import java.util.Map.Entry;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicaCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicaCursor.java
similarity index 97%
rename from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicaCursor.java
index 351e252..8d2678a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicaCursor.java
@@ -20,9 +20,9 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.util.concurrent.atomic.AtomicReference;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index b2c4f6f..e20df42 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -62,6 +62,10 @@
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
+import org.opends.server.replication.server.changelog.file.ChangeNumberIndexer;
+import org.opends.server.replication.server.changelog.file.DomainDBCursor;
+import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
+import org.opends.server.replication.server.changelog.file.ReplicaCursor;
import org.opends.server.types.DN;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index 34e7d2c..eec5364 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -86,7 +86,7 @@
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
-import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
+import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
index 7c1e268..c8f59af 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
@@ -39,7 +39,7 @@
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.ReplicationMsg;
-import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
+import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.tools.LDAPSearch;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java
similarity index 98%
rename from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
rename to opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java
index 52b5a96..7a425d9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java
@@ -21,10 +21,10 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS
+ * Copyright 2013-2015 ForgeRock AS
* Portions Copyright 2014 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.lang.Thread.State;
import java.util.Arrays;
@@ -48,6 +48,10 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
+import org.opends.server.replication.server.changelog.file.ChangeNumberIndexer;
+import org.opends.server.replication.server.changelog.file.DomainDBCursor;
+import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
+import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.DN;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/CompositeDBCursorTest.java
similarity index 98%
rename from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
rename to opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/CompositeDBCursorTest.java
index 5c0afce..7f6586d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/CompositeDBCursorTest.java
@@ -23,7 +23,7 @@
*
* Copyright 2013-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import static org.forgerock.util.Pair.*;
import static org.testng.Assert.*;
@@ -33,6 +33,7 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
+import org.opends.server.replication.server.changelog.file.CompositeDBCursor;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursorTest.java
similarity index 93%
rename from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java
rename to opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursorTest.java
index d033f9a..e5894ec 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursorTest.java
@@ -20,9 +20,9 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.util.HashSet;
import java.util.Set;
@@ -35,6 +35,9 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
+import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
+import org.opends.server.replication.server.changelog.file.ECLMultiDomainDBCursor;
+import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.DN;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FakeUpdateMsg.java
similarity index 92%
rename from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java
rename to opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FakeUpdateMsg.java
index 9fa6d8d..06e4669 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FakeUpdateMsg.java
@@ -20,9 +20,9 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;
@@ -44,4 +44,4 @@
{
return "UpdateMsg(" + t + ")";
}
-}
\ No newline at end of file
+}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ReplicaCursorTest.java
similarity index 96%
rename from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java
rename to opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ReplicaCursorTest.java
index a276dba..e477cc6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ReplicaCursorTest.java
@@ -20,15 +20,16 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.ReplicaOfflineMsg;
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.DBCursor;
+import org.opends.server.replication.server.changelog.file.ReplicaCursor;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/SequentialDBCursor.java
similarity index 95%
rename from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
rename to opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/SequentialDBCursor.java
index e0da0d5..c1d7507 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/SequentialDBCursor.java
@@ -21,9 +21,9 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS
+ * Copyright 2013-2015 ForgeRock AS
*/
-package org.opends.server.replication.server.changelog.je;
+package org.opends.server.replication.server.changelog.file;
import java.util.ArrayList;
import java.util.Arrays;
@@ -91,4 +91,4 @@
+ " nextMessages=" + msgs + ")";
}
-}
\ No newline at end of file
+}
--
Gitblit v1.10.0