ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/Config2.inc
Revision 1.45 - (view) (annotate) - [select for diffs]
Thu Feb 10 17:35:59 2005 UTC (19 years, 10 months ago) by tdb
Branch: MAIN
CVS Tags: HEAD
Changes since 1.44: +2 -2 lines
Diff to previous 1.44 , to selected 1.5
Commit various fixes from skel (Daniel Piddock):

CMS Server:
 - DiskMonitor was overflowing due to using an int variable for the
   inode count. Upped to a long.
 - Updated URL to iscream cms javadoc

RRD graphing:
 - added uptime logging and graph creation
 - diskio - Cope with modern linux device paths
   (eg "ide/host0/bus0/target0/lun0/disc") by replacing / with hex
 - diskio - Cope with windows device paths (eg "0 C: D:") by
   replacing : and space with hex
 - disk - Cope with windows mount points (eg C:\) by
   replacing : and \ with hex
 - net - Cope with windows network "device names". Basically
   the whole network card as it appears in Device Manager,
   not "Local Area Connection"
 - Include total processes (for winhost)

Also modified the PHP code to catch up. Patch slightly modified from that
submitted, but only minor alterations.

Thanks skel!

Revision 1.44 - (view) (annotate) - [select for diffs]
Sun Aug 1 10:40:36 2004 UTC (20 years, 4 months ago) by tdb
Branch: MAIN
Changes since 1.43: +4 -4 lines
Diff to previous 1.43 , to selected 1.5
Catch a lot of old URL's and update them. Also remove a couple of old files
that aren't used.

Revision 1.43 - (view) (annotate) - [select for diffs]
Fri Aug 22 13:36:18 2003 UTC (21 years, 4 months ago) by tdb
Branch: MAIN
Changes since 1.42: +2 -2 lines
Diff to previous 1.42 , to selected 1.5
Update j2se links to 1.4.2.

Revision 1.42 - (view) (annotate) - [select for diffs]
Mon May 5 22:04:55 2003 UTC (21 years, 7 months ago) by tdb
Branch: MAIN
Changes since 1.41: +1 -2 lines
Diff to previous 1.41 , to selected 1.5
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.

Revision 1.41 - (view) (annotate) - [select for diffs]
Fri Feb 21 13:45:48 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.40: +5 -2 lines
Diff to previous 1.40 , to selected 1.5
Main change is making the use of jacorb.properties transparent to the end
user - something which should have been done with CorbaServices a long time
ago :-) Now a base jacorb.properties is included in the jar files, because
it's searched by the jacorb loading stuff. The only value outside of the
jar file is the naming service location, which can now be found in the
default.properties files.

The server and corbaservices assume that the naming services is running on
localhost on port 8052, which is ok for most normal things. If it's on a
different host the default.properties just needs fixing.

Also added a default.properties style thing to the corbaservices, and fixed
some bugs in the command line argument parsing.

Finally, fixed a bug with the make src target of all the Makefiles.

Revision 1.40 - (view) (annotate) - [select for diffs]
Sun Feb 16 20:35:59 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.39: +4 -1 lines
Diff to previous 1.39 , to selected 1.5
Added install target for util package.
Removed duplicates copies of the COPYING (GPL License) file.

Revision 1.39 - (view) (annotate) - [select for diffs]
Tue Feb 11 22:38:29 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.38: +3 -1 lines
Diff to previous 1.38 , to selected 1.5
Added linking of util package api's to javadocs.

Revision 1.38 - (view) (annotate) - [select for diffs]
Tue Feb 11 22:00:56 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.37: +3 -3 lines
Diff to previous 1.37 , to selected 1.5
Update javadoc building to link against the 1.4.1 jdk api's.

Revision 1.37 - (view) (annotate) - [select for diffs]
Thu Feb 6 12:05:31 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.36: +3 -2 lines
Diff to previous 1.36 , to selected 1.5
Another fixed install target :-)

Revision 1.36 - (view) (annotate) - [select for diffs]
Wed Feb 5 22:27:24 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.35: +1 -3 lines
Diff to previous 1.35 , to selected 1.5
Removed the util package from the server. The source for it still remains,
for now, until I decide how to dispose of it.

Revision 1.35 - (view) (annotate) - [select for diffs]
Wed Feb 5 22:17:56 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.34: +2 -2 lines
Diff to previous 1.34 , to selected 1.5
The --no-wrap option to cvs2cl seems to fix some of the problems with the
layout of the ChangeLog's. This was applied to the nightly e-mail script
months ago, so I don't know why I forgot to use it here.

Revision 1.34 - (view) (annotate) - [select for diffs]
Wed Feb 5 22:15:32 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.33: +3 -3 lines
Diff to previous 1.33 , to selected 1.5
Tidy up the install target. Seems I overlooked this when tidying the rest
of the Makefile. By default now installs under /opt.

Revision 1.33 - (view) (annotate) - [select for diffs]
Wed Feb 5 16:43:44 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.32: +3 -3 lines
Diff to previous 1.32 , to selected 1.5
Changed the server to use the external util package. Quite a minor change,
but does affect a lot of files.

Revision 1.32 - (view) (annotate) - [select for diffs]
Tue Feb 4 22:41:47 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.31: +2 -2 lines
Diff to previous 1.31 , to selected 1.5
Version.inc should be part of the source dist.

Revision 1.31 - (view) (annotate) - [select for diffs]
Sun Feb 2 19:25:21 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.30: +15 -2 lines
Diff to previous 1.30 , to selected 1.5
Added gpg signing of built archives.
Also changed binary archives to have "-bin" in their filename.
Fixed a problem with the copied source having the jar files duplicated.

Revision 1.30 - (view) (annotate) - [select for diffs]
Sat Feb 1 19:08:54 2003 UTC (21 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.29: +10 -12 lines
Diff to previous 1.29 , to selected 1.5
A continuation of my last commit on all this Makefile reworking. I think
I've managed to get the dependencies working quite well now. As long as
the builds are done from the top level Makefile it should all be fine. If
you try from, say, the build directory it might not notice things changing
in the source files.

Revision 1.29 - (view) (annotate) - [select for diffs]
Sun Jan 26 14:02:52 2003 UTC (21 years, 11 months ago) by tdb
Branch: MAIN
Changes since 1.28: +15 -5 lines
Diff to previous 1.28 , to selected 1.5
Finally made some changes to the Makefile setup to finish what I
started around 7 months ago :) The dependency stuff still isn't
quite right, but it's getting there.

Revision 1.28 - (view) (annotate) - [select for diffs]
Fri Jun 7 16:12:47 2002 UTC (22 years, 6 months ago) by tdb
Branch: MAIN
Changes since 1.27: +65 -43 lines
Diff to previous 1.27 , to selected 1.5
My first bash at a new-style Makefile setup. This one generates proper
distfiles in subdirectories with version numbers, etc. I'll port it to the
other parts of i-scream when I've tested it a bit more.
This will also lead the way for me to generate daily snapshots.

Revision 1.27 - (view) (annotate) - [select for diffs]
Mon Apr 15 17:26:17 2002 UTC (22 years, 8 months ago) by tdb
Branch: MAIN
Changes since 1.26: +2 -2 lines
Diff to previous 1.26 , to selected 1.5
Fix CVSROOT in all Makefiles. Now uses the anonymous pserver.

Revision 1.26 - (view) (annotate) - [select for diffs]
Sat Feb 9 17:04:33 2002 UTC (22 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.25: +7 -2 lines
Diff to previous 1.25 , to selected 1.5
Improved the javadoc generation in the Makefile setup. Now matches the ANT
javadoc output. Also added links to external javadoc (such as pircbot) to
make the pages more complete.

Revision 1.25 - (view) (annotate) - [select for diffs]
Thu Feb 7 17:15:18 2002 UTC (22 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.24: +3 -3 lines
Diff to previous 1.24 , to selected 1.5
Merged in changes from the SERVER_PIRCBOT branch. The IRC__Alerter now uses
pircbot (www.jibble.org/pircbot.php) for it's IRC connectivity. All the
features from the old version have been moved across to the new one, with a
few minor changes.

Revision 1.24.2.1 - (view) (annotate) - [select for diffs]
Mon Feb 4 00:14:13 2002 UTC (22 years, 10 months ago) by tdb
Branch: SERVER_PIRCBOT
Changes since 1.24: +3 -3 lines
Diff to previous 1.24 , to next main 1.45 , to selected 1.5
Integration of PircBot into i-scream as a replacement for the internal IRC
code that was put together in a hurry. PircBot makes the code much neater,
and ensures that the IRC interactivity is nicely seperated from the main
i-scream code.

PircBot is maintained by Paul, an i-scream developer also, at
http://www.jibble.org.

Changes so far are mostly to move the existing features to the new
structure provided by PircBot. It is still very much in development, and
is very messy :)

Revision 1.24 - (view) (annotate) - [select for diffs]
Sat Feb 2 19:40:38 2002 UTC (22 years, 10 months ago) by tdb
Branch: MAIN
Branch point for: SERVER_PIRCBOT
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 , to selected 1.5
Update the MySQL driver from 2.0.4 to 2.0.11.

Revision 1.23 - (view) (annotate) - [select for diffs]
Sun Nov 25 19:34:27 2001 UTC (23 years, 1 month ago) by tdb
Branch: MAIN
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 , to selected 1.5
Updated the CVSROOT setting in the Makefile build setup to point at the
anonymous cvs server at cvs.i-scream.org.uk.

Revision 1.22 - (view) (annotate) - [select for diffs]
Mon Jun 11 14:00:31 2001 UTC (23 years, 6 months ago) by tdb
Branch: MAIN
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 , to selected 1.5
The location in CVS has changed... all CMS source is now under the cms
module.

Revision 1.21 - (view) (annotate) - [select for diffs]
Tue May 29 17:02:24 2001 UTC (23 years, 7 months ago) by tdb
Branch: MAIN
Changes since 1.20: +15 -9 lines
Diff to previous 1.20 , to selected 1.5
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.

Revision 1.20 - (view) (annotate) - [select for diffs]
Mon Mar 26 21:45:28 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
CVS Tags: PROJECT_COMPLETION
Changes since 1.19: +4 -1 lines
Diff to previous 1.19 , to selected 1.5
Now have the i-scream logo on the javadoc pages.

Revision 1.19 - (view) (annotate) - [select for diffs]
Wed Mar 14 23:25:17 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.18: +9 -9 lines
Diff to previous 1.18 , to selected 1.5
The whole server package structure has been changed.
Old Package: uk.ac.ukc.iscream.*
New Package: uk.org.iscream.*

Revision 1.18 - (view) (annotate) - [select for diffs]
Wed Mar 14 22:15:10 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 , to selected 1.5
Updated the mySQL JDBC driver from 2.0.2 to 2.0.4.

Revision 1.17 - (view) (annotate) - [select for diffs]
Wed Mar 14 22:01:08 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.16: +8 -8 lines
Diff to previous 1.16 , to selected 1.5
Tidied up the configure script, and got round to make a subtle change to the
Makefile's so they are a bit more "standard".

Revision 1.16 - (view) (annotate) - [select for diffs]
Sat Mar 10 02:04:54 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 , to selected 1.5
Changed to get and use the new xml parsing libraries.

Revision 1.15 - (view) (annotate) - [select for diffs]
Sat Mar 10 00:49:35 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.14: +3 -3 lines
Diff to previous 1.14 , to selected 1.5
A new parsing library.

Revision 1.14 - (view) (annotate) - [select for diffs]
Sat Mar 3 00:34:51 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.13: +3 -2 lines
Diff to previous 1.13 , to selected 1.5
Added the client.alerters and client.monitors packages.

Revision 1.13 - (view) (annotate) - [select for diffs]
Thu Mar 1 17:17:06 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.12: +4 -1 lines
Diff to previous 1.12 , to selected 1.5
We now set the Java compiler flags.

Revision 1.12 - (view) (annotate) - [select for diffs]
Wed Feb 28 14:12:20 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.11: +4 -2 lines
Diff to previous 1.11 , to selected 1.5
Now takes extra measures to locate the cvs binary.

Revision 1.11 - (view) (annotate) - [select for diffs]
Wed Feb 28 11:46:42 2001 UTC (23 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.10: +2 -1 lines
Diff to previous 1.10 , to selected 1.5
Set the path of cvs explicitly.

Revision 1.10 - (view) (annotate) - [select for diffs]
Tue Feb 27 02:41:54 2001 UTC (23 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.9: +3 -3 lines
Diff to previous 1.9 , to selected 1.5
Changed naming to be more inline with other modules.

Revision 1.9 - (view) (annotate) - [select for diffs]
Sat Feb 3 01:00:45 2001 UTC (23 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.8: +3 -2 lines
Diff to previous 1.8 , to selected 1.5
Added the client package to the javadoc bit of the Makefile.

Revision 1.8 - (view) (annotate) - [select for diffs]
Sun Jan 28 23:54:57 2001 UTC (23 years, 10 months ago) by tdb
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 , to selected 1.5
Dependency checking for the DOCOPY method. Ensures that any files (eg. images)
are only copied once, not every time (unless they've changed of course!).

Revision 1.7 - (view) (annotate) - [select for diffs]
Mon Jan 22 21:18:34 2001 UTC (23 years, 11 months ago) by tdb
Branch: MAIN
Changes since 1.6: +3 -3 lines
Diff to previous 1.6 , to selected 1.5
The old driver appeared a bit dodgy. I've gone back to the version before the
current latest, and it seems to be acting ok. This should work on windows too,
and any other machine - the dependence to Raptor has been removed.

Revision 1.6 - (view) (annotate) - [select for diffs]
Mon Jan 22 18:31:34 2001 UTC (23 years, 11 months ago) by tdb
Branch: MAIN
Changes since 1.5: +3 -3 lines
Diff to previous 1.5
Added the mysql jar file to the relevant library lines.

Revision 1.5 - (view) (annotate) - [selected]
Tue Jan 16 01:33:33 2001 UTC (23 years, 11 months ago) by tdb
Branch: MAIN
Changes since 1.4: +4 -2 lines
Diff to previous 1.4
Added the name of the new util JAR file, and added the idl directory to
the classpath. Not entirely sure whether this is good, but I can't see
the harm in it at the present. Marked it clearly though, in case it does
happen to cause problems later on.

Revision 1.4 - (view) (annotate) - [select for diffs]
Tue Jan 2 04:06:03 2001 UTC (23 years, 11 months ago) by tdb
Branch: MAIN
Changes since 1.3: +12 -1 lines
Diff to previous 1.3 , to selected 1.5
Added bits for the "make javadoc" stuff.

Revision 1.3 - (view) (annotate) - [select for diffs]
Wed Dec 13 20:35:08 2000 UTC (24 years ago) by tdb
Branch: MAIN
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 , to selected 1.5
Fixed a bug that prevented it working on another machine. The paths to the libs
in the include file were absolute, not relative. Opps :)

Revision 1.2 - (view) (annotate) - [select for diffs]
Wed Dec 13 18:34:09 2000 UTC (24 years ago) by tdb
Branch: MAIN
Changes since 1.1: +61 -0 lines
Diff to previous 1.1 , to selected 1.5
MERGE: Merged the SERVER_PACKAGEBUILD branch back into the HEAD trunk.

Revision 1.1.2.9 - (view) (annotate) - [select for diffs]
Wed Dec 13 18:10:34 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1.2.8: +2 -2 lines
Diff to previous 1.1.2.8 , to branch point 1.1 , to next main 1.45 , to selected 1.5
Just a minor change to the cvsbuild temporary directory.

Revision 1.1.2.8 - (view) (annotate) - [select for diffs]
Wed Dec 13 17:59:21 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1.2.7: +21 -9 lines
Diff to previous 1.1.2.7 , to branch point 1.1 , to selected 1.5
Added the "make cvsbuild revision=<REVISION/TAG>" feature to the Makefile.

Revision 1.1.2.7 - (view) (annotate) - [select for diffs]
Wed Dec 13 17:30:44 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1.2.6: +4 -6 lines
Diff to previous 1.1.2.6 , to branch point 1.1 , to selected 1.5
A few changes made now that the configure script sets SERVERROOT.

Revision 1.1.2.6 - (view) (annotate) - [select for diffs]
Tue Dec 12 20:14:52 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1.2.5: +10 -2 lines
Diff to previous 1.1.2.5 , to branch point 1.1 , to selected 1.5
Added stuff for the install scripts.

Revision 1.1.2.5 - (view) (annotate) - [select for diffs]
Tue Dec 12 12:35:37 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1.2.4: +1 -7 lines
Diff to previous 1.1.2.4 , to branch point 1.1 , to selected 1.5
We don't need this here, it's moved to idl/Makefile.

Revision 1.1.2.4 - (view) (annotate) - [select for diffs]
Tue Dec 12 02:45:54 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1.2.3: +2 -1 lines
Diff to previous 1.1.2.3 , to branch point 1.1 , to selected 1.5
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.

Revision 1.1.2.3 - (view) (annotate) - [select for diffs]
Tue Dec 12 01:53:55 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1.2.2: +5 -1 lines
Diff to previous 1.1.2.2 , to branch point 1.1 , to selected 1.5
Attempted to improve the dependencies, and tidied up the code Makefiles a bit
better. Getting there... slowly.

Revision 1.1.2.2 - (view) (annotate) - [select for diffs]
Mon Dec 11 23:57:06 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1.2.1: +24 -4 lines
Diff to previous 1.1.2.1 , to branch point 1.1 , to selected 1.5
Just added some explanatory comments.

Revision 1.1.2.1 - (view) (annotate) - [select for diffs]
Mon Dec 11 23:42:52 2000 UTC (24 years ago) by tdb
Branch: SERVER_PACKAGEBUILD
Changes since 1.1: +24 -0 lines
Diff to previous 1.1 , to selected 1.5
Include files for the Makefiles. The Config.inc will need to be altered prior
to building any of the system, but this will be well documented. It is planned
to do away with this requirement if a workaround can be found.
The Makefile.inc contains code used by all the Makefile's.

Revision 1.1
Mon Dec 11 23:42:52 2000 UTC (24 years ago) by tdb
Branch: MAIN
Branch point for: SERVER_PACKAGEBUILD
FILE REMOVED
file Config.inc was initially added on branch SERVER_PACKAGEBUILD.

Convenience Links

Links to HEAD: (view) (annotate)

Compare Revisions

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.

  Diffs between and
  Type of Diff should be a