From f5e5afb2c4d8160293cb1812a57aa8d990f8cd3f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 28 Oct 2009 10:52:52 +0000
Subject: [PATCH] Simplify the name of the domain and use (when possible) only the base DN as ID for the domain.  This is helpful when using dsreplication.

---
 opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index baecd66..9c42752 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -98,7 +98,6 @@
       InstallerHelper.class.getName());
 
   private static final int MAX_ID_VALUE = Short.MAX_VALUE;
-  private static final String DOMAIN_BASE_NAME = "domain ";
 
   /**
    * Invokes the method ConfigureDS.configMain with the provided parameters.
@@ -841,7 +840,7 @@
   public static String getDomainName(String[] existingDomains, int newDomainId,
       String baseDN)
   {
-    String domainName = baseDN + " ("+DOMAIN_BASE_NAME+newDomainId+")";
+    String domainName = baseDN;
     boolean nameExists = true;
     int j = 0;
     while (nameExists)
@@ -853,7 +852,7 @@
       }
       if (found)
       {
-        domainName = DOMAIN_BASE_NAME+newDomainId+"-"+j;
+        domainName = baseDN+"-"+j;
       }
       else
       {

--
Gitblit v1.10.0