[Fedora-directory-commits] adminserver/admserv/newinst/insadm admin.inf, 1.4, 1.5 admin.txt, 1.4, 1.5 config.c, 1.5, 1.6 insadm.c, 1.5, 1.6
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Fri Oct 28 22:44:20 UTC 2005
- Previous message (by thread): [Fedora-directory-commits] adminserver/admserv/newinst/common setup.inf, 1.5, 1.6
- Next message (by thread): [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/insadm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/newinst/insadm
Modified Files:
admin.inf admin.txt config.c insadm.c
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/insadm/admin.inf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin.inf 18 Aug 2005 19:06:21 -0000 1.4
+++ admin.inf 28 Oct 2005 22:44:12 -0000 1.5
@@ -34,7 +34,7 @@
Dependencies=base/%%%VERSION%%%
Version= %%%VERSION%%%
Revision=
-Compatible= 4.0
+Compatible= 1.0
Security=%%%SECURITY%%%
BuildNumber= %%%BUILD_NUM%%%
Registration=FALSE
@@ -65,7 +65,7 @@
Name=Management Console
Description=Used by system administrators to manage other server products.
Version=%%%VERSION%%%
-Compatible= 4.0
+Compatible= 1.0
BuildNumber=%%%BUILD_NUM%%%
IsMCC=TRUE
Checked=TRUE
Index: admin.txt
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/admin.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin.txt 9 Sep 2005 18:48:37 -0000 1.4
+++ admin.txt 28 Oct 2005 22:44:12 -0000 1.5
@@ -1,12 +1,13 @@
-Fedora SuiteSpot 7.1 Administration Server
-Copyright (c) 1996, 1997 by Netscape Communications Corporation
-All Rights Reserved
-
+Fedora Administration Server 1.0
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
Internal Release Only
---------------------
-This is a developer build of the Administration Server 7.1.
+Fedora Administration Server 1.0
For more information see the release notes at:
http://nightmare/admin-server/admin40/relnote ## obsolete (02/04/2005 at Red
Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.c 9 Sep 2005 18:48:37 -0000 1.5
+++ config.c 28 Oct 2005 22:44:12 -0000 1.6
@@ -20,6 +20,9 @@
* END COPYRIGHT BLOCK **/
//--------------------------------------------------------------------------//
// //
+// NOTE: This code is for Windows only. This file should be updated //
+// when Windows is supported, again. //
+// //
// Name: Administration Server Configuration //
// Platforms: WIN32 //
// ...................................................................... //
@@ -61,7 +64,6 @@
#include "../common/include/acidef.h"
#define DEFAULT_SYSUSER "root"
-#define DEFAULT_OLDROOT "/usr/ns-home"
#define DEFAULT_TASKCONF "admin-serv/ldif/tasks.ldif"
#define DEFAULT_GLOBALCONF "admin-serv/ldif/global.ldif"
@@ -82,8 +84,8 @@
#define ADM61_ID_SERVICE "admin61-serv" /* old */
#define ADM70_KEY_ROOT "Administration\\7.0" /* prev */
#define ADM70_ID_SERVICE "admin70-serv" /* prev */
-#define ADM71_KEY_ROOT "Administration\\7.1" /* current */
-#define ADM71_ID_SERVICE "admin71-serv" /* current */
+#define ADM10_KEY_ROOT "Administration\\1.0" /* current */
+#define ADM10_ID_SERVICE "admin10-serv" /* current */
/*
@@ -332,7 +334,7 @@
"nsInstalledLocation: %s\n"
"nsExpirationDate: %s\n"
"nsBuildSecurity: %s\n"
- "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct at admserv71.jar\n",
+ "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct at admserv10.jar\n",
cd.szVendor,
cd.szDescription,
cd.szName,
@@ -376,7 +378,7 @@
"nsAdminAccessAddresses: *\n"
"nsAdminOneACLDir: adminacl\n"
"nsDefaultAcceptLanguage: %s\n"
- "nsClassName: com.netscape.management.admserv.AdminServer at admserv71.jar@%s\n"
+ "nsClassName: com.netscape.management.admserv.AdminServer at admserv10.jar@%s\n"
"nsServerPort: %d\n"
"nsSuiteSpotUser: nobody\n"
"nsAdminUsers: admin-serv/config/admpw\n"
@@ -394,7 +396,7 @@
);
sprintf(szUpgrade,
- "nsClassName: com.netscape.management.admserv.AdminServer at admserv71.jar@%s\n"
+ "nsClassName: com.netscape.management.admserv.AdminServer at admserv10.jar@%s\n"
"nsServerPort: %d\n"
"nsSuiteSpotUser: nobody\n",
szTemp,
@@ -796,17 +798,17 @@
char szPath[MAX_PATH];
char szName[MAX_PATH];
- if (cd.nReplaceVersion == 71) /* The current version;
+ if (cd.nReplaceVersion == 10) /* The current version;
target of brandAdminServer */
{
LoadString(mi.m_hModule, IDS_START_ADMINSERVER, szName, sizeof(szName));
- strcat(szName, " 7.1"); /* current */
+ strcat(szName, " 1.0"); /* current */
strcpy(szPath, "\"");
strcpy(szPath, TARGETDIR);
strcat(szPath, "\\start-admin.cmd\"");
RemoveProgramFolderItem(PROGRAM_GROUP_NAME, szName);
- DeleteServer("admin71-serv"); /* current */
- DeleteServerRegistryKeys(ADM71_KEY_ROOT, ADM71_ID_SERVICE); /* current */
+ DeleteServer("admin10-serv"); /* current */
+ DeleteServerRegistryKeys(ADM10_KEY_ROOT, ADM10_ID_SERVICE); /* current */
}
else if (cd.nReplaceVersion == 1)
{
Index: insadm.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/insadm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- insadm.c 9 Sep 2005 18:48:37 -0000 1.5
+++ insadm.c 28 Oct 2005 22:44:12 -0000 1.6
@@ -20,6 +20,9 @@
* END COPYRIGHT BLOCK **/
//--------------------------------------------------------------------------//
// //
+// NOTE: This code is for Windows only. This file should be updated //
+// when Windows is supported, again. //
+// //
// Name: Administration Server Configuration //
// Platforms: WIN32 //
// Revision History: //
@@ -617,11 +620,11 @@
szVer = setupGetInfString("admin", SETUP_INF_VERSION, NULL, szFilePath);
if (szVer)
{
- if (strcmp(szVer, "7.1") == 0) /* The current version;
- target of brandAdminServer */
+ if (strcmp(szVer, "1.0") == 0) /* The current version;
+ target of brandAdmin */
{
- cd.nReplaceVersion = 71; /* current */
- sprintf(szService, "admin71-serv"); /* current */
+ cd.nReplaceVersion = 10; /* current */
+ sprintf(szService, "admin10-serv"); /* current */
}
else if (strcmp(szVer, "4.0") == 0)
{
@@ -962,10 +965,10 @@
else if (strcmp(f, "jss3.jar") == 0) {
return 1;
}
- else if (strstr(f, "mcc71") == f) {
+ else if (strstr(f, "mcc10") == f) {
return 1;
}
- else if (strstr(f, "nmclf71") == f) {
+ else if (strstr(f, "nmclf10") == f) {
return 1;
}
return 0;
@@ -1079,17 +1082,17 @@
FindClose(hFile);
}
- if (cd.nReplaceVersion == 71) /* The current version;
+ if (cd.nReplaceVersion == 10) /* The current version;
target of brandAdminServer */
{
LoadString(mi.m_hModule, IDS_README, szTemp, sizeof(szTemp));
- strcpy(szName, "Fedora Server Products 7.1"); /* current */
+ strcpy(szName, "Fedora Server Products 1.0"); /* current */
strcat(szName, " ");
strcat(szName, szTemp);
RemoveProgramFolderItem(PROGRAM_GROUP_NAME, szName);
LoadString(mi.m_hModule, IDS_START_ADMINSERVER, szName, sizeof(szName));
strcat(szName, " ");
- strcat(szName, "7.1"); /* current */
+ strcat(szName, "1.0"); /* current */
strcpy(szPath, "\"");
strcpy(szPath, TARGETDIR);
strcat(szPath, "\\start-admin.cmd\"");
@@ -1461,10 +1464,10 @@
szVer = setupGetInfString("admin-client", SETUP_INF_VERSION, NULL, szFile);
if (szVer)
{
- if (strcmp(szVer, "7.1") == 0) /* The current version;
+ if (strcmp(szVer, "1.0") == 0) /* The current version;
target of brandAdminServer */
{
- cd.nReplaceVersion = 71; /* current */
+ cd.nReplaceVersion = 10; /* current */
}
else if (strcmp(szVer, "4.0") == 0)
{
@@ -1507,21 +1510,21 @@
// Create the program manager group icons
//
- if (cd.nReplaceVersion == 71) /* The current version;
+ if (cd.nReplaceVersion == 10) /* The current version;
target of brandAdminServer */
{
- //delete 7.1 readme (current)
+ //delete 1.0 readme (current)
LoadString(mi.m_hModule, IDS_README, szTemp, sizeof(szTemp));
- strcpy(szName, "Fedora Server Products 7.1"); /* current */
+ strcpy(szName, "Fedora Server Products 1.0"); /* current */
strcat(szName, " ");
strcat(szName, szTemp);
RemoveProgramFolderItem(PROGRAM_GROUP_NAME, szName);
- //delete 7.1 console icon (current)
+ //delete 1.0 console icon (current)
strcpy(szPath, "\"");
strcat(szPath, TARGETDIR);
strcat(szPath, "\\startconsole.exe\"");
LoadString(mi.m_hModule, IDS_NETSCAPE_CONSOLE, szName, sizeof(szName));
- strcat(szName, "7.1"); /* current */
+ strcat(szName, "1.0"); /* current */
RemoveProgramFolderItem(PROGRAM_GROUP_NAME, szName);
if (IsProgramFolderEmpty(PROGRAM_GROUP_NAME))
{
- Previous message (by thread): [Fedora-directory-commits] adminserver/admserv/newinst/common setup.inf, 1.5, 1.6
- Next message (by thread): [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list