[Bug 146919] Directory Server rebranding

1) Brandx -> Fedora
2) Pick up new internal component set (Admin SDK, Setup SDK, Admin Server)
3) Use JRE from the Admin Server package
4) Docs
  a) Componentize Docs
  b) Rebrand Docs
  c) Drop packaging Administration Guide in the external version

5 files changed, 24 insertions, 24 deletions

diff --git a/ldap/cm/newinstnt/consolinst.c b/ldap/cm/newinstnt/consolinst.c
index 1dc118a4..b81263ae 100644
--- a/ldap/cm/newinstnt/consolinst.c
+++ b/ldap/cm/newinstnt/consolinst.c
@@ -4,7 +4,7 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 //////////////////////////////////////////////////////////////////////////////
-// CONSOLINST.c - Brandx Directory Server Installation Plug-In 
+// CONSOLINST.c - Fedora Directory Server Installation Plug-In 
 //
 //
 #include <windows.h>
diff --git a/ldap/cm/newinstnt/dsinst.c b/ldap/cm/newinstnt/dsinst.c
index 5674604c..a771fd13 100644
--- a/ldap/cm/newinstnt/dsinst.c
+++ b/ldap/cm/newinstnt/dsinst.c
@@ -4,7 +4,7 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 ///////////////////////////////////////////////////////////////////////////////
-// dsinst.c - Brandx Directory Server Installation Plug-In 
+// dsinst.c - Fedora Directory Server Installation Plug-In 
 //
 #include <windows.h>
 #include <commctrl.h>
diff --git a/ldap/cm/newinstnt/dsinst.rc b/ldap/cm/newinstnt/dsinst.rc
index 83e433ed..fa1dc498 100644
--- a/ldap/cm/newinstnt/dsinst.rc
+++ b/ldap/cm/newinstnt/dsinst.rc
@@ -50,13 +50,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Brandx\0"
+            VALUE "CompanyName", "Fedora\0"
             VALUE "FileDescription", "Directory Server 7.1\0"
             VALUE "FileVersion", "1, 0, 0, 1\0"
             VALUE "InternalName", "Directory Server 7.1\0"
             VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc.  Portions copyright 1999, 2002 Netscape Communications Corporation.  All rights reserved.\0"
             VALUE "OriginalFilename", "\0"
-            VALUE "ProductName", "Brandx Server Products\0"
+            VALUE "ProductName", "Fedora Server Products\0"
             VALUE "ProductVersion", "7, 1, 0, 0\0"
         END
     END
@@ -127,7 +127,7 @@ BEGIN
     CONTROL         "Use existing configuration directory server",
                     IDC_RADIO_USE_EXISTING_SERVER,"Button",
                     BS_AUTORADIOBUTTON,97,57,165,10
-    LTEXT           "Brandx server information is stored in the Brandx configuration directory server, which you may have already set up.  If so, you should configure this server to be managed by the configuration server.",
+    LTEXT           "Fedora server information is stored in the Fedora configuration directory server, which you may have already set up.  If so, you should configure this server to be managed by the configuration server.",
                     IDC_STATIC_DESC,92,3,172,33
 END
 
@@ -158,7 +158,7 @@ END
 IDD_SUITESPOTID DIALOG DISCARDABLE  0, 0, 297, 163
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION 
-"Directory Server 7.0 Brandx configuration directory server administrator "
+"Directory Server 7.0 Fedora configuration directory server administrator "
 
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -174,7 +174,7 @@ BEGIN
                     ES_AUTOHSCROLL
     GROUPBOX        "Configuration Directory Server Administrator ",
                     IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,91
-    LTEXT           "The Brandx configuration directory administrator is the ID typically used to log in to the console.",
+    LTEXT           "The Fedora configuration directory administrator is the ID typically used to log in to the console.",
                     IDC_STATIC_MCA_DESC,88,10,196,18
 END
 
@@ -415,7 +415,7 @@ CAPTION "Directory Server 7.1 Administration Domain"
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "The Administration Domain is a part of the configuration directory server used to store information about Brandx software.",
+    LTEXT           "The Administration Domain is a part of the configuration directory server used to store information about Fedora software.",
                     IDC_STATIC_ADMIN_DOMAIN_DESC,90,8,203,16
     EDITTEXT        IDC_EDIT_ADMIN_DOMAIN,157,113,118,14,ES_AUTOHSCROLL
     LTEXT           "Administration Domain:",IDC_STATIC_ADMIN_DOMAIN,104,113,
@@ -457,7 +457,7 @@ END
 IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE  0, 0, 297, 163
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION 
-"Directory Server 7.0 Brandx configuration directory server administrator "
+"Directory Server 7.0 Fedora configuration directory server administrator "
 
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -470,7 +470,7 @@ BEGIN
                     ES_AUTOHSCROLL
     GROUPBOX        "Configuration Directory Server Administrator ",
                     IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,61
-    LTEXT           "The Brandx configuration directory administrator is the ID typically used to log in to the console.",
+    LTEXT           "The Fedora configuration directory administrator is the ID typically used to log in to the console.",
                     IDC_STATIC_MCA_DESC,88,10,196,18
 END
 
@@ -615,14 +615,14 @@ BEGIN
     ERR_INVALID_DN          "%s is not a valid DN."
     SUM_REINSTALL           "Files will be updated, no configuration changes."
     ERR_CANT_FIND_DS_REPL   "Could not connect to ldap://%s:%d/ for bind DN %s Please check your settings.  Otherwise, the remote server may be down at this time. You may need to manually start replication after installation. Would you like to continue using these settings?"
-    IDS_STARTING_SERVICE    "Starting Brandx Directory Server (%s)"
-    IDS_STOPPING_SERVICE    "Stopping Brandx Directory Server (%s)"
-    IDS_WAIT_SERVICE_START  "Waiting for Brandx Directory Server (%s) to start"
+    IDS_STARTING_SERVICE    "Starting Fedora Directory Server (%s)"
+    IDS_STOPPING_SERVICE    "Stopping Fedora Directory Server (%s)"
+    IDS_WAIT_SERVICE_START  "Waiting for Fedora Directory Server (%s) to start"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_WAIT_SERVICE_STOP   "Waiting for Brandx Directory Server (%s) to stop"
+    IDS_WAIT_SERVICE_STOP   "Waiting for Fedora Directory Server (%s) to stop"
     ERR_ADMIN_DOMAIN_DN     "A DN [%s] is not allowed here.  Please enter a valid string."
     ERR_CANT_FIND_ADMIN_DOMAIN 
                             "Could not find the Admin Domain %s in ldap://%s:%d/ for bind DN %s\nPlease check your settings.  You may need to install using Custom mode in order to specify the Admin domain.\nThe installation cannot proceed."
diff --git a/ldap/cm/newinstnt/setup.inf b/ldap/cm/newinstnt/setup.inf
index 389baab3..009ed898 100644
--- a/ldap/cm/newinstnt/setup.inf
+++ b/ldap/cm/newinstnt/setup.inf
@@ -13,9 +13,9 @@
 # does note exist the setup program will ignore the component
 
 [General]
-Name         =      Brandx Server Family
-Vendor       =      Brandx, Inc.
-Description  =      Brandx Server Family
+Name         =      Fedora Server Family
+Vendor       =      Fedora Project
+Description  =      Fedora Server Family
 Version      =      %%%SERVER_VERSION%%%
 Components   =      svrcore, base, admin, slapd, dssynch, msg, mcc
 
diff --git a/ldap/cm/newinstnt/slapd.inf b/ldap/cm/newinstnt/slapd.inf
index 24ed10fa..c60772ee 100644
--- a/ldap/cm/newinstnt/slapd.inf
+++ b/ldap/cm/newinstnt/slapd.inf
@@ -6,13 +6,13 @@
 # END COPYRIGHT BLOCK
 #
 [General]
-Name=Brandx Directory Suite
+Name=Fedora Directory Suite
 Components=slapd,slapd-client
 Checked=TRUE
-Description=Brandx Directory Server
+Description=Fedora Directory Server
 
 [slapd]
-Name=Brandx Directory Server
+Name=Fedora Directory Server
 InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
 NickName=slapd
 Version= %%%SERVER_VERSION%%%
@@ -20,8 +20,8 @@ Compatible= %%%SERVER_VERSION%%%
 BuildNumber= %%%SERVER_BUILD_NUM%%%
 Expires= %%%PUMPKIN_HOUR%%%
 Security= %%%SECURITY%%%
-Vendor=Brandx, Inc.
-Description=Brandx Directory Server
+Vendor=Fedora Project
+Description=Fedora Directory Server
 DefaultAcceptLanguage=en
 Dependencies=admin/4.5,nsperl561/1.10,perldap14/1.01
 Revision= 
@@ -48,8 +48,8 @@ NSPerlPostInstall=lib\nsPerl5.6.1\install.bat
 [slapd-client]
 NickName=slapd-client
 Dependencies=base-client/4.5
-Name=Brandx Directory Server
-Description=Brandx Directory Server
+Name=Fedora Directory Server
+Description=Fedora Directory Server
 Version= %%%SERVER_VERSION%%%
 Compatible= %%%SERVER_VERSION%%%
 BuildNumber= %%%SERVER_BUILD_NUM%%%