[Fedora-directory-commits] adminserver/admserv/schema/ldif 02globalpreferences.ldif.tmpl, 1.4, 1.5

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6253/admserv/schema/ldif

Modified Files:
	02globalpreferences.ldif.tmpl 
Log Message:
Resolves: # 251595
Summary: Admin Server: Branding / versioning mismatches



Index: 02globalpreferences.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/02globalpreferences.ldif.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 02globalpreferences.ldif.tmpl	22 Jun 2007 22:26:25 -0000	1.4
+++ 02globalpreferences.ldif.tmpl	10 Aug 2007 02:23:29 -0000	1.5
@@ -24,21 +24,21 @@
 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.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 @@
 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.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.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.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.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: 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 @@
 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 @@
 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 @@
 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