[Fedora-directory-commits] adminserver/admserv/newinst/src admin.inf.in, 1.3, 1.4 adminserver.map.in, 1.7, 1.8 asmigrate.map.in, 1.2, 1.3 configdsroot.map.in, 1.6, 1.7 register_param.map.in, 1.8, 1.9

[Doctor Conrad]

Author: nhosoi

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

Modified Files:
    admin.inf.in adminserver.map.in asmigrate.map.in 
    configdsroot.map.in register_param.map.in 
Log Message:
Resolves: # 251595
Summary: Admin Server: Branding / versioning mismatches

Index: admin.inf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/admin.inf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admin.inf.in	21 Jun 2007 22:01:51 -0000	1.3
+++ admin.inf.in	10 Aug 2007 02:23:29 -0000	1.4
@@ -30,6 +30,7 @@
 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

Index: adminserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- adminserver.map.in	24 Jul 2007 20:10:16 -0000	1.7
+++ adminserver.map.in	10 Aug 2007 02:23:29 -0000	1.8
@@ -50,10 +50,12 @@
 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

Index: asmigrate.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/asmigrate.map.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- asmigrate.map.in	24 Jul 2007 20:10:16 -0000	1.2
+++ asmigrate.map.in	10 Aug 2007 02:23:29 -0000	1.3
@@ -47,10 +47,12 @@
 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

Index: configdsroot.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configdsroot.map.in	24 Jul 2007 20:10:16 -0000	1.6
+++ configdsroot.map.in	10 Aug 2007 02:23:29 -0000	1.7
@@ -45,7 +45,6 @@
 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_suffix =      Suffix
 dsid =           ServerIdentifier

+console_version =	ConsoleVersion
+
 ds_console_jar = "%normbrand%-ds-%ds_baseversion%.jar"

Index: register_param.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- register_param.map.in	24 Jul 2007 20:10:16 -0000	1.8
+++ register_param.map.in	10 Aug 2007 02:23:29 -0000	1.9
@@ -54,7 +54,7 @@
 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_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