--- projects/cms/source/server/Config2.inc	2001/01/22 18:31:34	1.6
+++ projects/cms/source/server/Config2.inc	2001/03/26 21:45:28	1.20
@@ -1,5 +1,5 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.6 2001/01/22 18:31:34 tdb Exp $
+# $Id: Config2.inc,v 1.20 2001/03/26 21:45:28 tdb Exp $
 
 ##
 ## Only the first section needs changing here, the rest are just
@@ -14,32 +14,38 @@ CVSROOT = /usr/local/proj/co600_10/cvs
 CVSSERVERMODULE = source/server
 # ****** These need to be set correctly ******
 
+# This will attempt to locate cvs, and return the path.
+CVS = `if test -x /usr/bin/cvs; then echo /usr/bin/cvs; else if test -x /usr/local/bin/cvs; then echo /usr/local/bin/cvs; else echo cvs; fi fi`
+
 # Location of the build directory
-BUILD = $(SERVERROOT)/build
+BUILD = $(SOURCEROOT)/build
 # Relative (to BUILD) location of the libraries
 LIBDIR = $(BUILD)/lib
 # Location of the main include
-MKINC = $(SERVERROOT)/Makefile.inc
+MKINC = $(SOURCEROOT)/Makefile.inc
 
 # Install Prefix
 prefix = /usr/local/iscream-server
 INSTALL = $(prefix)
 
 # cvsbuild temporary directory name
-CVSBUILDTEMP = $(SERVERROOT)/cvsbuildtemp
+CVSBUILDTEMP = $(SOURCEROOT)/cvsbuildtemp
 # cvsbuild default revision
 rev = HEAD
 REVISION = $(rev)
 
 ## Compiler Information
-JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/parser.jar:$(LIBDIR)/mysql.jar
-##### Added $(SERVERROOT)/idl - this may not be a good thing, but it helps dependencies.
-JCCLASSPATH = $(JCLIBS):$(SERVERROOT):$(BUILD):$(SERVERROOT)/idl:.
+JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.4-bin.jar
+##### Added $(SOURCEROOT)/idl - this may not be a good thing, but it helps dependencies.
+JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
+# set JCFLAGS to these if you want to optimise and turn off debugging
+#JCFLAGS = -g:none -O
+JCFLAGS =
 
 ## Package information
 
 # Name of archives
-ARCNAME = iscream
+ARCNAME = iscream-server
 TAREXT = .tar
 TARGZEXT = .tar.gz
 ZIPEXT = .zip
@@ -49,26 +55,31 @@ TARGZFILE = $(ARCNAME)$(TARGZEXT)
 ZIPFILE = $(ARCNAME)$(ZIPEXT)
 
 # Name of JAR file (will be created in BUILD)
-PACKAGE = iscream.jar
+PACKAGE = iscream-server.jar
 UTILPACKAGE = iscream-util.jar
 # Main-class to be added to the Manifest
-MAINCLASS = uk.ac.ukc.iscream.componentmanager.ComponentManager
+MAINCLASS = uk.org.iscream.componentmanager.ComponentManager
 # Class-path to be added to the Manifest
-CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/parser.jar lib/mysql.jar
+CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.4-bin.jar lib/crimson.jar
 
 
 ## CHECK Files (for dependencies)
-IDLCHECK = $(SERVERROOT)/.doneidl
-BUILDCHECK = $(SERVERROOT)/.donebuild
+IDLCHECK = $(SOURCEROOT)/.doneidl
+BUILDCHECK = $(SOURCEROOT)/.donebuild
 COMPILECHECK = .donecompile
+COPYCHECK = .donecopy
 
-
 ## Javadoc package list
-PKGLIST = uk.ac.ukc.iscream.clientinterface uk.ac.ukc.iscream.componentmanager\
-	uk.ac.ukc.iscream.core uk.ac.ukc.iscream.core.loggers\
-	uk.ac.ukc.iscream.dbinterface uk.ac.ukc.iscream.filter\
-	uk.ac.ukc.iscream.filter.plugins uk.ac.ukc.iscream.filtermanager\
-	uk.ac.ukc.iscream.rootfilter uk.ac.ukc.iscream.util
+PKGLIST = uk.org.iscream.clientinterface uk.org.iscream.componentmanager\
+	uk.org.iscream.core uk.org.iscream.core.loggers\
+	uk.org.iscream.dbinterface uk.org.iscream.filter\
+	uk.org.iscream.filter.plugins uk.org.iscream.filtermanager\
+	uk.org.iscream.rootfilter uk.org.iscream.util\
+	uk.org.iscream.client uk.org.iscream.client.monitors\
+	uk.org.iscream.client.alerters
+## Javadoc formatting
+JDTITLE = "i-scream server"
+JDHEADER = "<img src='http://www.i-scream.org.uk/i-scream_small.gif' width='146' height='38'>"
 
 DOCDIR = doc
 DOCTMPDIR = doctemp