[Fedora-directory-commits] adminserver Makefile.am, 1.35, 1.36 aclocal.m4, 1.34, 1.35 configure, 1.38, 1.39 missing, 1.24, 1.25 install-sh, 1.24, 1.25 Makefile.in, 1.41, 1.42 depcomp, 1.24, 1.25 config.sub, 1.24, 1.25 config.guess, 1.24, 1.25 compile, 1.23, 1.24

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27530/adminserver

Modified Files:
	Makefile.am aclocal.m4 configure missing install-sh 
	Makefile.in depcomp config.sub config.guess compile 
Log Message:
Resolves: bug 383301
Bug Description: Admin Server main html page refers to dsgw, org
Reviewed by: nhosoi (Thanks!)
Fix Description: Introduce a new directive - INCLUDEIFEXISTS.  This will include the html
file specified if it exists, or just skip it if not found.  When dsgw, org, etc. are
ready, we can just plug in the appropriate html file.
I added the html excerpts to the data directory so we can have them in case we want to use
them - just copy them to the html directory and reload the main admin server page.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile.am	14 Nov 2007 17:51:55 -0000	1.35
+++ Makefile.am	15 Nov 2007 17:02:02 -0000	1.36
@@ -162,7 +162,10 @@
 	admserv/schema/ldif/20asdata.ldif.tmpl \
 	admserv/schema/ldif/21astasks.ldif.tmpl \
 	admserv/schema/ldif/22ascommands.ldif.tmpl \
-	admserv/schema/ldif/asmigrate.ldif.tmpl
+	admserv/schema/ldif/asmigrate.ldif.tmpl \
+	admserv/html/admserv_phonebook.html \
+	admserv/html/admserv_orgchart.html \
+	admserv/html/admserv_dsgw.html
 
 inf_DATA = admserv/newinst/src/admin.inf \
 	admserv/newinst/src/setup.inf \










Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile.in	14 Nov 2007 17:51:55 -0000	1.41
+++ Makefile.in	15 Nov 2007 17:02:02 -0000	1.42
@@ -556,7 +556,10 @@
 	admserv/schema/ldif/20asdata.ldif.tmpl \
 	admserv/schema/ldif/21astasks.ldif.tmpl \
 	admserv/schema/ldif/22ascommands.ldif.tmpl \
-	admserv/schema/ldif/asmigrate.ldif.tmpl
+	admserv/schema/ldif/asmigrate.ldif.tmpl \
+	admserv/html/admserv_phonebook.html \
+	admserv/html/admserv_orgchart.html \
+	admserv/html/admserv_dsgw.html
 
 inf_DATA = admserv/newinst/src/admin.inf \
 	admserv/newinst/src/setup.inf \