From 0bbb2f7f7f74de8b6a43523c88ae7eb8ff8b5e54 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 11 Mar 2014 09:41:21 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support

---
 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
index db9ce28..b306349 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -76,7 +76,7 @@
 import org.opends.server.admin.std.server.RootDNUserCfg;
 import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
 import org.opends.server.admin.std.server.TaskBackendCfg;
-import org.opends.server.config.ConfigException;
+import org.forgerock.opendj.config.server.ConfigException;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.types.DN;
 import org.opends.server.types.OpenDsException;
@@ -142,7 +142,7 @@
       }
       catch (ConfigException ce)
       {
-        ex.add(ce);
+        ex.add(toConfigException(ce));
       }
       for (String connHandler : root.listConnectionHandlers())
       {
@@ -190,9 +190,9 @@
                     null, index.getIndexType(), index.getIndexEntryLimit()));
               }
             }
-            catch (OpenDsException oe)
+            catch (ConfigException ce)
             {
-              ex.add(oe);
+              ex.add(toConfigException(ce));
             }
             indexes.add(new IndexDescriptor("dn2id", null, null,
                 new TreeSet<IndexType>(), -1));
@@ -214,9 +214,9 @@
                     sortOrder, index.getMaxBlockSize()));
               }
             }
-            catch (OpenDsException oe)
+            catch (ConfigException ce)
             {
-              ex.add(oe);
+              ex.add(toConfigException(ce));
             }
           }
           else if (backend instanceof LDIFBackendCfg)
@@ -257,9 +257,9 @@
 
           bs.add(desc);
         }
-        catch (OpenDsException oe)
+        catch (ConfigException ce)
         {
-          ex.add(oe);
+          ex.add(toConfigException(ce));
         }
       }
 
@@ -269,9 +269,9 @@
         CryptoManagerCfg cryptoManager = root.getCryptoManager();
         isReplicationSecure = cryptoManager.isSSLEncryption();
       }
-      catch (OpenDsException oe)
+      catch (ConfigException ce)
       {
-        ex.add(oe);
+        ex.add(toConfigException(ce));
       }
 
 
@@ -282,7 +282,7 @@
         sync = (ReplicationSynchronizationProviderCfg)
         root.getSynchronizationProvider("Multimaster Synchronization");
       }
-      catch (OpenDsException oe)
+      catch (ConfigException ce)
       {
         // Ignore this one
       }
@@ -337,9 +337,9 @@
             }
           }
         }
-        catch (OpenDsException oe)
+        catch (ConfigException ce)
         {
-          ex.add(oe);
+          ex.add(toConfigException(ce));
         }
       }
 
@@ -358,9 +358,9 @@
           }
         }
       }
-      catch (OpenDsException oe)
+      catch (ConfigException ce)
       {
-        ex.add(oe);
+        ex.add(toConfigException(ce));
       }
     }
     catch (OpenDsException oe)
@@ -391,6 +391,12 @@
     backends = Collections.unmodifiableSet(bs);
   }
 
+
+  private org.opends.server.config.ConfigException toConfigException(ConfigException ce)
+  {
+    return new org.opends.server.config.ConfigException(ce.getMessageObject(), ce);
+  }
+
   private ConnectionHandlerDescriptor getConnectionHandler(
       ConnectionHandlerCfg connHandler, String name) throws OpenDsException
   {

--
Gitblit v1.10.0