Commit Graph
7161 Commits
Author SHA1 Message Date
Armin Zamani 9b1f71fbf9 Removed event id parameter check by converting the given id to
a UUID since GWT cannot handle UUIDs
2013-03-27 23:08:58 +01:00
Armin Zamani d73778feae Removed unnecessary RaceLogEventDTO, changed data to be loaded for
RegattaOverview: For a given event a list of all races on all course
areas with the regatta name and the RaceInfo is shown
2013-03-27 22:56:16 +01:00
Armin Zamani 68d6b4f833 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/EventsJsonGetServlet.java
2013-03-27 16:00:08 +01:00
Armin Zamani 5a07545444 Added some String constants for the course update code 2013-03-26 16:20:07 +01:00
Armin Zamani 5311c5d504 implemented start/pause for the regatta overview page, added a column
for fleets
2013-03-25 21:54:48 +01:00
Armin Zamani b8a201322f Added the field "name" for waypoints in the waypoint serialization since
TracTrac expects it for course design updates
2013-03-25 19:02:08 +01:00
fmittag 605332104e Merge remote-tracking branch 'origin/master' into leaderboard_json_doc_and_test 2013-03-22 17:24:38 +01:00
fmittag e3df4ea5dd added a json servlet for exporting wind data (similar to the showWind action from the AdminApp but with more parameters)
some renaming of the json servlets
2013-03-22 17:22:24 +01:00
Armin Zamani 5aeb30b1c9 Merge branch 'master' into racecommittee_integrated 2013-03-22 15:13:45 +01:00
Axel Uhl ab7fc9c519 Fixed by 1317: ConcurrentModificationException in SmartFutureCache unpropagating lock set 2013-03-22 15:09:42 +01:00
Axel Uhl 057a479586 Largely fixed bug 1023. While it doesn't show an additional column with the race count, LowPoint and HighPoint and all
their derived schemes rank a competitor better if it has more races; all races of those schemes are now always
considered valid for total points score. The old implementation is still in AbstractScoringScheme in case someone
needs them in a specific scheme.
2013-03-22 15:04:18 +01:00
Axel Uhl 98c14212aa Merge remote-tracking branch 'server/master' 2013-03-22 14:05:55 +01:00
Axel Uhl 0313c26a2d in LockUtil, consider the possibility that a thread from which locks are to be carried over doesn't hold any 2013-03-22 14:03:05 +01:00
Armin Zamani 6b4efe7af5 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/EventsJsonExportServlet.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
2013-03-22 13:51:55 +01:00
fmittag 75751b7550 Merge remote-tracking branch 'origin/master' into leaderboard_json_doc_and_test 2013-03-22 11:51:13 +01:00
fmittag a36606226f added sample json files for all json exports 2013-03-22 11:47:02 +01:00
Axel Uhl eb7245c3dc added a comment on the minimum size of the thread pool for the SmartFutureCache 2013-03-22 11:26:52 +01:00
fmittag 8b8989dc3e fixed missing method renaming 2013-03-22 10:58:30 +01:00
fmittag e4a4219624 replaced EventDataJsonExportServlet accessible via /rc/events with more general EventsJsonExportServlet via /events 2013-03-22 10:54:21 +01:00
fmittag 4681e78b61 Merge remote-tracking branch 'origin/master' into leaderboard_json_doc_and_test
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java
2013-03-22 10:45:34 +01:00
Armin Zamani 6d0660120b Merge branch 'master' into racecommittee_integrated 2013-03-22 10:42:10 +01:00
Axel Uhl 3dfc8ca0e7 apply lock propagation also to write locks 2013-03-22 00:34:45 +01:00
Axel Uhl f9292e64c3 added lock propagation to LeaderboardDTOCache and SmartFutureCache 2013-03-22 00:28:23 +01:00
Axel Uhl 82b464eafe added comment to SmartFutureCache.triggerUpdate to explain the need for randomization in case of mass updates 2013-03-22 00:09:14 +01:00
Axel Uhl e73b325db7 Merge remote-tracking branch 'server/master' 2013-03-21 23:59:20 +01:00
Axel Uhl 91b684804b use a single ThreadPool for all SmartFutureCache instances, 3*availableProcessors in size; shuffle multi-cache-invalidations;
when invalidating a SmartFutureCache for a number of keys, if this always happens in the same order, the first few keys
will be re-computed over and over again because cancelling them is not possible as they have already started, but a new
re-calculation needs to be triggered still. All later keys will be appended to the ordered queue but will keep getting
canceled because they haven't started their calculation yet. By shuffling the keys before triggering their invalidation,
all elements will fairly get re-calculated every now and then.
2013-03-21 23:53:39 +01:00
Axel Uhl 9b3f696620 use a ConcurrentHashMap to avoid issues in LockUtil caused by concurrent access to the lockCounts map 2013-03-21 23:48:08 +01:00
Axel Uhl 40af74b11b trying to fix bug 1312 by allowing LeaderboardDTOCache to use stale results of CrossTrackErrorCache and ManeuverCache;
The LeaderboardDTOCache is invalidated upon each GPS fix received; therefore, by and large, the LeaderboardDTOCache will
be invalidated each time the maneuver and cross track error caches will be invalidated. Only in very bizarre situations
such as the end of the race stopping all GPS fixes would the LeaderboardDTOCache keep some stale results for the very end
of the race. The likelihood seems sufficiently small to tolerate the risk.
2013-03-21 22:12:00 +01:00
Armin Zamani 4e29bda14c fixed a couple of merge errors 2013-03-21 22:11:57 +01:00
Axel Uhl 51ddeef2b8 working towards a solution against read-read locks when first reader waits for second reader (see bug 1313) 2013-03-21 21:22:01 +01:00
Armin Zamani d2eb988050 remaining changes after merge 2013-03-21 21:19:57 +01:00
Armin Zamani 6abba47d29 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/CourseDataJsonSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseBaseJsonSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseDataJsonSerializer.java
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventDataJsonExportServlet.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/ReadonlyDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/EventsDataParser.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/FleetIdentifierImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
2013-03-21 21:19:27 +01:00
Armin Zamani d1f64c456d renamed "CourseData" to "CourseBase", "EventData" to "EventBase" and
"SeriesData" to "SeriesBase", and their impl-classes accordingly,
renamed "CourseDataJsonSerializer" to "CourseBaseJsonSerializer"
2013-03-21 18:30:30 +01:00
Armin Zamani c97edeb46b Renamed AddToRaceLogJsonExportServlet to
AddEntryToRaceLogJsonPostServlet, renamed path /rc/leaderboards to
/rc/racegroups
2013-03-21 18:28:13 +01:00
fmittag 887b2ec5dd added a json export servlet for sailing events 2013-03-21 18:05:48 +01:00
Axel Uhl feaea37a0c improved trace output for locking 2013-03-21 17:43:23 +01:00
Armin Zamani 2741727077 added a try catch for URL/IO exceptions while sending a course design 2013-03-21 17:06:37 +01:00
Armin Zamani 67efd32a79 implemented the connection to the TracTrac server to post a course
update
2013-03-21 17:02:24 +01:00
fmittag 9e0b09fab7 added test cases for json export of a leaderboard with "Live" and "Final" result state 2013-03-21 14:37:58 +01:00
Armin Zamani e8742c504a Merge branch 'master' into racecommittee_integrated 2013-03-20 23:40:05 +01:00
Armin Zamani ab111912f9 the courseDesignUpdateURI is registered for RaceCourseReceiver in the
TracTrac Adapter
2013-03-20 20:40:30 +01:00
Armin Zamani f924559542 introduced the course design update URI as part of the constructors for
tractrac race creation
2013-03-20 19:31:23 +01:00
fmittag bd9ef9b963 Merge remote-tracking branch 'origin/master' 2013-03-20 19:16:06 +01:00
fmittag 9a3319b5f1 fixed a bug with the replication of default regattas (id replication was broken)
added a test case for replicating default regattas
2013-03-20 19:12:15 +01:00
Armin Zamani 4382fc7656 fixed field row numbering in tractrac adminconsole panel 2013-03-20 17:47:11 +01:00
fmittag d48872b809 used a different id for regatta creation due to bug 1311 2013-03-20 17:35:37 +01:00
Armin Zamani 3f7aa1362a Added the tracTrac Course Update url entry field to the tractrac admin
console panel
2013-03-20 17:19:03 +01:00
Axel Uhl 7211f60040 fixed use of LowPointWinnerGetsZero scoring scheme 2013-03-20 16:40:54 +01:00
fmittag 8aa04590ff Merge remote-tracking branch 'origin/master' into leaderboard_json_doc_and_test 2013-03-20 15:33:54 +01:00
fmittag f49cccea25 added basic json export tests for leaderboardGroups and a leaderboard 2013-03-20 15:33:32 +01:00