From e51937bc13a3fdd90197b0c713cf47577ad9086d Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Aug 10 2007 02:23:29 +0000 Subject: Resolves: # 251595 Summary: Admin Server: Branding / versioning mismatches --- diff --git a/admserv/cfgstuff/admserv.conf.in b/admserv/cfgstuff/admserv.conf.in index a25d982..78f7cf4 100644 --- a/admserv/cfgstuff/admserv.conf.in +++ b/admserv/cfgstuff/admserv.conf.in @@ -42,7 +42,7 @@ SetEnv ADMINUTIL_CONF_DIR @adminutilpath@ # directories AllowOverride None - Options None + Options FollowSymLinks Order allow,deny Allow from all diff --git a/admserv/newinst/src/admin.inf.in b/admserv/newinst/src/admin.inf.in index 174e0b5..b253252 100644 --- a/admserv/newinst/src/admin.inf.in +++ b/admserv/newinst/src/admin.inf.in @@ -30,6 +30,7 @@ NormBrand = @brand@ Vendor=@vendor@ Version= @PACKAGE_VERSION@ BaseVersion= @PACKAGE_BASE_VERSION@ +ConsoleVersion= 1.1 NickName= admin BuildNumber= @NQBUILD_NUM@ # the rest of these are obsolete, but left here for diff --git a/admserv/newinst/src/adminserver.map.in b/admserv/newinst/src/adminserver.map.in index 82c0da4..76bbcb6 100644 --- a/admserv/newinst/src/adminserver.map.in +++ b/admserv/newinst/src/adminserver.map.in @@ -50,10 +50,12 @@ admpw = "@configdir@/admpw" as_error = "@logdir@/error" as_access = "@logdir@/access" as_pid = "@pidfile@" -as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar" +as_console_jar = "%normbrand%-admin-%as_baseversion%.jar" as_help_path = "@helpdir@" as_user = SysUser as_version = Version as_baseversion = BaseVersion as_buildnum = BuildNumber as_sie = "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot" + +console_version = ConsoleVersion diff --git a/admserv/newinst/src/asmigrate.map.in b/admserv/newinst/src/asmigrate.map.in index 228e3ff..dfdc725 100644 --- a/admserv/newinst/src/asmigrate.map.in +++ b/admserv/newinst/src/asmigrate.map.in @@ -47,10 +47,12 @@ admpw = "@configdir@/admpw" as_error = "@logdir@/errors" as_access = "@logdir@/access" as_pid = "@pidfile@" -as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar" +as_console_jar = "%normbrand%-admin-%as_baseversion%.jar" as_help_path = "@helpdir@" as_user = SysUser as_version = Version as_baseversion = BaseVersion as_buildnum = BuildNumber as_sie = "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot" + +console_version = ConsoleVersion diff --git a/admserv/newinst/src/configdsroot.map.in b/admserv/newinst/src/configdsroot.map.in index ba89022..3a6b42f 100644 --- a/admserv/newinst/src/configdsroot.map.in +++ b/admserv/newinst/src/configdsroot.map.in @@ -45,7 +45,6 @@ as_passwd = ServerAdminPwd asid = `use Net::Domain qw(hostname); $returnvalue = hostname();` as_version = Version as_baseversion = BaseVersion - ds_version = Version ds_baseversion = BaseVersion ds_port = ServerPort @@ -53,4 +52,6 @@ ds_secure_port = SecureServerPort:"636" ds_suffix = Suffix dsid = ServerIdentifier +console_version = ConsoleVersion + ds_console_jar = "%normbrand%-ds-%ds_baseversion%.jar" diff --git a/admserv/newinst/src/register_param.map.in b/admserv/newinst/src/register_param.map.in index eaf6609..362ea91 100644 --- a/admserv/newinst/src/register_param.map.in +++ b/admserv/newinst/src/register_param.map.in @@ -54,7 +54,7 @@ admpw = "@configdir@/admpw" as_error = "@logdir@/error" as_access = "@logdir@/access" as_pid = "@pidfile@" -as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar" +as_console_jar = "%normbrand%-admin-%as_baseversion%.jar" as_help_path = "@helpdir@" as_user = SysUser as_version = Version @@ -62,6 +62,8 @@ as_baseversion = BaseVersion as_buildnum = BuildNumber as_sie = "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot" +console_version = ConsoleVersion + ds_version = Version ds_baseversion = BaseVersion dsid = ServerIdentifier diff --git a/admserv/schema/ldif/02globalpreferences.ldif.tmpl b/admserv/schema/ldif/02globalpreferences.ldif.tmpl index 48875b8..ea8ba7a 100644 --- a/admserv/schema/ldif/02globalpreferences.ldif.tmpl +++ b/admserv/schema/ldif/02globalpreferences.ldif.tmpl @@ -24,21 +24,21 @@ objectClass: extensibleObject ou: admin nsmerge: ADD_IF_EMPTY -dn: ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: organizationalunit objectClass: extensibleObject ou: %as_baseversion% nsmerge: ADD_IF_EMPTY -dn: cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: extensibleObject cn: ResourceEditorExtension nsmerge: ADD_IF_EMPTY -dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: nsroledefinition objectClass: top objectClass: extensibleObject @@ -50,7 +50,7 @@ nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@%ds_console nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@%ds_console_jar% nsmerge: {nsclassname}MULTI_MERGE -dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: cossuperdefinition objectClass: top objectClass: extensibleObject @@ -97,18 +97,18 @@ nsNickName: cert,cert,%brand% Certificate Server nsmerge: {nsadminenduserhtmlindex}MULTI_MERGE nsmerge: {nsnickname}MULTI_MERGE -dn: cn=PublicViews, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=PublicViews, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsAdminConsoleUser cn: PublicViews aci: (targetattr = "*")(version 3.0; acl "Allow Authenticated Users to Save Public Views"; allow (all) userdn = "ldap:///all";) -dn: cn=CustomView, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=CustomView, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef cn: CustomView -dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: inetorgPerson objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -122,7 +122,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorNTUser nsClassname: com.netscape.management.client.ug.ResEditorPosixUser nsmerge: {nsclassname}MULTI_MERGE -dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: organizationalPerson objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -134,7 +134,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorAccountPage nsClassname: com.netscape.management.client.ug.LanguagePage nsmerge: {nsclassname}MULTI_MERGE -dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: groupofuniquenames objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -147,7 +147,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorAccountPage nsClassname: com.netscape.management.client.ug.LanguagePage nsmerge: {nsclassname}MULTI_MERGE -dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: organizationalunit objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -158,12 +158,12 @@ nsClassname: com.netscape.management.client.ug.OUPage nsClassname: com.netscape.management.client.ug.LanguagePage nsmerge: {nsclassname}MULTI_MERGE -dn: cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=defaultObjectClassesContainer, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef cn: DefaultObjectClassesContainer -dn: cn=user, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=user, cn=defaultObjectClassesContainer, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -173,7 +173,7 @@ nsDefaultObjectClass: person nsDefaultObjectClass: organizationalPerson nsDefaultObjectClass: inetorgperson -dn: cn=group, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=group, cn=defaultObjectClassesContainer, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -181,7 +181,7 @@ cn: group nsDefaultObjectClass: top nsDefaultObjectClass: groupofuniquenames -dn: cn=ou, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=ou, cn=defaultObjectClassesContainer, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -189,14 +189,14 @@ cn: ou nsDefaultObjectClass: top nsDefaultObjectClass: organizationalunit -dn: cn=topologyplugin, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=topologyplugin, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: extensibleObject cn: topologyplugin nsmerge: ADD_IF_EMPTY -dn: cn=defaultplugin, cn=topologyplugin, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=defaultplugin, cn=topologyplugin, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nstopologyplugin objectClass: extensibleObject @@ -205,7 +205,7 @@ cn: defaultplugin nsClassname: com.netscape.management.client.topology.DefaultTopologyPlugin nsmerge: {nsclassname}MULTI_MERGE -dn: cn=UI,ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=UI,ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: UI objectClass: top objectClass: nsAdminConsoleUser