From f1d83efcb7972349a3b7fffa7b812fb15d538ddf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 02 Dec 2015 08:06:22 +0000
Subject: [PATCH] OPENDJ-2480 Upgrade fails while migrating JE backend
---
opendj-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java | 2 +
opendj-legacy/src/main/java/org/opends/server/api/package-info.java | 44 ++++++++++++++++++++++
opendj-legacy/src/main/java/org/opends/server/api/OrderingMatchingRule.java | 35 +++++++++++++++++
opendj-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRule.java | 3 +
opendj-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRule.java | 3 +
opendj-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java | 3 +
opendj-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java | 3 +
opendj-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRule.java | 3 +
opendj-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRule.java | 3 +
opendj-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java | 3 +
opendj-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRule.java | 3 +
11 files changed, 97 insertions(+), 8 deletions(-)
diff --git a/opendj-legacy/src/main/java/org/opends/server/api/OrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/api/OrderingMatchingRule.java
new file mode 100644
index 0000000..5f1a13a
--- /dev/null
+++ b/opendj-legacy/src/main/java/org/opends/server/api/OrderingMatchingRule.java
@@ -0,0 +1,35 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * Copyright 2015 ForgeRock AS
+ */
+package org.opends.server.api;
+
+/**
+ * Required by rebuild-index process when upgrading to OpenDJ3.
+ *
+ * @deprecated since OPENDJ-1591 Migrate matching rules
+ * @deprecated since OPENDJ-2337 Remove old JE local-db backend code and JE changelog
+ */
+@Deprecated
+public interface OrderingMatchingRule {
+}
diff --git a/opendj-legacy/src/main/java/org/opends/server/api/package-info.java b/opendj-legacy/src/main/java/org/opends/server/api/package-info.java
new file mode 100644
index 0000000..6608da6
--- /dev/null
+++ b/opendj-legacy/src/main/java/org/opends/server/api/package-info.java
@@ -0,0 +1,44 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2015 ForgeRock AS
+ */
+
+/**
+ * Contains a number of API declarations for use throughout the
+ * Directory Server. Whenever possible, these APIs should be declared
+ * using abstract classes rather than interfaces so that they can be
+ * altered in future versions without impacting backward
+ * compatibility.
+ * <BR><BR>
+ * Note that the mere existence of a class or interface in this
+ * package does not in itself imply that it is intended for use by
+ * third party code. Please refer to the official product
+ * documentation to indicate which APIs may be safely used by anyone
+ * other than the core Directory Server developers. Failure to heed
+ * this warning may result in code that could have unintended side
+ * effects or that does not work properly across different Directory
+ * Server versions.
+ */
+package org.opends.server.api;
+
diff --git a/opendj-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java b/opendj-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java
index 5cb4c19..db3f7d9 100644
--- a/opendj-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java
+++ b/opendj-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java
@@ -35,6 +35,8 @@
*/
@Deprecated
public class VLVKeyComparator extends DummyByteArrayComparator {
+ private static final long serialVersionUID = 1585167927344130604L;
+
@Override
public int compare(byte[] b1, byte[] b2) {
return 0;
diff --git a/opendj-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
index 7879040..fb9a908 100644
--- a/opendj-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
+++ b/opendj-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
@@ -25,6 +25,7 @@
package org.opends.server.replication.plugin;
import org.opends.legacy.DummyByteArrayComparator;
+import org.opends.server.api.OrderingMatchingRule;
/**
* Required by rebuild-index process when upgrading to OpenDJ3.
@@ -32,6 +33,6 @@
* @deprecated since OPENDJ-1591 Migrate matching rules
*/
@Deprecated
-public class HistoricalCsnOrderingMatchingRule extends DummyByteArrayComparator {
+public class HistoricalCsnOrderingMatchingRule extends DummyByteArrayComparator implements OrderingMatchingRule {
private static final long serialVersionUID = -3424403930225609943L;
}
diff --git a/opendj-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRule.java
index 298380a..9ed6ab5 100644
--- a/opendj-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRule.java
+++ b/opendj-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRule.java
@@ -25,6 +25,7 @@
package org.opends.server.schema;
import org.opends.legacy.DummyByteArrayComparator;
+import org.opends.server.api.OrderingMatchingRule;
/**
* Required by rebuild-index process when upgrading to OpenDJ3.
@@ -32,6 +33,6 @@
* @deprecated since OPENDJ-1591 Migrate matching rules
*/
@Deprecated
-public class CaseExactOrderingMatchingRule extends DummyByteArrayComparator {
+public class CaseExactOrderingMatchingRule extends DummyByteArrayComparator implements OrderingMatchingRule {
private static final long serialVersionUID = -5904188628828913709L;
}
diff --git a/opendj-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
index 03ab115..dea21fe 100644
--- a/opendj-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
+++ b/opendj-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
@@ -25,6 +25,7 @@
package org.opends.server.schema;
import org.opends.legacy.DummyByteArrayComparator;
+import org.opends.server.api.OrderingMatchingRule;
/**
* Required by rebuild-index process when upgrading to OpenDJ3.
@@ -32,6 +33,6 @@
* @deprecated since OPENDJ-1591 Migrate matching rules
*/
@Deprecated
-public class CaseIgnoreOrderingMatchingRule extends DummyByteArrayComparator {
+public class CaseIgnoreOrderingMatchingRule extends DummyByteArrayComparator implements OrderingMatchingRule {
private static final long serialVersionUID = -8992263058903266096L;
}
diff --git a/opendj-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index be43c98..cb76bf0 100644
--- a/opendj-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/opendj-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
@@ -25,6 +25,7 @@
package org.opends.server.schema;
import org.opends.legacy.DummyByteArrayComparator;
+import org.opends.server.api.OrderingMatchingRule;
/**
* Required by rebuild-index process when upgrading to OpenDJ3.
@@ -32,6 +33,6 @@
* @deprecated since OPENDJ-1591 Migrate matching rules
*/
@Deprecated
-public class GeneralizedTimeOrderingMatchingRule extends DummyByteArrayComparator {
+public class GeneralizedTimeOrderingMatchingRule extends DummyByteArrayComparator implements OrderingMatchingRule {
private static final long serialVersionUID = -6343622924726948145L;
}
diff --git a/opendj-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRule.java
index 204ac80..47d5e80 100644
--- a/opendj-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRule.java
+++ b/opendj-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRule.java
@@ -25,6 +25,7 @@
package org.opends.server.schema;
import org.opends.legacy.DummyByteArrayComparator;
+import org.opends.server.api.OrderingMatchingRule;
/**
* Required by rebuild-index process when upgrading to OpenDJ3.
@@ -32,6 +33,6 @@
* @deprecated since OPENDJ-1591 Migrate matching rules
*/
@Deprecated
-public class IntegerOrderingMatchingRule extends DummyByteArrayComparator {
+public class IntegerOrderingMatchingRule extends DummyByteArrayComparator implements OrderingMatchingRule {
private static final long serialVersionUID = 6654300545706161754L;
}
diff --git a/opendj-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index 664f05f..1ee408d 100644
--- a/opendj-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/opendj-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRule.java
@@ -25,6 +25,7 @@
package org.opends.server.schema;
import org.opends.legacy.DummyByteArrayComparator;
+import org.opends.server.api.OrderingMatchingRule;
/**
* Required by rebuild-index process when upgrading to OpenDJ3.
@@ -32,6 +33,6 @@
* @deprecated since OPENDJ-1591 Migrate matching rules
*/
@Deprecated
-public class NumericStringOrderingMatchingRule extends DummyByteArrayComparator {
+public class NumericStringOrderingMatchingRule extends DummyByteArrayComparator implements OrderingMatchingRule {
private static final long serialVersionUID = 388436004219363604L;
}
diff --git a/opendj-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRule.java
index 45d4d8b..5da8e2f 100644
--- a/opendj-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRule.java
+++ b/opendj-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRule.java
@@ -25,6 +25,7 @@
package org.opends.server.schema;
import org.opends.legacy.DummyByteArrayComparator;
+import org.opends.server.api.OrderingMatchingRule;
/**
* Required by rebuild-index process when upgrading to OpenDJ3.
@@ -32,6 +33,6 @@
* @deprecated since OPENDJ-1591 Migrate matching rules
*/
@Deprecated
-public class OctetStringOrderingMatchingRule extends DummyByteArrayComparator {
+public class OctetStringOrderingMatchingRule extends DummyByteArrayComparator implements OrderingMatchingRule {
private static final long serialVersionUID = 3832343819704649155L;
}
diff --git a/opendj-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRule.java b/opendj-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRule.java
index 88601b2..d45748b 100644
--- a/opendj-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRule.java
+++ b/opendj-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRule.java
@@ -25,6 +25,7 @@
package org.opends.server.schema;
import org.opends.legacy.DummyByteArrayComparator;
+import org.opends.server.api.OrderingMatchingRule;
/**
* Required by rebuild-index process when upgrading to OpenDJ3.
@@ -32,6 +33,6 @@
* @deprecated since OPENDJ-1591 Migrate matching rules
*/
@Deprecated
-public class UUIDOrderingMatchingRule extends DummyByteArrayComparator {
+public class UUIDOrderingMatchingRule extends DummyByteArrayComparator implements OrderingMatchingRule {
private static final long serialVersionUID = -3877941142853469687L;
}
--
Gitblit v1.10.0