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.
Major change in the java package naming. This has been held off for some time now, but it really needed doing. The future packaging of all i-scream products will be; uk.org.iscream.<product>.<subpart>.* In the case of the central monitoring system server this will be; uk.org.iscream.cms.server.* The whole server has been changed to follow this structure, and tested to a smallish extent. Further changes in other parts of the CMS will follow.
The whole server package structure has been changed. Old Package: uk.ac.ukc.iscream.* New Package: uk.org.iscream.*
Added CIWrapper and removed the RootFilterThread.
MERGE: Merged the SERVER_PACKAGEBUILD branch back into the HEAD trunk.
RootFilterMain changed to RootFilter.
Done some more tidying on all the Makefiles. This should have solve the current dependency problem that seemed to be occuring with the java source files. The only dependency that's now not quite in place is the IDL stuff. This should be easily fixable.
Attempted to improve the dependencies, and tidied up the code Makefiles a bit better. Getting there... slowly.
All Makefiles in the made code now make use of includes. This has dramatically reduced the size and complexity of each file. Future improvements centre around checking of dependencies better.
Changed the Makefile to place compiled class files in a seperate directory further down the directory structure. Also supplied the following switches to the javac compiler. -g:none -O The first make sure no debugging information is supplied, and the second makes the compiler optimise the code.
Tried to standardise the format of the Makefiles.
Makefile for the rootfilter.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.