From e8da96b418766147a0c5de3d4e6e6bf743d470b1 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Nov 2014 15:13:15 +0000
Subject: [PATCH] OPENDJ-1637 Upgrade: server fails to start after upgrade (ClassNotFoundException)

---
 opendj3-server-dev/src/messages/messages/tools.properties                  |    3 +++
 opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java |    4 ++++
 opendj3-server-dev/ivy.xml                                                 |    2 ++
 3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/opendj3-server-dev/ivy.xml b/opendj3-server-dev/ivy.xml
index 4957f7a..094adf2 100644
--- a/opendj3-server-dev/ivy.xml
+++ b/opendj3-server-dev/ivy.xml
@@ -61,6 +61,7 @@
     <dependency org="org.glassfish.grizzly" name="grizzly-http-servlet"     rev="&grizzly.version;">
       <exclude module="javax.servlet-api" />
     </dependency>
+    <dependency org="org.forgerock.opendj"  name="opendj-legacy"            rev="&opendj.sdk.version;" />
 
     <!-- Test libs -->
     <!--dependency org="org.testng"            name="testng"                   rev="6.8.1" /-->
@@ -83,6 +84,7 @@
     <dependency org="org.forgerock.opendj"  name="opendj-ldap-sdk"          rev="&opendj.sdk.version;" conf="default->master,sources"/>
     <dependency org="org.forgerock.opendj"  name="opendj-rest2ldap"         rev="&opendj.sdk.version;" conf="default->master,sources"/>
     <dependency org="org.forgerock.opendj"  name="opendj-rest2ldap-servlet" rev="&opendj.sdk.version;" conf="default->master,sources"/>
+    <dependency org="org.forgerock.opendj"  name="opendj-legacy"            rev="&opendj.sdk.version;" conf="default->master,sources"/>
     <dependency org="org.slf4j"             name="slf4j-api"                rev="&slf4j.version;"      conf="default->master,sources"/>
     <dependency org="org.slf4j"             name="slf4j-jdk14"              rev="&slf4j.version;"      conf="default->master,sources"/>
     -->
diff --git a/opendj3-server-dev/src/messages/messages/tools.properties b/opendj3-server-dev/src/messages/messages/tools.properties
index afa276a..8c9ce14 100644
--- a/opendj3-server-dev/src/messages/messages/tools.properties
+++ b/opendj3-server-dev/src/messages/messages/tools.properties
@@ -2595,3 +2595,6 @@
 INFO_UPGRADE_TASK_11237_2_SUMMARY_10032=Removing config for 'Workflows'
 INFO_UPGRADE_TASK_11237_3_SUMMARY_10033=Removing config for 'Workflow Elements'
 INFO_UPGRADE_TASK_11239_1_SUMMARY_10034=Removing config for 'Network Group Plugin'
+INFO_UPGRADE_TASK_11260_SUMMARY_10035=OpenDJ 3.0.0 changed the matching rule implementations. \
+ All indexes have to be rebuilt. This could take a long time to proceed. \
+ Do you want to launch this process automatically at the end of the upgrade?
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
index 8abae4c..52d7099 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -382,6 +382,10 @@
         deleteConfigEntry(INFO_UPGRADE_TASK_11239_1_SUMMARY.get(),
             "dn: cn=Network Group,cn=Plugins,cn=config"));
 
+    /** See OPENDJ-1637 */
+    register("3.0.0.11260",
+        rebuildAllIndexes(INFO_UPGRADE_TASK_11260_SUMMARY.get()));
+
     /*
      * All upgrades will refresh the server configuration schema and generate
      * a new upgrade folder.

--
Gitblit v1.10.0