Change default branding to 389 - remove lite code

The vendor, brand, and capbrand are set in configure - we should use those
everywhere rather than have to run some sort of script over the code to
change vendor, brand, version, etc.  I've added VENDOR, BRAND, CAPBRAND
to the default defines passed to the compiler, and changed the code to use
these defines.  And instead of the unintuitively named PRODUCTTEXT macro,
we should use the already defined PRODUCT_VERSION.
This allowed me to get rid of some code.  The version was from a generated
file called dirver.h which we don't need anymore, and we don't need the perl
script dirver.pl which generated it.
The vendor string was coming from the dirlite header file.  So I also used this
as an excuse to get rid of all references to dirlite once and for all (yay!).
For the places in plain text files which are not substituted, I just used the
generic name Dirsrv or Directory Server instead of having an explicit brand
and/or version in there.

Reviewed by: nkinder (Thanks!)

10 files changed, 14 insertions, 15 deletions

diff --git a/ldap/servers/slapd/test-plugins/README b/ldap/servers/slapd/test-plugins/README
index 8edf5e60..ca64ac54 100644
--- a/ldap/servers/slapd/test-plugins/README
+++ b/ldap/servers/slapd/test-plugins/README
@@ -39,11 +39,10 @@
 
                    ----------------------------
                       Sample Server Plug-Ins
-                     for Directory Server 1
+                     for Directory Server
                    ----------------------------
 
-This directory contains code for some sample server plug-ins intended for
-use with the Fedora Directory Server 1.  
+This directory contains code for some sample server plug-ins.
 
     NOTE: Before you compile and run these examples, make sure 
     to change any server-specific data in the examples to  
@@ -178,7 +177,7 @@ Server plug-ins are built as libraries available to the server.
    $ autogen.sh   # make sure there is no errors / warnings
    $ mkdir testbuild
    $ cd testbuild
-   $ ../configure --with-fhs [ --prefix=/opt/fedora-ds ... ]
+   $ ../configure --with-fhs [ --prefix=/opt/dirsrv ... ]
    $ make install
 
 Plugging the Library Into the Server
diff --git a/ldap/servers/slapd/test-plugins/testbind.c b/ldap/servers/slapd/test-plugins/testbind.c
index c3922029..c9c49df9 100644
--- a/ldap/servers/slapd/test-plugins/testbind.c
+++ b/ldap/servers/slapd/test-plugins/testbind.c
@@ -74,7 +74,7 @@
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.4",
+Slapi_PluginDesc bindpdesc = { "test-bind", VENDOR, PACKAGE_VERSION,
 	"sample bind pre-operation plugin" };
 
 static Slapi_ComponentId *plugin_id = NULL;
diff --git a/ldap/servers/slapd/test-plugins/testdatainterop.c b/ldap/servers/slapd/test-plugins/testdatainterop.c
index 1915e6ed..cc0e2fe4 100644
--- a/ldap/servers/slapd/test-plugins/testdatainterop.c
+++ b/ldap/servers/slapd/test-plugins/testdatainterop.c
@@ -94,7 +94,7 @@
  nsslapd-pluginEnabled: on
  nsslapd-pluginId: nullsuffix-preop
  nsslapd-pluginVersion: 7.1
- nsslapd-pluginVendor: Fedora Project
+ nsslapd-pluginVendor: My Project
  nsslapd-pluginDescription: sample pre-operation null suffix plugin
 
  ******************************************/
@@ -118,7 +118,7 @@
 /*
  * Static variables.
  */
-static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.4",
+static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, VENDOR, PACKAGE_VERSION,
 	"sample pre-operation null suffix plugin" };
 
 static Slapi_ComponentId *plugin_id = NULL;
diff --git a/ldap/servers/slapd/test-plugins/testentry.c b/ldap/servers/slapd/test-plugins/testentry.c
index 4909246f..9c1f32a1 100644
--- a/ldap/servers/slapd/test-plugins/testentry.c
+++ b/ldap/servers/slapd/test-plugins/testentry.c
@@ -95,7 +95,7 @@ nsslapd-pluginId: test-entry
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.4",
+Slapi_PluginDesc entrypdesc = { "test-entry", VENDOR, PACKAGE_VERSION,
 	"sample entry modification plugin" };
 
 /* Entry store plug-in function */
diff --git a/ldap/servers/slapd/test-plugins/testextendedop.c b/ldap/servers/slapd/test-plugins/testextendedop.c
index 42fcbc54..2655d55a 100644
--- a/ldap/servers/slapd/test-plugins/testextendedop.c
+++ b/ldap/servers/slapd/test-plugins/testextendedop.c
@@ -88,7 +88,7 @@
 /* OID of the extended operation handled by this plug-in */
 #define MY_OID	"1.2.3.4"
 
-Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.4",
+Slapi_PluginDesc expdesc = { "test-extendedop", VENDOR, PACKAGE_vERSION,
 	"sample extended operation plugin" };
 
 
diff --git a/ldap/servers/slapd/test-plugins/testgetip.c b/ldap/servers/slapd/test-plugins/testgetip.c
index 5cb990c9..2a360b44 100644
--- a/ldap/servers/slapd/test-plugins/testgetip.c
+++ b/ldap/servers/slapd/test-plugins/testgetip.c
@@ -79,7 +79,7 @@
 #include "slapi-plugin.h"
 #include "nspr.h"
 
-Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.4",
+Slapi_PluginDesc getippdesc = { "test-getip", VENDOR, PACKAGE_VERSION,
 	"sample pre-operation plugin" };
 
 static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen );
diff --git a/ldap/servers/slapd/test-plugins/testplugin.def b/ldap/servers/slapd/test-plugins/testplugin.def
index f7909f1c..f7dfb775 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.def
+++ b/ldap/servers/slapd/test-plugins/testplugin.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION		'Fedora Directory Server 1 test plugin'
+DESCRIPTION		'Dirsrv 1 test plugin'
 EXPORTS
 	testentry_scramble				@2
 	testentry_unscramble				@3
diff --git a/ldap/servers/slapd/test-plugins/testpostop.c b/ldap/servers/slapd/test-plugins/testpostop.c
index 41720c55..d5291f3f 100644
--- a/ldap/servers/slapd/test-plugins/testpostop.c
+++ b/ldap/servers/slapd/test-plugins/testpostop.c
@@ -98,7 +98,7 @@ static char changelogfile[MAX_PATH+1];
 static char *changelogfile = "/tmp/changelog";
 #endif
 
-Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.4",
+Slapi_PluginDesc postoppdesc = { "test-postop", VENDOR, PACKAGE_VERSION,
 	"sample post-operation plugin" };
 
 static void write_changelog( int optype, char *dn, void *change, int flag );
diff --git a/ldap/servers/slapd/test-plugins/testpreop.c b/ldap/servers/slapd/test-plugins/testpreop.c
index da354b50..c44d741e 100644
--- a/ldap/servers/slapd/test-plugins/testpreop.c
+++ b/ldap/servers/slapd/test-plugins/testpreop.c
@@ -84,7 +84,7 @@
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.4",
+Slapi_PluginDesc preoppdesc = { "test-preop", VENDOR, PACKAGE_VERSION,
 	"sample pre-operation plugin" };
 
 /* Pre-operation plug-in function */
diff --git a/ldap/servers/slapd/test-plugins/testsaslbind.c b/ldap/servers/slapd/test-plugins/testsaslbind.c
index 2b43c358..e395950d 100644
--- a/ldap/servers/slapd/test-plugins/testsaslbind.c
+++ b/ldap/servers/slapd/test-plugins/testsaslbind.c
@@ -76,7 +76,7 @@ nsslapd-plugintype: preoperation
 nsslapd-pluginenabled: on
 nsslapd-pluginid: test-saslbind
 nsslapd-pluginversion: 5.0
-nsslapd-pluginvendor: Fedora Project
+nsslapd-pluginvendor: My Project
 nsslapd-plugindescription: sample SASL bind pre-operation plugin
 
 
@@ -85,7 +85,7 @@ nsslapd-plugindescription: sample SASL bind pre-operation plugin
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.4",
+Slapi_PluginDesc saslpdesc = { "test-saslbind", VENDOR, PACKAGE_VERSION,
 	"sample SASL bind pre-operation plugin" };