Axel Uhl
936f300bcd
Merge branch 'smartfuturecachelockpropagation'
2013-04-17 10:28:06 +02:00
Axel Uhl
7e542f3588
Merge branch 'master' into barbados_resultimport
2013-04-17 10:18:34 +02:00
Axel Uhl
df7a574bea
introduced proxy settings in maven-settings-proxy.xml for SAP-internal use
2013-04-17 10:17:30 +02:00
Axel Uhl
07f7bdf5af
removed premature output of MAVEN_SETTINGS; they may be changed by the -p option afterwards
2013-04-17 09:54:35 +02:00
Axel Uhl
0d4fb9649c
fixed feature.xml and raceanalysis.product after bundle rename
2013-04-17 09:38:51 +02:00
Axel Uhl
87e89d5a75
adjusted pom.xml to removal of odf result importer and rename winretatta-->barbados
2013-04-17 09:31:37 +02:00
Axel Uhl
ae4361892e
fixed java/pom.xml after merge accident
2013-04-17 09:28:51 +02:00
Axel Uhl
53d84fbc36
added test for race number in Barbados result importer tests
2013-04-17 09:22:29 +02:00
Axel Uhl
9760c47430
first successful Barbados result import test that uses ScoreCorrectionProviderImpl
2013-04-17 00:31:43 +02:00
Axel Uhl
98d8e655c8
starting to understand IRMs/MaxPointsReason codes in Barbados result format
2013-04-17 00:17:28 +02:00
Axel Uhl
64a800317c
removed Winregatta example files from Barbados branch; use common way to identify boatclassName parameter
2013-04-17 00:06:11 +02:00
Axel Uhl
1bf0732bc9
adjusted result importers so they use available abstract base classes from com.sap.sailing.resultimport
2013-04-16 23:57:09 +02:00
Axel Uhl
6211fce442
renamed winregatta stuff to barbados; starting to remove Winregatta functionality from this branch
2013-04-16 23:48:54 +02:00
Axel Uhl
a1c1739244
working towards further refactoring of URL/file-based result importers
2013-04-16 23:41:33 +02:00
Axel Uhl
f4a622d011
Merge branch 'master' into winregatta_resultimport
2013-04-16 23:05:51 +02:00
Axel Uhl
2b291f4037
Merge remote branch 'origin/master'
2013-04-16 23:05:10 +02:00
Axel Uhl
e6481496b1
added TODOs for parallelization of SailingServiceImpl.getCompetitorRaceData
2013-04-16 23:04:39 +02:00
Axel Uhl
c84f5213a8
Merge branch 'master' into smartfuturecachelockpropagation
2013-04-16 23:03:55 +02:00
Axel Uhl
73f12e90c6
Merge remote-tracking branch 'server/master'
2013-04-16 23:03:41 +02:00
Axel Uhl
45cf3ca09e
preparing Barbados / "winregatta" import for consolidation with other file-based result imports
2013-04-16 23:03:00 +02:00
Axel Uhl
609ac0e1f9
Merge branch 'master' into winregatta_resultimport
2013-04-16 22:54:38 +02:00
Axel Uhl
23e6a5f53b
strange bug in good old KiWo result import regarding comparison with ( (byte)160 vs. (char)160)
2013-04-16 22:53:13 +02:00
Axel Uhl
4dfb8dabc1
removed SwissTiming OVR import, deprecated by XRR import; preparing for a consolidation of file-based result imports
2013-04-16 22:48:27 +02:00
Axel Uhl
c9ad57dc61
Merge branch 'master' into smartfuturecachelockpropagation
2013-04-16 14:18:17 +02:00
Axel Uhl
1e6307fe27
commented logging in LockUtil for performance reasons
2013-04-16 13:51:11 +02:00
Axel Uhl
2a4984c757
moved SmartFutureCache performance test to SmartFutureCacheTest
2013-04-16 12:05:19 +02:00
Axel Uhl
30d53be082
added performance test for SmartFutureTest get/call
2013-04-16 12:01:05 +02:00
Axel Uhl
4054a98fed
added missing @Test
2013-04-16 07:52:01 +02:00
Axel Uhl
12202299c4
Merge branch 'master' into smartfuturecachelockpropagation
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockTraceTest.java
2013-04-16 07:48:39 +02:00
Axel Uhl
a551869059
added locking performance test
2013-04-16 07:46:28 +02:00
Axel Uhl
e132c511f8
yield outside synchronized block to ensure the lock propagation gets its turn before the lock-seeking thread enters the synchronized block again
2013-04-15 17:28:33 +02:00
Axel Uhl
d863b68761
added failing test case for what comment #22 on Bug 1344 observed; LockUtil now doesn't deal properly anymore with reentrant read locks
2013-04-15 10:58:39 +02:00
Axel Uhl
d8a7fabdd2
made SmartFutureCache's lock propagation robust against concurrent get() calls
2013-04-15 10:57:04 +02:00
Axel Uhl
aaf1faad2c
fixed logging in SmartFutureCache for lock propagation; so far, NPEs were likely to happen due to the logging
2013-04-14 13:24:27 +02:00
Axel Uhl
33204ccf4a
Merge branch 'master' into smartfuturecachelockpropagation
2013-04-14 12:15:14 +02:00
Axel Uhl (Server)
98001cd1be
Fixed start script again - slow ssh makes things hard
2013-04-14 05:30:10 +02:00
Axel Uhl (Server)
4b1157d58b
Hopefully fixed scripts for good
2013-04-14 04:19:58 +02:00
Axel Uhl (Server)
45ef00d883
Fixed indicator of server and added tmpdir
2013-04-14 04:15:54 +02:00
Axel Uhl
8a46723c37
really unlock read lock if counter == 1 or current thread is owner;
...
this takes care of the possibility that the thread to which locks are propagated gets the read lock itself and later
is propagated the read lock again. In this case, the receiving thread needs to first actually unlock its lock before
only decrementing the counter and relying on the propagating thread's lock ownership.
2013-04-13 09:00:28 +02:00
Axel Uhl
d200670619
added a comment why the "fix" currently doesn't work; need to count actual read locks obtained and unlock in each thread where obtained
2013-04-13 02:45:14 +02:00
Axel Uhl
7604fa4956
provide what looks like a fix for bug 1344
2013-04-13 01:21:44 +02:00
Axel Uhl
a91b379aab
implemented a failing test case for bug 1344 (deadlock)
2013-04-13 00:46:50 +02:00
Axel Uhl
d22f3c53be
added test case that demonstrates the old fix for the read-read deadlock in synchronous triggerUpdate/get combinations
2013-04-13 00:27:52 +02:00
Axel Uhl
3d4c747346
added a first few locking / threading / SmartFutureCache updating test rudiments
2013-04-12 23:57:43 +02:00
Axel Uhl
a6e8e6e530
started with a comment for a failing test case for bug 1344
2013-04-12 22:27:53 +02:00
Axel Uhl
0eea838f4f
preparing a pro-active propagation of locks from the calling thread to another thread to tackle bug 1344 (deadlock)
2013-04-12 22:06:46 +02:00
Axel Uhl
f0d7c550e2
Changed "final" semantics for leaderboard JSON export such that it never exports a started but not yet finished race;
...
other fixes include creation of regattas which need to be created with no RaceColumns attached to the Series yet because
it otherwise breaks assumptions asserted by "assert" statements, hence breaking tests when executed with -ea.
2013-04-12 20:44:22 +02:00
Axel Uhl
524b67dacd
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
...
Conflicts:
java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java
java/com.sap.sailing.freg.resultimport/META-INF/MANIFEST.MF
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/FregHtmlParser.java
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionProviderImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ResultImportUrlsManagementPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorEntry.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorRow.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/RegattaResults.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/UrlResultProvider.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/CompetitorRowImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/DefaultCompetitorEntryImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/RegattaScoreCorrectionsImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/ScoreCorrectionForCompetitorInRaceImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/ScoreCorrectionForRaceImpl.java
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/pom.xml
2013-04-12 16:09:54 +02:00
Axel Uhl
12cf3f532e
fixed how the boat class name is determined for a leaderboard in xcelsiusadapter, no longer requiring it to be a RegattaLeaderboard
2013-04-12 15:09:08 +02:00
Axel Uhl
8088f1c9fe
adjusted start script to use telnet port and nohup
2013-04-12 13:05:18 +02:00
Axel Uhl
b704a21b81
changed name for mark passings locks
2013-04-12 13:05:07 +02:00
Axel Uhl
3251d2dfd7
computing RaceInfoDTO based on domain model and not based on DTOs constructed from domain model;
...
this should also solve bug 1342 because this is no longer called for constructing a StrippedLeaderboardDTO
2013-04-11 19:00:34 +02:00
Axel Uhl
c06ebfc7e7
quick fix towards bug 1342. The lges.get(0) is a bit evil if there are no legs (empty course); still, it needs to be atomic without locking; use exception instead
2013-04-11 18:33:01 +02:00
Axel Uhl
1a5530d20f
fixed typo in log message
2013-04-11 18:20:07 +02:00
Axel Uhl
1753127edc
regarding bug 1341, trying a patch that avoids the NPE due to missing RaceLog; needs to be reviewed by the Berlin team
2013-04-11 17:02:25 +02:00
Axel Uhl
3b5539181c
added missing hamcrest dependency to android.test bundle
2013-04-11 16:00:37 +02:00
Axel Uhl
f83c624e58
added missing hamcrest dependency to manifest of mongodb.test bundle
2013-04-11 15:20:27 +02:00
Axel Uhl
7b6ef0f246
added missing hamcrest dependency to serialization.test manifest
2013-04-11 14:46:43 +02:00
Axel Uhl (Server)
a7a20edbc0
fixed line endings in buildAndUpdateProduct.sh
2013-04-11 14:22:48 +02:00
Axel Uhl
34bab83ba2
Merge remote-tracking branch 'server/master'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway.serialization.test/build.properties
2013-04-11 14:13:34 +02:00
Axel Uhl
91af0a81ec
fixed serialization.test mockito dependencies; added logging for start of tracking
2013-04-11 13:57:15 +02:00
Axel Uhl
16e09507c1
first test for parsing XLSX result format for 505 in Barbados
2013-04-11 00:09:10 +02:00
Axel Uhl
9b0ff70e90
moved more of the default score correction implementation to the resultimport bundle to re-use between FREG and other importers
2013-04-10 18:14:37 +02:00
Axel Uhl
5f75cb9464
Merge branch 'master' into winregatta_resultimport
2013-04-10 16:17:55 +02:00
Axel Uhl (Server)
b2d41f24e3
Merge branch 'leaderboardCache'
2013-04-10 04:14:32 +02:00
Axel Uhl
002b680843
moved up hasScoreCorrection for an entire leaderboard column / RaceColumn from SettableScoreCorrection to ScoreCorrection
2013-04-09 15:22:43 +02:00
Axel Uhl
ecdce44d2c
don't enter MarkPassings with guessed time points; instead, only queue and wait for start time to be received later;
...
otherwise, this would let TrackedRace infer the start time from the guessed start mark passing times which ends in a
"vicious circle" with future mark passings not even being queued for re-validation after start time receiving.
2013-04-05 19:12:22 +02:00
Axel Uhl
1505247fde
trying to fix bug 1335 by removing *all* mark passings with guessed time points; doesn't work properly yet
2013-04-05 10:22:10 +02:00
Axel Uhl
08f3426da8
enhanced logging for TMDMessageQueue
2013-04-05 02:17:42 +02:00
Axel Uhl
2217031496
implemented fix for bug 1335 by introducing TMDMessageQueue, queuing TMD messages for which no start time existed
2013-04-05 02:03:20 +02:00
Axel Uhl
611f8eb244
Merge remote-tracking branch 'server/master'
2013-04-04 18:47:42 +02:00
Axel Uhl
53da3614a3
don't produce MarkPassing objects with null time point; this causes severe trouble; instead, guess start time from wall time
2013-04-04 18:44:28 +02:00
Axel Uhl
787241d19c
adjusted SmartFutureCache Javadoc after providing a patch to bug 1314
2013-04-04 01:57:13 +02:00
Axel Uhl
e2b3d43393
Tasks in the SmartFutureCache are now recycled with an extended update interval instead of canceled and re-scheduled if not yet started;
...
This solves bug 1314. A synchronized piece of code on the task attempts to update the interval in case the task hasn't read the interval
definition yet. If that doesn't succeed because the task has already consumed the old update interval definition, the existing future task
is left alone, and a new task with the extended update interval is created and scheduled.
2013-04-04 00:59:31 +02:00
Axel Uhl
0761af5e55
refactored SmartFutureCache towards a solution for bug 1314, re-using existing tasks with extended update interval instead of canceling and re-scheduling
2013-04-04 00:49:20 +02:00
Axel Uhl
8ff3810ada
added a "test case" (doesn't test anything) that reproduces the problem of bug 1314 with SmartFutureCache
2013-04-03 23:17:09 +02:00
Axel Uhl
447ad03592
Merge remote-tracking branch 'server/master'
2013-04-03 22:41:07 +02:00
Axel Uhl
c4bcca282f
on bug 1331, improved the way StoreAndForward handles EOF conditions;
...
When a receiving socket is closed, don't close the forwarding channels to the clients.
When EOF is received, stop receiving thread because obviously the receiving channel has been closed.
2013-04-03 22:38:26 +02:00
Axel Uhl
eb62475702
Merge remote-tracking branch 'server/master'
2013-04-03 13:57:55 +02:00
Axel Uhl
1eb6b44a2b
fixed boat icons used when no leg type is known
2013-04-03 13:51:12 +02:00
Axel Uhl
edb481b0ad
enhanced logging in case EOF / -1 is read from SailMaster
2013-04-03 13:46:23 +02:00
Axel Uhl
6de35e7602
Merge remote-tracking branch 'server/master'
2013-04-03 13:31:38 +02:00
Axel Uhl
22734d4445
setting stopped to true in SailMasterConnectorImpl when the thread stops because of an exception so it can be re-started
2013-04-03 13:31:06 +02:00
Axel Uhl
9473c6db02
made SailMasterConnector robust against null messages returned by the transceiver
2013-04-03 13:28:29 +02:00
Axel Uhl
8574b2742d
got updated test XRR files from Tomas; adjusted test cases to match them
2013-04-03 11:48:07 +02:00
Axel Uhl
d44045efbc
Merge remote-tracking branch 'server/master'
2013-04-03 11:19:17 +02:00
Axel Uhl
60c929b026
manually fixed RaceNumber for medal race in the test star race XRR; Tomas to send an updated official version
2013-04-03 11:16:25 +02:00
Axel Uhl
11499f431d
fix for bug 1326: interpret the RaceNumber attribute of the <Race> elements inside the <Event> elements in an XRR export
2013-04-02 23:03:26 +02:00
Axel Uhl
430551d3bc
synchronize access to StoreAndForward data structures; ensure re-connects every second from SailMasterConnectorImpl to SailMaster/StoreAndForward
2013-04-02 14:43:02 +02:00
Axel Uhl
6177b2d647
working towards multiple inbound SwissTiming SailMaster connections; see bug 1325
2013-04-02 12:54:04 +02:00
Axel Uhl
e899ac2aa7
fixed issue with "*X" checksum separator in Expedition messages
2013-04-02 09:39:13 +02:00
Axel Uhl
5812e8c04f
minor javadoc change
2013-04-02 00:19:48 +02:00
Axel Uhl
13e6ae594d
ignore competitor/race combinations during official result import where no official score is provided for that competitor/race;
...
this at least provides a way to import results for split fleet races easily by selecting all of a column with one split fleet
selected, then selecting the other split fleet race and again selecting all
2013-04-01 23:43:03 +02:00
Axel Uhl
1375a96bb6
Merge remote-tracking branch 'server/master'
2013-04-01 21:49:01 +02:00
Axel Uhl
bd3d27bab8
added a 470M XRR export example with split fleets; updated official ISAF XRR examples
2013-04-01 21:47:18 +02:00
Axel Uhl
742ecd82b9
removed unnecessary Runnable interface from UDPMirror
2013-04-01 21:15:52 +02:00
Axel Uhl
b8e12c1278
Updated general event planning (markdown)
2013-04-01 21:05:03 +02:00
Axel Uhl
726c41a4aa
added a launch configuration allowing Eclipse users to easily replicate live wind data to their environment
2013-04-01 17:33:41 +02:00
Axel Uhl
96ed42829e
Merge remote-tracking branch 'server/master'
2013-04-01 17:16:39 +02:00
Axel Uhl
d50f7411ff
update status of SwissTiming race to FINISHED when stopping tracker
2013-04-01 17:15:05 +02:00