[Bug 146919] Directory Server rebranding

1) Brandx -> Fedora
2) Pick up new internal component set (Admin SDK, Setup SDK, Admin Server)
3) Use JRE from the Admin Server package
4) Docs
  a) Componentize Docs
  b) Rebrand Docs
  c) Drop packaging Administration Guide in the external version

18 files changed, 19 insertions, 19 deletions

diff --git a/ldap/servers/plugins/acl/libacl.def b/ldap/servers/plugins/acl/libacl.def
index b032de32..80670d25 100644
--- a/ldap/servers/plugins/acl/libacl.def
+++ b/ldap/servers/plugins/acl/libacl.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7.1 ACL Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 ACL Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/chainingdb/libcb.def b/ldap/servers/plugins/chainingdb/libcb.def
index 4af437c1..3aa834e8 100644
--- a/ldap/servers/plugins/chainingdb/libcb.def
+++ b/ldap/servers/plugins/chainingdb/libcb.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7 Chaining Database Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Chaining Database Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/collation/collation.def b/ldap/servers/plugins/collation/collation.def
index 76dc59e3..7ed5b806 100644
--- a/ldap/servers/plugins/collation/collation.def
+++ b/ldap/servers/plugins/collation/collation.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Brandx Directory Server 7 Collation Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Collation Plugin'
 EXPORTS
 	orderingRule_init	@2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/cos/cos.def b/ldap/servers/plugins/cos/cos.def
index 49214f90..fa6b1a8c 100644
--- a/ldap/servers/plugins/cos/cos.def
+++ b/ldap/servers/plugins/cos/cos.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Brandx Directory Server 7 Class Of Service Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Class Of Service Plugin'
 EXPORTS
 	cos_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/distrib/README b/ldap/servers/plugins/distrib/README
index 14a7a2ca..e95c17ad 100644
--- a/ldap/servers/plugins/distrib/README
+++ b/ldap/servers/plugins/distrib/README
@@ -10,7 +10,7 @@
                    ----------------------------
 
 This directory contains code for some sample server plug-ins intended for
-use with the Brandx Directory Server 7.  
+use with the Fedora Directory Server 7.  
 
     NOTE: Before you compile and run these examples, make sure 
     to change any server-specific data in the examples to  
diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def
index 2ee3c79e..7b8d0afb 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -3,7 +3,7 @@
 ; Copyright (C) 2005 Red Hat, Inc.
 ; All rights reserved.
 ; --- END COPYRIGHT BLOCK ---
-DESCRIPTION 	'Brandx Directory Server 7 distribution logic example'
+DESCRIPTION 	'Fedora Directory Server 7 distribution logic example'
 EXPORTS
 	alpha_distribution @1
 	hash_distribution @2
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 285d2f24..cedc5479 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -624,10 +624,10 @@ static int nssReinitializationRequired()
 	if ( err == LDAP_SUCCESS && entry!=NULL  && entry[0]!=NULL)
 	{
 		value = slapi_entry_attr_get_charptr(entry[0], "vendorVersion");
-		if (value == NULL || strncmp(value, "Netscape", strlen("Netscape")))		
+		if (value == NULL || strncmp(value, "Fedora", strlen("Fedora")))
 		{
 			slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
-				"nssReinitializationRequired: vendor is not Netscape \n");
+				"nssReinitializationRequired: vendor is not Fedora \n");
 			slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
 				"or version is earlier than 6.0\n", value);
 			nssReinitializationRequired = 1;
diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def
index 3127d931..40ce8e73 100644
--- a/ldap/servers/plugins/passthru/libpassthru.def
+++ b/ldap/servers/plugins/passthru/libpassthru.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7 Pass Through Authentication Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Pass Through Authentication Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/presence/presence.def b/ldap/servers/plugins/presence/presence.def
index f44814d7..f0c4199d 100644
--- a/ldap/servers/plugins/presence/presence.def
+++ b/ldap/servers/plugins/presence/presence.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Netscape Directory Server 6.2.1 Presence Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Presence Plugin'
 EXPORTS
 	presence_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
index 50c1466f..b2db24ef 100644
--- a/ldap/servers/plugins/pwdstorage/libpwdstorage.def
+++ b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION		'Brandx Directory Server 7 password storage scheme Plugin'
+DESCRIPTION		'Fedora Directory Server 7 password storage scheme Plugin'
 EXPORTS
 	sha_pwd_storage_scheme_init @2
 	ssha_pwd_storage_scheme_init @3
diff --git a/ldap/servers/plugins/referint/referint.def b/ldap/servers/plugins/referint/referint.def
index d99eb393..f28debf4 100644
--- a/ldap/servers/plugins/referint/referint.def
+++ b/ldap/servers/plugins/referint/referint.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Brandx Directory Server 7 Referint Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Referint Plugin'
 CODE            SHARED READ EXECUTE
 DATA            SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/replication/replication.def b/ldap/servers/plugins/replication/replication.def
index 09b280d2..4325b502 100644
--- a/ldap/servers/plugins/replication/replication.def
+++ b/ldap/servers/plugins/replication/replication.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7.1 Replication Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Replication Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/retrocl/retrocl.def b/ldap/servers/plugins/retrocl/retrocl.def
index 0e2502a9..c4db11f7 100644
--- a/ldap/servers/plugins/retrocl/retrocl.def
+++ b/ldap/servers/plugins/retrocl/retrocl.def
@@ -6,7 +6,7 @@
 ;
 ;
 
-DESCRIPTION     'Brandx Directory Server 7.1 Retro-Changelog Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Retro-Changelog Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/roles/roles.def b/ldap/servers/plugins/roles/roles.def
index 449e1e1c..6ad662ca 100644
--- a/ldap/servers/plugins/roles/roles.def
+++ b/ldap/servers/plugins/roles/roles.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Brandx Directory Server 7.1 Roles Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 Roles Plugin'
 EXPORTS
 	roles_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/statechange/statechange.def b/ldap/servers/plugins/statechange/statechange.def
index 8fc6aa77..2779f613 100644
--- a/ldap/servers/plugins/statechange/statechange.def
+++ b/ldap/servers/plugins/statechange/statechange.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Brandx Directory Server 7.1 State Change Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 State Change Plugin'
 EXPORTS
 	statechange_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/syntaxes/libsyntax.def b/ldap/servers/plugins/syntaxes/libsyntax.def
index 79c0ff1d..2c651f2d 100644
--- a/ldap/servers/plugins/syntaxes/libsyntax.def
+++ b/ldap/servers/plugins/syntaxes/libsyntax.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Brandx Directory Server 7 syntaxes Plugin'
+DESCRIPTION     'Fedora Directory Server 7 syntaxes Plugin'
 EXPORTS
 	cis_init				@2
 	ces_init				@3
diff --git a/ldap/servers/plugins/uiduniq/libuiduniq.def b/ldap/servers/plugins/uiduniq/libuiduniq.def
index 8c6fbe48..76dfecd9 100644
--- a/ldap/servers/plugins/uiduniq/libuiduniq.def
+++ b/ldap/servers/plugins/uiduniq/libuiduniq.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7 Unique Attribute Checking Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Unique Attribute Checking Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/views/views.def b/ldap/servers/plugins/views/views.def
index 2e688e26..f1db5b7f 100644
--- a/ldap/servers/plugins/views/views.def
+++ b/ldap/servers/plugins/views/views.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Brandx Directory Server 7.1 State Change Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 State Change Plugin'
 EXPORTS
 	views_init        @2
 	plugin_init_debug_level	@3