[Fedora-directory-commits] adminserver/admserv/newinst/src admin.inf, 1.5, 1.6 ux-config.cc, 1.6, 1.7 ux-config.h, 1.5, 1.6 ux-dialog.cc, 1.8, 1.9 ux-update.cc, 1.12, 1.13

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/newinst/src

Modified Files:
	admin.inf ux-config.cc ux-config.h ux-dialog.cc ux-update.cc 
Log Message:
171942 – Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.



Index: admin.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/admin.inf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admin.inf	18 Aug 2005 19:06:43 -0000	1.5
+++ admin.inf	28 Oct 2005 22:44:18 -0000	1.6
@@ -30,7 +30,7 @@
 Version= %%%VERSION%%%
 NickName= admin
 BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
 Security= %%%SECURITY%%%
 Dependencies=base/%%%VERSION%%%
 Checked=True
@@ -49,7 +49,7 @@
 NickName= admin-client
 Version= %%%VERSION%%%
 BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
 Checked=True
 Security= %%%SECURITY%%%
 Mandatory=False


Index: ux-config.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-config.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ux-config.cc	18 Aug 2005 19:06:43 -0000	1.6
+++ ux-config.cc	28 Oct 2005 22:44:18 -0000	1.7
@@ -45,8 +45,6 @@
 #include "ux-dialog.h"
 
 extern const char *DEFAULT_SYSUSER = "root";
-extern const char *DEFAULT_OLDROOT = "/usr/ns-home";
-
 
 /*********************************************************************
 **


Index: ux-config.h
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ux-config.h	18 Aug 2005 19:06:43 -0000	1.5
+++ ux-config.h	28 Oct 2005 22:44:18 -0000	1.6
@@ -30,6 +30,12 @@
 **
 ** HISTORY:
 ** $Log$
+** Revision 1.6  2005/10/28 22:44:18  nhosoi
+** 171942 – Change Admin Server version to 1.0
+** 1) changing Admin Server version to 1.0 including ou in the Global preferences
+** 2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
+** 3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
+**
 ** Revision 1.5  2005/08/18 19:06:43  rmeggins
 ** Bug(s) fixed: 166273
 ** Bug Description: Admin Server: fix copyrights, licensing
@@ -94,7 +100,6 @@
 #include "dialog.h"
 #include "ux-util.h"
 extern const char *DEFAULT_SYSUSER;
-extern const char *DEFAULT_OLDROOT;
 
 class AdminPreInstall:public DialogManager
 {


Index: ux-dialog.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-dialog.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ux-dialog.cc	18 Aug 2005 19:06:43 -0000	1.8
+++ ux-dialog.cc	28 Oct 2005 22:44:18 -0000	1.9
@@ -300,7 +300,7 @@
 
 DialogInput askLdapInfo(
 "The Administration Server requires the use of an LDAP-based\n"
-"directory server such as the Red Hat Directory Server for \n"
+"directory server such as the Fedora Directory Server for \n"
 "resource administration.\n"
 "\n"
 "Enter the URL of an existing LDAP-based directory server\n"


Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ux-update.cc	26 Sep 2005 23:37:45 -0000	1.12
+++ ux-update.cc	28 Oct 2005 22:44:18 -0000	1.13
@@ -64,7 +64,6 @@
 #define EPOCH_32BIT_END_TIME  "20380118031417" /* <correct end time> minus 1 day */
 
 const char *DEFAULT_SYSUSER = "root";
-const char *DEFAULT_OLDROOT	= "/opt/rhserver";
 const char *DEFAULT_TASKCONF = "admin-serv/ldif/tasks.ldif";
 const char *DEFAULT_GLOBALCONF = "admin-serv/ldif/global.ldif";
 
@@ -793,7 +792,7 @@
    appEntry->addAttribute("installationTimeStamp", adminInfo->timeStamp());
    appEntry->addAttribute("nsExpirationDate", adminInfo->get(PKG_EXPIRY));
    appEntry->addAttribute("nsBuildSecurity", adminInfo->get(PKG_SECURITY));
-   appEntry->addAttribute("nsServerMigrationClassName", "com.netscape.management.admserv.AdminServerProduct at admserv71.jar");
+   appEntry->addAttribute("nsServerMigrationClassName", "com.netscape.management.admserv.AdminServerProduct at admserv10.jar");
 
    sieEntry->clear();
 
@@ -904,7 +903,7 @@
 
       configEntry->addAttribute ("nsDefaultAcceptLanguage", adminInfo->get(PKG_DEFAULT_LANGUAGE));
 
-      sprintf(tstr, "com.netscape.management.admserv.AdminServer at admserv71.jar@%s", sieDN.data());
+      sprintf(tstr, "com.netscape.management.admserv.AdminServer at admserv10.jar@%s", sieDN.data());
       configEntry->addAttribute ("nsClassname", tstr);
 
       // Set the appropriate ACI on for this branch
@@ -915,7 +914,7 @@
    else
    {
       const char *s;
-      sprintf(tstr, "com.netscape.management.admserv.AdminServer at admserv71.jar@%s", sieDN.data());
+      sprintf(tstr, "com.netscape.management.admserv.AdminServer at admserv10.jar@%s", sieDN.data());
       configEntry->setAttribute ("nsClassname", tstr);
       configEntry->setAttribute ("nsServerPort", dir);
       configEntry->setAttribute ("nsSuiteSpotUser", adminUser);