Menu
▾
▴
csms-cvs — Notification of CVS commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(157) |
Nov
(121) |
Dec
(19) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(34) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <rga...@us...> - 2002-11-06 22:11:37
|
Update of /cvsroot/csms/csms-core/src/documentation
In directory usw-pr-cvs1:/tmp/cvs-serv14398
Modified Files:
Release-Checklist.txt
Log Message:
Making default config file settings for CVS version of the application the relevant config files in CVS. This means that unless the user has edited these settings locally they will always be pointing at the latest config files.
Index: Release-Checklist.txt
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/Release-Checklist.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Release-Checklist.txt 4 Nov 2002 11:53:00 -0000 1.9
--- Release-Checklist.txt 6 Nov 2002 22:11:32 -0000 1.10
***************
*** 3,6 ****
--- 3,9 ----
- place feature freeze on CVS
+ - Make sure the default settings in org.fanfoot.prefs.PreferenceManager are *not* the CVS head ones
+ - initAutoScorerPrefs()
+
- Check for any errors in the unit test reports
- cent clean test
|
|
From: <rga...@us...> - 2002-11-06 22:11:21
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs/manual
In directory usw-pr-cvs1:/tmp/cvs-serv14127
Modified Files:
configuration.xml
Log Message:
Making default config file settings for CVS version of the application the relevant config files in CVS. This means that unless the user has edited these settings locally they will always be pointing at the latest config files.
Index: configuration.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/manual/configuration.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configuration.xml 6 Nov 2002 20:43:31 -0000 1.1
--- configuration.xml 6 Nov 2002 22:11:15 -0000 1.2
***************
*** 51,55 ****
<title>Configuring The Fantasy Sports Module</title>
! <p>The following preferneces will define where the configuration files
will be loaded from. You can change the default settings by selecting
the relevant option in the
--- 51,55 ----
<title>Configuring The Fantasy Sports Module</title>
! <p>The following preferences will define where the configuration files
will be loaded from. You can change the default settings by selecting
the relevant option in the
***************
*** 58,61 ****
--- 58,63 ----
menu.</p>
+ <note>If you are using the CVS version of the application the defaults are not those
+ listed here, but are the relevant files in CVS.</note>
<table>
<caption>Auto Scorer Preferences</caption>
|
|
From: <rga...@us...> - 2002-11-06 20:44:50
|
Update of /cvsroot/csms/csms-core In directory usw-pr-cvs1:/tmp/cvs-serv24338 Modified Files: .cvsignore Log Message: Added centipede cache directories to ignored file list Index: .cvsignore =================================================================== RCS file: /cvsroot/csms/csms-core/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 18 Oct 2002 14:32:12 -0000 1.2 --- .cvsignore 6 Nov 2002 20:44:47 -0000 1.3 *************** *** 3,4 **** --- 3,5 ---- dist .nbattrs + vfs_cache |
|
From: <rga...@us...> - 2002-11-06 20:44:03
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs
In directory usw-pr-cvs1:/tmp/cvs-serv23964
Modified Files:
shortTermPlans.xml
Log Message:
Move config instructions into the manual (from download and install section)
Index: shortTermPlans.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/shortTermPlans.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shortTermPlans.xml 5 Nov 2002 21:35:50 -0000 1.2
--- shortTermPlans.xml 6 Nov 2002 20:44:00 -0000 1.3
***************
*** 1,5 ****
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
! "./dtd/document-v11.dtd">
<document>
<header>
--- 1,4 ----
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
<document>
<header>
|
|
From: <rga...@us...> - 2002-11-06 20:43:50
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs/downloadAndInstall
In directory usw-pr-cvs1:/tmp/cvs-serv23855
Modified Files:
book.xml
Log Message:
Move config instructions into the manual (from download and install section)
Index: book.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/downloadAndInstall/book.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** book.xml 28 Oct 2002 18:11:01 -0000 1.4
--- book.xml 6 Nov 2002 20:43:46 -0000 1.5
***************
*** 16,20 ****
<menu-item label="Introduction" href="../index.html"/>
<menu-item label="Download/Install" href="index.html"/>
- <menu-item label="Configuration" href="configuration.html"/>
<menu-item label="Manual" href="../manual/index.html"/>
</menu>
--- 16,19 ----
|
|
From: <rga...@us...> - 2002-11-06 20:43:36
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs/manual
In directory usw-pr-cvs1:/tmp/cvs-serv23688
Modified Files:
book.xml index.xml
Added Files:
configuration.xml
Log Message:
Move config instructions into the manual (from download and install section)
--- NEW FILE: configuration.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
"./dtd/document-v11.dtd">
<document>
<header>
<title>CSMS - Configuration</title>
<authors>
<person id="rdg" name="Ross D. Gardler" email="ro...@sa..." />
</authors>
</header>
<body>
<section>
<title>Introduction</title>
<p>Currently the Community Sports Management System consists of the very
beginnings of one of the sports modules. This module provides facilites
to manage a fantasy Football (that's Soccer to our American friends),
However, this module can easily be adapted to provide other Fantasy
Sports games by providing additional configuration files that define the
rules for the game.</p>
<p>These configuration files are, in the default installation, loaded
from the internet, however, you can configure the locations they are
loaded from in the configuraiton dialog of the GUI interface as
described below. Example configuration files (the same ones available on
the Internet are avilable in the
<code>src/resources/conf</code>
directory of the source distributions. If you wish to fix any bugs found
in the online config files, please configure your application to use
these local files, edit them and supply patches to us via the
<link
href="http://sourceforge.net/tracker/?atid=509510&group_id=65029&func=browse">
patch tracking system</link>
. In fact, changing the settings to the local versions of the files will
make the system run faster since it will not have to download the files
from the Internet, however, you will not automatically benifit from
fixes in the files.</p>
<fixme author="rdg">Move all docs about the config files to here from
the wiki site. In the meantime, visitors can view the docs on
<link href="http://www.fanfoot.com/wiki/Wiki.jsp?page=AutomatedScoring">
our Wkii</link>
</fixme>
</section>
<section>
<title>Configuring The Fantasy Sports Module</title>
<p>The following preferneces will define where the configuration files
will be loaded from. You can change the default settings by selecting
the relevant option in the
<code>Configuration</code>
menu.</p>
<table>
<caption>Auto Scorer Preferences</caption>
<tr>
<th>Preference Name</th>
<th>Description</th>
<th>Default</th>
</tr>
<tr>
<th colspan="3">Configuration Files</th>
</tr>
<tr>
<td>EventConfigurationFile</td>
<td>The URL from which the Event configuration file should be
loaded. This file defines a set of regular expression patterns that
are used to extract events from an information source concerning a
real sports game. This file is used to generate Events.xml a file
that describes all the events in a real game that may result in a
scoring opportunity in the fantasy game.</td>
<td>http://www.fanfoot.com/test/footballEvents.xml</td>
</tr>
<tr>
<td>ScoringConfigurationFile</td>
<td>The URL from which to load the Scoring Configuration file will
be loaded. This file defines how events in real games are converted
nto scores in the fantasy game. It is an XSL file that processes the
Events.xml file. When Events.xml is processed with this stylesheet
it should produce Scores.xml, a file representing all the scoring
events in a game.</td>
<td>http://www.fanfoot.com/test/ScoringConfig.xsl</td>
</tr>
<tr>
<td>Scores2HTMLStylsheet</td>
<td>The URL from which to download an XSL file used to convert the
Scores.xml file to an HTML file for display in the application.</td>
<td>http://www.fanfoot.com/test/Scores2HTML.xsl</td>
</tr>
</table>
<table>
<caption>Control Centre Preferences</caption>
<tr>
<th>Preference Name</th>
<th>Description</th>
<th>Default</th>
</tr>
<tr>
<th colspan="3">Miscellaneous</th>
</tr>
<tr>
<td>debug</td>
<td>Defines whether the appliation runs in debug mode or not.</td>
<td>true</td>
</tr>
</table>
</section>
</body>
</document>
Index: book.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/manual/book.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** book.xml 28 Oct 2002 18:10:43 -0000 1.2
--- book.xml 6 Nov 2002 20:43:30 -0000 1.3
***************
*** 1,4 ****
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "dtd/book-cocoon-v10.dtd">
<book software="Community Sports Management System"
--- 1,4 ----
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "book-cocoon-v10.dtd">
<book software="Community Sports Management System"
***************
*** 16,20 ****
<menu-item label="Introduction" href="../index.html"/>
<menu-item label="Download/Install" href="../downloadAndInstall/index.html"/>
! <menu-item label="Manual" href="index.html"/>
</menu>
--- 16,23 ----
<menu-item label="Introduction" href="../index.html"/>
<menu-item label="Download/Install" href="../downloadAndInstall/index.html"/>
! <menu label="Manual">
! <menu-item label="Contents" href="index.html"/>
! <menu-item label="Configuration" href="configuration.html"/>
! </menu>
</menu>
Index: index.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/manual/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.xml 28 Oct 2002 17:16:16 -0000 1.1
--- index.xml 6 Nov 2002 20:43:31 -0000 1.2
***************
*** 1,5 ****
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
! "./dtd/document-v11.dtd">
<document>
<header>
--- 1,4 ----
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
<document>
<header>
***************
*** 13,24 ****
<body>
<section>
! <title>Community Sports Management System - Manual</title>
! <p>Documentation has not yet been moved over from our Wiki site, you can
view what there is
<link href="http://www.fanfoot.com/wiki/Wiki.jsp?page=AutomatedScoring">
! over there</link>
!
! .</p>
</section>
</body>
--- 12,25 ----
<body>
<section>
! <title>Community Sports Management System - Manual Contents</title>
! <note>Documentation has not yet been moved over from our Wiki site, you can
view what there is
<link href="http://www.fanfoot.com/wiki/Wiki.jsp?page=AutomatedScoring">
! over there</link>.</note>
!
! <ol>
! <li><link href="configuration.html">Configuration</link> - How to configure the application</li>
! </ol>
</section>
</body>
|
|
From: <rga...@us...> - 2002-11-06 20:11:49
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/gui
In directory usw-pr-cvs1:/tmp/cvs-serv5719
Modified Files:
ControlCentre.java
Log Message:
Improved error reporting
Index: ControlCentre.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/java/org/fanfoot/gui/ControlCentre.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ControlCentre.java 6 Nov 2002 14:20:16 -0000 1.12
--- ControlCentre.java 6 Nov 2002 20:11:46 -0000 1.13
***************
*** 72,125 ****
/**
! *@author rgardler
! *@created 21 October 2002
*/
public class ControlCentre extends JFrame implements EventParserListener {
! /**
! * the default site from which to retireve commentaries
! */
[...1243 lines suppressed...]
}
--- 703,720 ----
* Loaded Commentay file.
*
! *@param e Description of the Parameter
*/
! public void retrievedCommentary( EventObject e ) {
}
/**
! *@param args the command line arguments
*/
! public static void main( String args[] ) {
try {
new ControlCentre().show();
! } catch ( Exception e ) {
! System.out.println( "Unable to load configuration file." );
e.printStackTrace();
}
|
|
From: <rga...@us...> - 2002-11-06 14:20:34
|
Update of /cvsroot/csms/csms-core
In directory usw-pr-cvs1:/tmp/cvs-serv16830
Modified Files:
status.xml
Log Message:
Now reports errors in creating the event parser to the user through the GUI as well as through the log.
Index: status.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/status.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** status.xml 4 Nov 2002 12:16:08 -0000 1.10
--- status.xml 6 Nov 2002 14:20:32 -0000 1.11
***************
*** 29,32 ****
--- 29,35 ----
is the Auot Scoring facilites found inthe previous
release.</description>
+
+ <action dev="rdg" type="update">System now reports errors in creating the
+ event parser to the user through the GUI as well as through the log.</action>
<action dev="rdg" type="update">Fixed bug that prevented a change
|
|
From: <rga...@us...> - 2002-11-06 14:20:19
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/gui
In directory usw-pr-cvs1:/tmp/cvs-serv16641
Modified Files:
ControlCentre.java
Log Message:
Now reports errors in creating the event parser to the user through the GUI as well as through the log.
Index: ControlCentre.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/java/org/fanfoot/gui/ControlCentre.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ControlCentre.java 4 Nov 2002 12:16:25 -0000 1.11
--- ControlCentre.java 6 Nov 2002 14:20:16 -0000 1.12
***************
*** 48,51 ****
--- 48,52 ----
import java.util.logging.Level;
import java.util.logging.Logger;
+ import javax.swing.JEditorPane;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
***************
*** 71,114 ****
/**
[...1211 lines suppressed...]
}
--- 745,762 ----
* Loaded Commentay file.
*
! *@param e Description of the Parameter
*/
! public void retrievedCommentary(EventObject e) {
}
/**
! *@param args the command line arguments
*/
! public static void main(String args[]) {
try {
new ControlCentre().show();
! } catch (Exception e) {
! System.out.println("Unable to load configuration file.");
e.printStackTrace();
}
|
|
From: <rga...@us...> - 2002-11-05 21:35:53
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs
In directory usw-pr-cvs1:/tmp/cvs-serv4151
Modified Files:
shortTermPlans.xml
Log Message:
Added the error checking and confirmed/unconfirmed details discussed on the mailing list (I've gone for the terms official and unofficial though)
Index: shortTermPlans.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/shortTermPlans.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shortTermPlans.xml 4 Nov 2002 11:52:35 -0000 1.1
--- shortTermPlans.xml 5 Nov 2002 21:35:50 -0000 1.2
***************
*** 23,26 ****
--- 23,40 ----
<section>
+ <title>0.1 release</title>
+
+ <dl>
+ <dt>Additional Error Checking</dt>
+
+ <dd>An extra step will be inserted into the events generation process
+ in the Fantasy Sports Module, this will enable rules to be encoded to
+ verify the generated scores, for example, total goals scored by a team
+ should be equal to the number of goals identified in the result
+ event.</dd>
+ </dl>
+ </section>
+
+ <section>
<title>0.2.x release</title>
***************
*** 84,87 ****
--- 98,115 ----
<dl>
+ <dt>Allow unconfirmed/confirmed event status</dt>
+
+ <dd>Events should have a status flag that enables them to be marked as
+ official or unofficial. There also needs to be a flag to indicate when
+ an event has been queried by someone. Initially all events are
+ unofficial, however, they are used to calculate published (unofficial)
+ results. On a given day and time, all events that have not been
+ queried are converted to official. The queried flag is used to
+ indicate that someone thinks the event may be an error. The league
+ administrator is asked to verify these events before they become
+ confirmed. This is to allow scores to be gathered from "unnoficial"
+ sources which will sometimes be faster than the "official" sources
+ whilst still</dd>
+
<dt>Embed Jetty server</dt>
|
|
From: <rga...@us...> - 2002-11-04 22:49:37
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv30709
Modified Files:
ScoringConfig.xsl
Log Message:
We now use the team and player files in CVS head. Thare is no need to upload new files to the live server, just commit them to CVS and away you go.
Index: ScoringConfig.xsl
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/ScoringConfig.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ScoringConfig.xsl 4 Nov 2002 21:29:12 -0000 1.5
--- ScoringConfig.xsl 4 Nov 2002 22:49:34 -0000 1.6
***************
*** 12,19 ****
<xsl:variable name="playersDataSource">
! http://www.fanfoot.com/test/players.xml</xsl:variable>
<xsl:variable name="teamDataSource">
! http://www.fanfoot.com/test/teams.xml</xsl:variable>
<!-- match everything not match elsewhere and do nothing with it! -->
--- 12,19 ----
<xsl:variable name="playersDataSource">
! http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/csms/csms-core/src/resources/conf/players.xml?rev=HEAD&content-type=text/xml</xsl:variable>
<xsl:variable name="teamDataSource">
! http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/csms/csms-core/src/resources/conf/teams.xml?rev=HEAD&content-type=text/xml</xsl:variable>
<!-- match everything not match elsewhere and do nothing with it! -->
|
|
From: <le...@us...> - 2002-11-04 22:11:19
|
Update of /cvsroot/csms/csms-core/src/resources/conf In directory usw-pr-cvs1:/tmp/cvs-serv13755 Modified Files: players.xml Log Message: Added 516 S. Caldwell Index: players.xml =================================================================== RCS file: /cvsroot/csms/csms-core/src/resources/conf/players.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** players.xml 4 Nov 2002 22:07:33 -0000 1.4 --- players.xml 4 Nov 2002 22:11:16 -0000 1.5 *************** *** 1443,1446 **** --- 1443,1456 ---- </player> + <player id="516"> + <firstName type="main">Stephen</firstName> + <firstName type="initial">S.</firstName> + <surname>Caldwell</surname> + <registeredTeam>NEW</registeredTeam> + <team>NEW</team> + <position>Centre Back</position> + <cost>2.5</cost> + </player> + <player id="481"> <firstName type="main">Tahar</firstName> |
|
From: <rga...@us...> - 2002-11-04 22:07:36
|
Update of /cvsroot/csms/csms-core/src/resources/conf In directory usw-pr-cvs1:/tmp/cvs-serv10620 Modified Files: players.xml Log Message: Added alternative surna,es for Nistelrooy, and the Nevilles Index: players.xml =================================================================== RCS file: /cvsroot/csms/csms-core/src/resources/conf/players.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** players.xml 4 Nov 2002 18:36:01 -0000 1.3 --- players.xml 4 Nov 2002 22:07:33 -0000 1.4 *************** *** 2287,2291 **** <firstName type="main">Gary</firstName> <firstName type="initial">G.</firstName> ! <surname>Neville</surname> <registeredTeam>MAN</registeredTeam> <team>MAN</team> --- 2287,2292 ---- <firstName type="main">Gary</firstName> <firstName type="initial">G.</firstName> ! <surname type="main">Neville</surname> ! <surname type="withInitial">G Neville</surname> <registeredTeam>MAN</registeredTeam> <team>MAN</team> *************** *** 2318,2321 **** --- 2319,2323 ---- <firstName type="initial">P.</firstName> <surname>Neville</surname> + <surname>P Neville</surname> <registeredTeam>MAN</registeredTeam> <team>MAN</team> *************** *** 2830,2834 **** <player id="601"> ! <firstName type="main">N/A</firstName> <surname>Edu</surname> <registeredTeam>ARS</registeredTeam> --- 2832,2836 ---- <player id="601"> ! <firstName type="main"> </firstName> <surname>Edu</surname> <registeredTeam>ARS</registeredTeam> *************** *** 5660,5663 **** --- 5662,5666 ---- <firstName type="initial">R.</firstName> <surname>van Nistelrooy</surname> + <surname>Nistelrooy</surname> <registeredTeam>MAN</registeredTeam> <team>MAN</team> |
|
From: <rga...@us...> - 2002-11-04 21:38:08
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv19178
Modified Files:
footballEvents.xml
Log Message:
Fixed issues with own goals meaning that a player was credited for scoring it and the wrong teams defenders were deducted points for conceeding. (bug 630445)
We now have a new ownGoal event allowing additional penalty points if a defender scores one.
Index: footballEvents.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/footballEvents.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** footballEvents.xml 3 Nov 2002 22:15:57 -0000 1.6
--- footballEvents.xml 4 Nov 2002 21:27:52 -0000 1.7
***************
*** 73,80 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>\s[Gg]oal\s-\s</unwantedPart>
<part name="player">(?:(?:[Mac|Mc|A-Z][a-z]*\s)(?!\d)){1,3}</part>
</pattern>
! </event>substitu
<event type="assist">
--- 73,105 ----
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[A-Za-z\d\s-]*\.(?:[^Oo](?![Oo]wn))*[Gg]oal\sby\s</unwantedPart>
<part name="player">(?:(?:[Mac|Mc|A-Z][a-z]*\s)(?!\d)){1,3}</part>
</pattern>
! </event>
!
! <!-- Extract own goal events -->
! <event type="ownGoal">
! <duplicateDetection>
! <part name="normalTimeMinutes"/>
! <part name="normalTimeSeconds"/>
! <part name="injuryTimeMinutes"/>
! <part name="injuryTimeSeconds"/>
! <part name="player"/>
! </duplicateDetection>
!
! <pattern>
! <sourceType>BBC Text Commentary</sourceType>
! <part name="normalTimeMinutes">\d\d?</part>
! <unwantedPart>:</unwantedPart>
! <part name="normalTimeSeconds">\d\d</part>
! <unwantedPart>\s*\(?</unwantedPart>
! <part name="injuryTimeMinutes">\d?\d?</part>
! <unwantedPart>:?</unwantedPart>
! <part name="injuryTimeSeconds">\d?\d?</part>
! <unwantedPart>\)?</unwantedPart>
! <unwantedPart>(?:[^\.]*\.)*[A-Za-z\s]*[Oo]wn\sgoal\sby\s</unwantedPart>
! <part name="player">(?:(?:[Mac|Mc|A-Z][a-z]*\s)(?!\d)){1,3}</part>
! </pattern>
! </event>
<event type="assist">
|
|
From: <rga...@us...> - 2002-11-04 21:32:58
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv22241
Modified Files:
footballEvents.xml
Log Message:
Added duplicate detection to substitutions
Index: footballEvents.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/footballEvents.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** footballEvents.xml 4 Nov 2002 21:27:52 -0000 1.7
--- footballEvents.xml 4 Nov 2002 21:32:55 -0000 1.8
***************
*** 229,232 ****
--- 229,241 ----
<event type="substitution">
+ <duplicateDetection>
+ <part name="normalTimeMinutes"/>
+ <part name="normalTimeSeconds"/>
+ <part name="injuryTimeMinutes"/>
+ <part name="injuryTimeSeconds"/>
+ <part name="playerOff"/>
+ <part name="playerOn"/>
+ </duplicateDetection>
+
<!-- The first substitution in a commentary slot -->
<pattern>
|
|
From: <rga...@us...> - 2002-11-04 21:29:15
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv19874
Modified Files:
ScoringConfig.xsl
Log Message:
Fixed issues with own goals meaning that a player was credited for scoring it and the wrong teams defenders were deducted points for conceeding. (bug 630445)
Index: ScoringConfig.xsl
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/ScoringConfig.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScoringConfig.xsl 4 Nov 2002 12:17:36 -0000 1.4
--- ScoringConfig.xsl 4 Nov 2002 21:29:12 -0000 1.5
***************
*** 37,40 ****
--- 37,41 ----
<!-- Goalkeepers, Full Backs and Centre Backs will lose 1 point for every goal conceded whilst they are on the pitch. -->
<xsl:call-template name="goalsConceeded" />
+ <xsl:call-template name="ownGoalsConceeded" />
<!-- Any player receiving a Yellow Card will lose 1 point for each time they receive a card (i.e. first offence -1 pt., second offence -1 pt. (total -2 pts.)). -->
***************
*** 397,401 ****
</xsl:variable>
! <xsl:for-each
select="//event[type='teamStarter' and team=$conceedingTeam] | //event[type='substituteStarter' and team=$conceedingTeam]">
--- 398,491 ----
</xsl:variable>
! <xsl:call-template name="deductDefenderPoints">
! <xsl:with-param name="goalMinutes">
! <xsl:value-of select="$goalMinutes"/>
! </xsl:with-param>
! <xsl:with-param name="scoringTeam">
! <xsl:value-of select="$scoringTeam"/>
! </xsl:with-param>
! <xsl:with-param name="conceedingTeam">
! <xsl:value-of select="$conceedingTeam"/>
! </xsl:with-param>
! <xsl:with-param name="conceedingTeamID">
! <xsl:value-of select="$conceedingTeamID"/>
! </xsl:with-param>
! </xsl:call-template>
! </xsl:for-each>
! </xsl:template>
!
! <!-- =========================================================================== -->
! <!-- FIXME: The goalsconceeded and ownGoalsConceeded templates are very similar -->
! <!-- We should refactor to extract common functionality, only the setting -->
! <!-- of the initial parameters needs to be different -->
! <!-- =========================================================================== -->
!
! <!-- Goalkeepers, Full Backs and Centre Backs will lose 1 point for every goal conceded whilst they are on the pitch. -->
! <xsl:template name="ownGoalsConceeded">
! <xsl:for-each select="//event[type='ownGoal']">
! <xsl:variable name="goalMinutes">
! <xsl:value-of select="normalTimeMinutes" />
! </xsl:variable>
!
! <xsl:variable name="conceedingTeamID">
! <xsl:call-template name="getPlayerTeam">
! <xsl:with-param name="playerFullName">
! <xsl:value-of select="player" />
! </xsl:with-param>
! </xsl:call-template>
! </xsl:variable>
!
! <xsl:variable name="conceedingTeam">
! <xsl:call-template name="getTeamName">
! <xsl:with-param name="teamID">
! <xsl:value-of select="$conceedingTeamID" />
! </xsl:with-param>
! </xsl:call-template>
! </xsl:variable>
!
! <xsl:variable name="scoringTeam">
! <xsl:choose>
! <xsl:when test="//event[type='result']/homeTeam = $conceedingTeam">
! <xsl:value-of select="//event[type='result']/awayTeam" />
! </xsl:when>
!
! <xsl:otherwise>
! <xsl:value-of select="//event[type='result']/homeTeam" />
! </xsl:otherwise>
! </xsl:choose>
! </xsl:variable>
!
! <xsl:variable name="scoringTeamID">
! <xsl:call-template name="getTeamID">
! <xsl:with-param name="commonName">
! <xsl:value-of select="$scoringTeam" />
! </xsl:with-param>
! </xsl:call-template>
! </xsl:variable>
!
! <xsl:call-template name="deductDefenderPoints">
! <xsl:with-param name="goalMinutes">
! <xsl:value-of select="$goalMinutes"/>
! </xsl:with-param>
! <xsl:with-param name="scoringTeam">
! <xsl:value-of select="$scoringTeam"/>
! </xsl:with-param>
! <xsl:with-param name="conceedingTeam">
! <xsl:value-of select="$conceedingTeam"/>
! </xsl:with-param>
! <xsl:with-param name="conceedingTeamID">
! <xsl:value-of select="$conceedingTeamID"/>
! </xsl:with-param>
! </xsl:call-template>
! </xsl:for-each>
! </xsl:template>
!
! <!-- Deduct points from defenders and goalkeepers who have conceeded a goal -->
! <xsl:template name="deductDefenderPoints">
! <xsl:param name="goalMinutes"/>
! <xsl:param name="scoringTeam"/>
! <xsl:param name="conceedingTeam"/>
! <xsl:param name="conceedingTeamID"/>
! <xsl:for-each
select="//event[type='teamStarter' and team=$conceedingTeam] | //event[type='substituteStarter' and team=$conceedingTeam]">
***************
*** 558,564 ****
</xsl:choose>
</xsl:for-each>
! </xsl:for-each>
! </xsl:template>
!
<!-- Any player receiving a Yellow Card will lose 1 point for each time they receive a card (i.e. first offence -1 pt., second offence -1 pt. (total -2 pts.)). -->
<xsl:template name="yellowCards">
--- 648,653 ----
</xsl:choose>
</xsl:for-each>
! </xsl:template>
!
<!-- Any player receiving a Yellow Card will lose 1 point for each time they receive a card (i.e. first offence -1 pt., second offence -1 pt. (total -2 pts.)). -->
<xsl:template name="yellowCards">
|
|
From: <le...@us...> - 2002-11-04 18:36:04
|
Update of /cvsroot/csms/csms-core/src/resources/conf In directory usw-pr-cvs1:/tmp/cvs-serv12546 Modified Files: players.xml Log Message: Added player 303 M. Sadler,BIR,Full Back. Corrected name Phil Neville Index: players.xml =================================================================== RCS file: /cvsroot/csms/csms-core/src/resources/conf/players.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** players.xml 3 Nov 2002 21:50:40 -0000 1.2 --- players.xml 4 Nov 2002 18:36:01 -0000 1.3 *************** *** 1893,1896 **** --- 1893,1906 ---- </player> + <player id="303"> + <firstName type="main">Matthew</firstName> + <firstName type="initial">M.</firstName> + <surname>Sadler</surname> + <registeredTeam>BIR</registeredTeam> + <team>BIR</team> + <position>Full Back</position> + <cost>2.5</cost> + </player> + <player id="214"> <firstName type="main">John</firstName> *************** *** 2305,2309 **** <player id="263"> ! <firstName type="main">Gary</firstName> <firstName type="initial">P.</firstName> <surname>Neville</surname> --- 2315,2319 ---- <player id="263"> ! <firstName type="main">Phil</firstName> <firstName type="initial">P.</firstName> <surname>Neville</surname> |
|
From: <rga...@us...> - 2002-11-04 17:07:27
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs/downloadAndInstall
In directory usw-pr-cvs1:/tmp/cvs-serv8653
Modified Files:
index.xml
Log Message:
Minor rewording of the build and run section
Index: index.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/downloadAndInstall/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.xml 31 Oct 2002 18:29:58 -0000 1.4
--- index.xml 4 Nov 2002 17:07:23 -0000 1.5
***************
*** 128,132 ****
<section>
! <title>Running a CVS build</title>
<p>There are many ways of running the application once built from CVS,
--- 128,132 ----
<section>
! <title>Running a built system</title>
<p>There are many ways of running the application once built from CVS,
|
|
From: <rga...@us...> - 2002-11-04 17:06:18
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs/downloadAndInstall
In directory usw-pr-cvs1:/tmp/cvs-serv8239
Modified Files:
configuration.xml
Log Message:
Reorganisaed tables to reflect categorisation of preferences in the new Preference manager.
Index: configuration.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/downloadAndInstall/configuration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configuration.xml 3 Nov 2002 19:06:05 -0000 1.2
--- configuration.xml 4 Nov 2002 17:06:15 -0000 1.3
***************
*** 110,113 ****
--- 110,125 ----
<td>http://www.fanfoot.com/test/Scores2HTML.xsl</td>
</tr>
+ </table>
+
+ <table>
+ <caption>Control Centre Preferences</caption>
+
+ <tr>
+ <th>Preference Name</th>
+
+ <th>Description</th>
+
+ <th>Default</th>
+ </tr>
<tr>
|
|
From: <rga...@us...> - 2002-11-04 14:28:52
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs
In directory usw-pr-cvs1:/tmp/cvs-serv6686
Modified Files:
constitution.xml
Log Message:
Tidied up XML and added a little to developer role.
Index: constitution.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/constitution.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** constitution.xml 24 Oct 2002 16:02:55 -0000 1.2
--- constitution.xml 4 Nov 2002 14:28:49 -0000 1.3
***************
*** 1,589 ****
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
!
<document>
<header>
<title>Community Sports Management System Project Constitution</title>
<authors>
! <person id="rdg" name="Ross D. Gardler" email="ro...@sa..."/>
</authors>
</header>
[...1200 lines suppressed...]
! meetings are to discuss issues, determine strategic direction, and
! forward progress. These meetings may take place online, via
! teleconference, or via other means deemed effective by the PMC.</p>
!
! <p>The PMC has an annual meeting at which time a new Chairman is
! elected. The old Chairman maintains membership status with no extra
! privileges.</p>
! </section>
!
! <section>
! <title>Membership</title>
!
! <p>PMC members may resign at any time. The Chairman may resign as
! Chairman at any time without resigning membership to the PMC.</p>
! </section>
! </section>
! </body>
</document>
+
+
|
|
From: <rga...@us...> - 2002-11-04 12:17:39
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv20065
Modified Files:
ScoringConfig.xsl
Log Message:
Fixed bug that meant some midfielders and forwards were being deducted points for coneeded goals (bug 633144)
Index: ScoringConfig.xsl
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/ScoringConfig.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScoringConfig.xsl 2 Nov 2002 18:06:42 -0000 1.3
--- ScoringConfig.xsl 4 Nov 2002 12:17:36 -0000 1.4
***************
*** 1,4 ****
<?xml version="1.0" encoding="UTF-8" ?>
-
<!--
Document : BBCScoringConfigURL.xsl
--- 1,3 ----
***************
*** 8,579 ****
Transforms an Events XML document into a score XML document
-->
[...1420 lines suppressed...]
! </xsl:attribute>
!
! <xsl:attribute name="team">
! <xsl:value-of select="$playersTeam" />
! </xsl:attribute>
!
! <points>
! <xsl:value-of select="$points" />
! </points>
!
! <event>
! <type>
! <xsl:value-of select="$eventType" />
! </type>
! </event>
! </player>
! </xsl:template>
! </xsl:stylesheet>
|
|
From: <rga...@us...> - 2002-11-04 12:16:28
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/gui
In directory usw-pr-cvs1:/tmp/cvs-serv19592
Modified Files:
ControlCentre.java
Log Message:
Fixed bug that prevented a change in the scoring config preference only taking efect after a restart.
Index: ControlCentre.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/java/org/fanfoot/gui/ControlCentre.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ControlCentre.java 3 Nov 2002 20:46:36 -0000 1.10
--- ControlCentre.java 4 Nov 2002 12:16:25 -0000 1.11
***************
*** 177,183 ****
mnuDebug.setVisible( false );
}
- String strConfFile = prefs.get( prefs.AUTO_SCORER_CLASS,
- prefs.AUTO_SCORER_SCORES_CONFIGURATION_FILE_KEY );
- scoringConfig = new ScoringConfiguration( strConfFile );
}
--- 177,180 ----
***************
*** 421,424 ****
--- 418,427 ----
org.saafe.utils.BrowserControl.displayURL( url );
+
+ String strConfFile = prefs.get( prefs.AUTO_SCORER_CLASS,
+ prefs.AUTO_SCORER_SCORES_CONFIGURATION_FILE_KEY );
+ logger.info( "Creating scoring configuration from the file "
+ + strConfFile );
+ scoringConfig = new ScoringConfiguration( strConfFile );
try {
|
|
From: <rga...@us...> - 2002-11-04 12:16:11
|
Update of /cvsroot/csms/csms-core
In directory usw-pr-cvs1:/tmp/cvs-serv19495
Modified Files:
status.xml
Log Message:
Fixed bug that prevented a change in the scoring config preference only taking efect after a restart.
Index: status.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/status.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** status.xml 3 Nov 2002 20:46:16 -0000 1.9
--- status.xml 4 Nov 2002 12:16:08 -0000 1.10
***************
*** 30,33 ****
--- 30,36 ----
release.</description>
+ <action dev="rdg" type="update">Fixed bug that prevented a change
+ in the scoring config preference only taking efect after a restart.</action>
+
<action dev="rdg" type="update">Improved handling of preferences. Now
uses a separate Preferences manager. The user no longer needs to define
|
|
From: <rga...@us...> - 2002-11-04 11:53:05
|
Update of /cvsroot/csms/csms-core/src/documentation
In directory usw-pr-cvs1:/tmp/cvs-serv12272
Modified Files:
Release-Checklist.txt
Log Message:
Added short term plans document
Index: Release-Checklist.txt
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/Release-Checklist.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Release-Checklist.txt 29 Oct 2002 18:43:45 -0000 1.8
--- Release-Checklist.txt 4 Nov 2002 11:53:00 -0000 1.9
***************
*** 31,34 ****
--- 31,35 ----
- update the web site docs
- are the download an install instructions up to date
+ - update shortTermPlans.xml
- update the README.txt file
|
|
From: <rga...@us...> - 2002-11-04 11:52:40
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs
In directory usw-pr-cvs1:/tmp/cvs-serv12183
Modified Files:
book.xml
Added Files:
shortTermPlans.xml
Log Message:
Added short term plans document
--- NEW FILE: shortTermPlans.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
"./dtd/document-v11.dtd">
<document>
<header>
<title>CSMS - Short Term Plans</title>
<authors>
<person id="rdg" name="Ross D. Gardler" email="ro...@sa..." />
</authors>
</header>
<body>
<section>
<title>Introduction</title>
<p>This document outlines the plans for the CSMS project in the
forseeable future. There is a separate document detailing our
<link href="longTermPlans.html">Long Term Plans</link>
.</p>
</section>
<section>
<title>0.2.x release</title>
<dl>
<dt>Move to a core/module architecture</dt>
<dd>The core doesn't really exist yet. What we have is a fantasy
sports module. This release will see the introduction of the core.
Instead of the user selecting a game that they want to see the scores
on the core will be aware of all the games due to have been played by
that time and calculate them.</dd>
</dl>
</section>
<section>
<title>0.3.x release</title>
<dl>
<dt>Introduce team management</dt>
<dd>Now that we have a core system and a sports module we can start
thinking about teams and leagues. So in this release we will bring
team management into play. We will support substitutions and transfers
in this release.</dd>
</dl>
</section>
<section>
<title>0.4.x release</title>
<dl>
<dt>League Management Facilities</dt>
<dd>Now that we have the concept of teams we can start to publish
league placings.</dd>
</dl>
</section>
<section>
<title>0.5.x release</title>
<dl>
<dt>Move to a Cocoon Portal based system</dt>
<dd>Move the user interface to a Cocoon web app. This will remove the
need to install any software in order to use the system (although
admittedly it will make it more difficult for people to install it for
themselves should they want to hence the embedded jetty release after
this one).</dd>
<dt>Make available to Fanfoot.com players</dt>
<dd>At this point the application will provide all major team
management facilites. Testing at this point can be performed by the
Fanfoot.com players.</dd>
</dl>
</section>
<section>
<title>0.6.x release</title>
<dl>
<dt>Embed Jetty server</dt>
<dd>By embedding the jetty server in one of the releases we will be
able to build a distribution that will run in full client/server mode
with only the need to install Java.</dd>
</dl>
</section>
<section>
<title>0.7.x release</title>
<dl>
<dt>Move to (Xindice?) database</dt>
<dd>At present all data is stored in XML files, however they are being
accesses through a URI. Therefore, we can no leverage Cocoons power to
replace these files with a Xindice's XML database without the need to
rewrite any code (theoretically at least)</dd>
</dl>
</section>
<section>
<title>0.8.x release</title>
<dl>
<dt>Refactoring</dt>
<dd>No new features will be added but the design of the system will be
improved.</dd>
</dl>
<p>This release will be the first one that sees an (almost) stable
core/module structure and API. It is this releae that we will start to
really push to other projects for collaboration. Once this core
infrastructure is in place the possible additions to the system are
immense and so opportunities for multiple developers start to
emerge.</p>
</section>
<section>
<title>And onwards...</title>
<p>From here we will plan the featureset to include in the 1.0 release
by revisiting both our
<link href="longTermPlans.html">long</link>
and short term plans.</p>
</section>
</body>
</document>
Index: book.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/book.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** book.xml 31 Oct 2002 19:36:04 -0000 1.8
--- book.xml 4 Nov 2002 11:52:35 -0000 1.9
***************
*** 11,14 ****
--- 11,15 ----
<menu-item label="License" href="license.html"/>
<menu-item label="Constitution" href="constitution.html"/>
+ <menu-item label="Short Term Plans" href="shortTermPlans.html"/>
<menu-item label="Long Term Plans" href="longTermPlans.html"/>
</menu>
***************
*** 21,27 ****
<menu label="Code">
! <menu-item label="Javadocs" href="javadocs/"/>
<menu-item label="Java Source Ref" href="javasrc/"/>
! <menu-item label="Code Style Checks" href="checkstyle/index.html"/>
<menu-item label="Dependencies" href="jdepend/index.html"/>
<menu-item label="Unit tests" href="junit/"/>
--- 22,28 ----
<menu label="Code">
! <menu-item label="Javadocs" href="javadocs/"/>
<menu-item label="Java Source Ref" href="javasrc/"/>
! <menu-item label="Code Style Checks" href="checkstyle/index.html"/>
<menu-item label="Dependencies" href="jdepend/index.html"/>
<menu-item label="Unit tests" href="junit/"/>
|
