ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/Config2.inc
Revision: 1.42
Committed: Mon May 5 22:04:55 2003 UTC (21 years, 6 months ago) by tdb
Branch: MAIN
Changes since 1.41: +1 -2 lines
Log Message:
Tidy up of the client interface code - more commonly known as the
"right hand side of the server". Right since the start the filter
side of the server has been nice and tree like - every Filter sent
data to another Filter. At the top of the tree there was a "special"
Filter known as the RootFilter, which to the other Filters just
looked like a normal Filter. This was nice, and simple, and expandable.

The Client Interface on the other hand was messy. The root filter
had some hacky wrapper threads which pulled from a queue and pushed
to the relevant client interfaces (one for real time stuff, and the
other for databases). There was no simple room for expandability -
it was all hardwired to do just what was needed at the time.

This commit changes that. A Client Interface now connects to another
Client Interface, with a special one being found in the RootFilter
(yes, maybe that needs a name change now :-). So we can chain client
interfaces, and move other bits and bobs around in the server - for
example, alerting no longer needs to be connected to the Client
Interface, it can connect straight to the RootFilter (or, wherever
the config tells it ;).

Hopefully this sanitizes the underlying layout of the server a bit.

As a final note, I dropped the DBInterface. This used to insert
data in to a MySQL database. We've long since stopped using that,
and it's fallen behind and is way out of date. For now, it's gone
in to the attic.

File Contents

# Content
1 # Include Config for the server
2 # $Id: Config2.inc,v 1.41 2003/02/21 13:45:48 tdb Exp $
3
4 include $(SOURCEROOT)/Version.inc
5
6 # Name of our dist
7 DISTNAME = iscream_server
8
9 # Location of the i-scream CVS Repository Root
10 CVSROOT = :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream
11
12 # This will attempt to locate cvs, and return the path.
13 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`
14
15 # and the same for cvs2cl
16 CVS2CL = `if test -x /usr/bin/cvs2cl; then echo /usr/bin/cvs2cl; else if test -x /usr/local/bin/cvs2cl; then echo /usr/local/bin/cvs2cl; else echo cvs2cl; fi fi`
17 # and flags for cvs2cl
18 CVS2CLFLAGS = --stdout --no-wrap -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
19
20 # and the same for gpg
21 GPG = `if test -x /usr/bin/gpg; then echo /usr/bin/gpg; else if test -x /usr/local/bin/gpg; then echo /usr/local/bin/gpg; else echo gpg; fi fi`
22 # and flags for gpg
23 GPGFLAGS = -abs --default-key=0x135D6B0A
24
25 # Binary to run for javac and javadoc
26 JAVACBIN = javac
27 JAVADOCBIN = javadoc
28
29 # Location of the build directory
30 BUILDDIRNAME = build
31 BUILD = $(SOURCEROOT)/$(BUILDDIRNAME)
32 # Relative (to BUILD) location of the libraries
33 LIBDIR = $(BUILD)/lib
34 # Location of the main include
35 MKINC = $(SOURCEROOT)/Makefile.inc
36 # IDL directory
37 IDLDIR = $(SOURCEROOT)/idl
38 IDLFILE = $(IDLDIR)/iscream.idl
39
40 # Compiler Information
41 JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.11-bin.jar:$(LIBDIR)/pircbot.jar:$(LIBDIR)/iscream_util.jar
42 JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
43 # set JCFLAGS to these if you want to optimise and turn off debugging
44 #JCFLAGS = -g:none -O
45 JCFLAGS =
46
47 # Name of JAR file (will be created in BUILD)
48 PACKAGE = $(DISTNAME).jar
49 # Main-class to be added to the Manifest
50 MAINCLASS = uk.org.iscream.cms.server.componentmanager.ComponentManager
51 # Class-path to be added to the Manifest
52 CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.11-bin.jar lib/crimson.jar lib/pircbot.jar lib/iscream_util.jar
53
54 # CHECK Files (for dependencies)
55 IDLCHECK = $(SOURCEROOT)/idl/.doneidl
56 MCOMPILECHECK = $(SOURCEROOT)/$(COMPILECHECK)
57 SRCCHECK = $(SOURCEROOT)/.donesrc
58 JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc
59 MKDISTCHECK = $(BUILD)/.donemkdist
60 MKDISTBINCHECK = $(BUILD)/.donemkdistbin
61 MKDISTFILESCHECK = $(BUILD)/.donemkdistfiles
62 MKDISTFILESBINCHECK = $(BUILD)/.donemkdistfilesbin
63 COMPILECHECK = .donecompile
64 COPYCHECK = .donecopy
65
66 # Javadoc package list
67 PKGLIST = uk.org.iscream.cms.server.clientinterface\
68 uk.org.iscream.cms.server.componentmanager\
69 uk.org.iscream.cms.server.core\
70 uk.org.iscream.cms.server.core.loggers\
71 uk.org.iscream.cms.server.filter\
72 uk.org.iscream.cms.server.filter.plugins\
73 uk.org.iscream.cms.server.filtermanager\
74 uk.org.iscream.cms.server.rootfilter\
75 uk.org.iscream.cms.server.client\
76 uk.org.iscream.cms.server.client.monitors\
77 uk.org.iscream.cms.server.client.alerters
78
79 # Javadoc formatting
80 JDTITLE = "i-scream CMS server"
81 JDHEADER = "<img src='http://www.i-scream.org.uk/i-scream_small.gif' width='146' height='38'>"
82 JDBOTTOM = "<i>Copyright &\#169; 2000-2003 i-scream. All Rights Reserved.</i>"
83
84 # Javadoc Directories
85 DOCDIR = $(BUILD)/doc
86 DOCTMPDIR = $(BUILD)/.doctemp
87 APICACHE = $(SOURCEROOT)/.api-cache
88
89 # Javadoc API linking
90 JDJAPI = "http://java.sun.com/j2se/1.4.1/docs/api/"
91 JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
92 JDUAPI = "http://www.i-scream.org.uk/javadoc/util/"
93
94 # Javadoc API cache
95 JDJAPIC = $(APICACHE)/jdk
96 JDPBAPIC = $(APICACHE)/pircbot
97 JDUAPIC = $(APICACHE)/util
98
99 # ChangeLog file
100 CHANGELOG = $(BUILD)/ChangeLog
101
102 # Directory to put the source code in
103 SRCDIR = $(BUILD)/src
104 # Files to be included in the source code dist
105 SRCFILES = Config2.inc Makefile Makefile.inc README build.config \
106 build.xml configure db uk idl COPYING Version.inc \
107 $(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
108 $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
109 $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile \
110 $(BUILDDIRNAME)/$(JACPROP)
111
112 # License file
113 LICFILE = COPYING
114
115 # Jacorb properties file
116 JACPROP = jacorb.properties
117
118 # User configurable options - defaults
119 dest = $(BUILD)
120 prefix = /opt/$(DISTNAME)-$(VERSION)
121
122 # Install Prefix
123 INSTALLPREFIX = $(prefix)
124 DISTDEST = $(dest)
125
126 # Archive extensions
127 TAREXT = .tar
128 TARGZEXT = .tar.gz
129 ZIPEXT = .zip
130 SIGEXT = .asc
131
132 # Subdirectory the dist should be in
133 DISTDIR = $(DISTNAME)-$(VERSION)
134
135 # Name of various distfiles
136 TARFILE = $(DISTNAME)-$(VERSION)$(TAREXT)
137 TARGZFILE = $(DISTNAME)-$(VERSION)$(TARGZEXT)
138 TARGZFILESIG = $(TARGZFILE)$(SIGEXT)
139 ZIPFILE = $(DISTNAME)-$(VERSION)$(ZIPEXT)
140 ZIPFILESIG = $(ZIPFILE)$(SIGEXT)
141 BINTARFILE = $(DISTNAME)-bin-$(VERSION)$(TAREXT)
142 BINTARGZFILE = $(DISTNAME)-bin-$(VERSION)$(TARGZEXT)
143 BINTARGZFILESIG = $(BINTARGZFILE)$(SIGEXT)
144 BINZIPFILE = $(DISTNAME)-bin-$(VERSION)$(ZIPEXT)
145 BINZIPFILESIG = $(BINZIPFILE)$(SIGEXT)