Commit Graph
566 Commits
Author SHA1 Message Date
Axel Uhl 4d53a3d865 fixed smart future cache test which now failed due to more rigid locking policy;
can't suspend the cache(...) method which is holding the write lock while trying to read using get(...).
Now suspending the computeCacheUpdate method. This still lets get(...) read null, but during
computeCacheUpdate the write lock for the key isn't held by the cache yet. Therefore, the get can proceed.
2013-03-29 15:43:29 +01:00
Axel Uhl 465d618fbc fixed smart future cache test which now failed due to more rigid locking policy;
can't suspend the cache(...) method which is holding the write lock while trying to read using get(...).
The get(...) method will simply block because a cache update is currently on its way.
2013-03-29 15:40:01 +01:00
Axel Uhl 12c9b3761b fixed third of the leaderboard tests that failed due to the changed incurred by the fix for bug 1023 2013-03-29 15:15:49 +01:00
Axel Uhl 8922ccf470 fixed second leaderboard test case that broke because of the changes incurred by the fixes for bug 1023 2013-03-29 15:05:07 +01:00
Axel Uhl b7182c4553 fixed the first of the leaderboard tests broken by the change in behavior requested by the fix for bug 1023 2013-03-29 14:56:41 +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
Axel Uhl ad969e44e7 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2013-03-01 13:11:54 -08:00
Axel Uhl 10c027565c fixing time zone in DateFormat for test so that there is no dependency on the executing computer's time zone setting 2013-03-01 12:49:45 -08:00
Armin Zamani df145e18e1 Fixed bug: ScoreCorrection for leaderboard must not be null 2013-03-01 21:12:16 +01:00
Armin Zamani b254437be3 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Course.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.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/server/SailingServiceImpl.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
2013-03-01 15:10:49 +01:00
Armin Zamani d7f9bbbaf9 Just formatting: Changed tabs to spaces by formatting hole files (Ctrl +
I in Eclipse) that we might have touched while developing on this branch
2013-03-01 14:33:37 +01:00
fmittag 4a90f84793 Merge remote-tracking branch 'origin/master' into passingSide 2013-02-27 16:05:59 +01:00
fmittag 510b9dda7d Finalized implementation of the new passingSide for Waypoints
cleanup of getRaceCourse() method in Sailingservice and improvement of RaceCourseManagementPanel in gwt UI
2013-02-27 15:53:49 +01:00
Armin Zamani a779640411 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRegatta.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
2013-02-26 13:26:25 +01:00
Axel Uhl 58ffefff5a fixing bug 1239 by also passing TrackedRace along with addRaceDefinition 2013-02-26 11:32:48 +01:00
Armin Zamani 7729a311db removed @Ignore for alle TracTrac Tests in domain tests 2013-02-25 00:19:24 +01:00
Armin Zamani 566916ece4 Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
2013-02-24 23:19:50 +01:00
Armin Zamani 9d72f87f04 Implemented CourseArea as another field to be selected in the Admin
Console for Regattas and propagated it in the Regatta infrastructure
2013-02-24 23:17:21 +01:00
Lukas Niemeier c506c10733 # test for attaching race logs to TrackedRaces 2013-02-24 21:45:26 +01:00
Lukas Niemeier 5e9bff4301 # on racecolumn link race log gets attached to TrackedRace 2013-02-24 21:06:08 +01:00
Lukas Niemeier 41605a58ac # format 2013-02-24 21:05:20 +01:00
Armin Zamani fe2ca8196d Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
2013-02-23 23:46:22 +01:00
Armin Zamani 2998aae3e5 Removed CourseArea from RegattaLeaderboard, the courseAreaId is now only
a property of flexible leaderboards, for edit flexible leaderboard
dialog the coursearea and event is correctly preselected
2013-02-23 23:37:18 +01:00
Lukas Niemeier 5debe4cf03 # another tractrac tests which never terminates... 2013-02-23 22:21:44 +01:00
Lukas Niemeier 49f2df24ac # ignore some never ending tractrac-tests... 2013-02-23 22:19:22 +01:00
Armin Zamani f13a8fc469 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
	java/com.sap.sailing.gwt.ui/build.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-02-22 15:51:13 +01:00
Axel Uhl 8b56cad5de enhanced test case for column factor application in regatta leaderboard 2013-02-20 11:01:39 +01:00
Axel Uhl 7a7249657d added test case for application of column factor in regatta leaderboard (see also bug 1213) 2013-02-20 11:00:08 +01:00
Armin Zamani 730b431912 further implementation of racelogstore in the sailing suite 2013-02-19 19:05:28 +01:00
Lukas Niemeier e29e4e7806 # Reworked placement of RaceLog to have it on RaceColumn again
# All code paths needing a real RaceLog are changed to use MongoRaceLogStoreFactory
# MISSING: REPLICATION ON RACECOLUMN!!!
2013-02-19 00:50:56 +01:00
Lukas Niemeier 5df89c7e7e Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/MarkImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/MetaLeaderboardColumn.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.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.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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/pom.xml
2013-02-18 16:53:55 +01:00
Lukas Niemeier 0c265c29a1 # test launches using eclipse launcher 2013-02-18 14:01:30 +01:00
Armin Zamani 1b13a992ac Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
2013-02-18 13:38:39 +01:00
Lukas Niemeier a229765845 # moved everything used by Android projects of com.sap.sailing.domain into new bundle com.sap.sailing.domain.shared.android
# updated com.sap.sailing.domain to Java 1.7 again
# split of Event (see EventData) and Course (see CourseData) to minimize shared code with android
# to avoid sharing RaceColumn and Leaderboard (and its dependencies) Android projects work with RaceGroups (consisting of SeriesWithRows -> consisting of RaceRows -> consisting of RaceCells -> consisting of RaceLogs). A RaceGroup is basically a data-only view on transposed RaceColumns. See RaceGroupFactory for conversion from Leaderboard to RaceGroup. Future work: use Regatta instead of Leaderboard to convert to RaceGroup
2013-02-18 13:26:32 +01:00
Armin Zamani a5f80757a1 deleted test for RaceLog on tracked race 2013-02-18 13:10:49 +01:00
Armin Zamani ddea60f570 Removed RaceLogStore from RaceColumn implementations and all subsequent
classes
2013-02-18 01:34:14 +01:00
Lukas Niemeier 7d156071c8 # moved race status to RaceLogRaceStatus enum in domain
# added RaceLogRaceStatusEvent for change in status
# made RaceLogStartTimeEvent a subclass of RaceLogRaceStatusEvent
# aligned mongo and test classes
2013-02-12 20:20:57 +01:00
Armin Zamani 8ac062f3f2 Introduced RaceLogStore to RaceColumnInSeries 2013-02-10 21:42:05 +01:00
Armin Zamani 4a4d213d7a RaceLogStore changed to a real store with caching functionality.
Race Column creation methods carry RaceLogStore to RaceColumn
constructor
2013-02-10 01:56:40 +01:00
Armin Zamani f9ee5b38fb Strategy change: reverted all additions of a raceLogStore to in
RaceColumn creation calls
2013-02-10 00:01:10 +01:00
Armin Zamani a8dafe6a63 Next implementation step, added RaceLogStore parameter to
RacingEventService, updated all callees
2013-02-09 22:27:06 +01:00
Armin Zamani 7d6d72785e removed all RaceLog methods from TrackedRace and TrackedRaceImpl and
DynamicTrackedRace
changed TrackedRaceImpl constructor again, all calling methods are
changed appropriately
2013-02-09 01:10:39 +01:00
Frederik Petersen 8fd2e7f7e3 Changed PolarSheetGeneration workers to be simple Runnables
rather than FutureTasks, since the results are continuosly pushed to the
result container
2013-02-08 15:35:35 +01:00
Frederik Petersen d30aea90ec PolarSheetGeneration is now happening on a per windspeed basis 2013-02-08 11:28:58 +01:00
Armin Zamani 0cb94ad321 Implemented the optional reference of leaderboards to a coursearea of an
event
2013-02-06 17:47:32 +01:00
Frederik Petersen 6a7d95cd4a Added test for GeneratePolarSheet service 2013-02-05 14:21:12 +01:00
Frederik Petersen d2c9b76977 Added test-case for PolarSheet Generation 2013-02-04 16:41:04 +01:00
Armin Zamani 02b225f307 Renamed RaceCommittee to RaceLog 2013-02-02 16:34:53 +01:00
Armin Zamani 66424926c4 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
	java/com.sap.sailing.freg.resultimport.test/bin/freg_html_export_sample.html
	java/com.sap.sailing.gwt.ui/pom.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-01-30 16:36:08 +01:00
Axel Uhl 3e950c86b8 let SmartFutureCache suspend/resume so it doesn't produce unlimited numbers of tasks in queue; see also bug 1175 2013-01-28 17:54:21 +01:00