--- projects/cms/source/server/Config2.inc	2000/12/12 20:14:52	1.1.2.6
+++ projects/cms/source/server/Config2.inc	2001/01/22 18:31:34	1.6
@@ -1,19 +1,18 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.1.2.6 2000/12/12 20:14:52 tdb Exp $
+# $Id: Config2.inc,v 1.6 2001/01/22 18:31:34 tdb Exp $
 
 ##
-## Only the first two need changing here, the rest are just information
-## for use throughout the build scripts
+## Only the first section needs changing here, the rest are just
+## information for use throughout the build scripts
 ##
 
 ## File and Path Locations
 
-# ****** These two will need to be set correctly ******
+# ****** These need to be set correctly ******
 # Location of the CVS Repository Root
 CVSROOT = /usr/local/proj/co600_10/cvs
-# Location of the checked out local copy (hope to automate this)
-SERVERROOT = /home/cut/tdb1/cvs/source/server
-# ****** These two will need to be set correctly ******
+CVSSERVERMODULE = source/server
+# ****** These need to be set correctly ******
 
 # Location of the build directory
 BUILD = $(SERVERROOT)/build
@@ -23,29 +22,53 @@ LIBDIR = $(BUILD)/lib
 MKINC = $(SERVERROOT)/Makefile.inc
 
 # Install Prefix
-prefix = /usr/local/proj/co600_10/iscream-server
+prefix = /usr/local/iscream-server
 INSTALL = $(prefix)
 
+# cvsbuild temporary directory name
+CVSBUILDTEMP = $(SERVERROOT)/cvsbuildtemp
+# cvsbuild default revision
+rev = HEAD
+REVISION = $(rev)
+
 ## Compiler Information
-JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/parser.jar
-JCCLASSPATH = $(JCLIBS):$(SERVERROOT):$(BUILD):.
+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:.
 
 ## Package information
 
-# Name of tar archive (will be gzipped afterwards)
-TARFILE = iscream.tar
-TARGZFILE = iscream.tar.gz
-ZIPFILE = iscream.zip
+# Name of archives
+ARCNAME = iscream
+TAREXT = .tar
+TARGZEXT = .tar.gz
+ZIPEXT = .zip
 
+TARFILE = $(ARCNAME)$(TAREXT)
+TARGZFILE = $(ARCNAME)$(TARGZEXT)
+ZIPFILE = $(ARCNAME)$(ZIPEXT)
+
 # Name of JAR file (will be created in BUILD)
 PACKAGE = iscream.jar
+UTILPACKAGE = iscream-util.jar
 # Main-class to be added to the Manifest
-MAINCLASS = uk.ac.ukc.iscream.core.Core
+MAINCLASS = uk.ac.ukc.iscream.componentmanager.ComponentManager
 # Class-path to be added to the Manifest
-CLPATH = $(LIBDIR)/idl.jar $(LIBDIR)/jacorb.jar $(LIBDIR)/jaxp.jar $(LIBDIR)/parser.jar
+CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/parser.jar lib/mysql.jar
 
 
 ## CHECK Files (for dependencies)
 IDLCHECK = $(SERVERROOT)/.doneidl
 BUILDCHECK = $(SERVERROOT)/.donebuild
 COMPILECHECK = .donecompile
+
+
+## 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
+
+DOCDIR = doc
+DOCTMPDIR = doctemp