Commit Graph
437 Commits
Author SHA1 Message Date
Axel Uhl cb9354b1a0 moved Util from com.sap.sailing.common to com.sap.sse.common 2014-06-02 23:57:16 +02:00
Axel Uhl 0c47e86304 moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common 2014-06-02 23:31:26 +02:00
Axel Uhl 3267116a38 Merge branch 'master' into tracapi 2014-05-31 02:08:51 +02:00
Axel Uhl 588e19f227 added some very bare-bones test support for Event-->LeaderboardGroup link establishing during master data import 2014-05-29 13:43:29 +02:00
Axel Uhl db05658286 use UUID as id for LeaderboardGroup which now implements WithID; preparing for the use of this UUID by Event in persistence to reference LeaderboardGroups 2014-05-28 18:02:41 +02:00
Axel Uhl 5a811465cd Merge branch 'master' into tracapi 2014-05-15 07:39:29 +02:00
Axel Uhl 102caa8f76 replaced ConcurrentSkipListSet by Collections.newSetFromMap(new ConcurrentHashMap()) which doesn't require comparability 2014-05-15 07:37:21 +02:00
Axel Uhl 4428f71388 Merge branch 'master' into tracapi 2014-05-15 00:06:30 +02:00
Axel Uhl cdac144759 fixed type of tracker set to ConcurrentSkipListSet in test mock after changing it in RacingEventServiceImpl 2014-05-14 23:19:42 +02:00
Axel Uhl 587824d807 replaced use of synchronized for raceTrackersByRegatta by the use of a corresponding lock 2014-05-14 22:57:58 +02:00
Axel Uhl 5a3defcf82 avoid needless iteration across all regattas' trackers when regatta is known in all callers 2014-05-14 21:31:46 +02:00
Axel Uhl 5c2fc3b888 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.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/RaceTrackingConnectivityParametersImpl.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/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-05-13 20:21:33 +02:00
Axel Uhl d4c3b5309d Merge branch 'master' into tracapi 2014-05-10 18:14:02 +02:00
Fredrik Teschke 4b4b61b6c5 Merge remote-tracking branch 'origin/master' into ftes-rltracking
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.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/GPSFixTrackImpl.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
2014-05-09 20:30:32 +02:00
Axel Uhl 7ca425d4a2 added observer pattern for Competitor, Team, Boat and Person 2014-05-07 22:57:27 +02:00
Axel Uhl 626bf0b672 as part of bug 1903, renamed RacesHandle to RaceHandle 2014-04-29 15:51:08 +02:00
Fredrik Teschke 821f1307bf Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractTimePoint.java
	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/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java
	java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMRMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.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.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.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/RaceCourseManagementPanel.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.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-03-28 18:34:58 +01:00
Frederik Petersen f34375975e Merge branch 'master' into polar-api
Conflicts:
	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
2014-03-18 15:35:04 +01:00
Frederik Petersen 0f585068f2 Added wind export checkbox in master data import panel
allows the user to disable the wind export/import, which will lead to
significantly smaller data sizes
2014-03-18 15:25:50 +01:00
Frederik Petersen 78a4459f1e Polar fixes are now aggregates on the fly
BUT at this point there are way to many timer threads.
2014-03-12 14:40:12 +01:00
Frederik Petersen b906980366 Made sure that the test db is cleaned before and after tests
concerning the master data import test cases
fsync on db is imported, so that no error will be thrown during db drop
2014-03-12 10:20:24 +01:00
Axel Uhl e515838636 typo in comment 2014-03-12 07:14:07 +01:00
Frederik Petersen a2ba9ae52a Improved testability of data importer 2014-03-06 09:48:07 +01:00
Frederik Petersen d35323fe0a Improved master data import tests and ...
...fixed bug in uncompressed import
2014-03-06 09:10:01 +01:00
Frederik Petersen 5199f141a4 Merge branch 'master' into bug1825 2014-03-05 13:59:55 +01:00
fmittag de2edfcf37 Merge remote-tracking branch 'origin/master' into event_times
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2014-02-25 19:10:59 +01:00
Frederik Petersen 8d2e405c52 Started working on fixing bug 1825 2014-02-25 15:31:03 +01:00
Frederik Petersen e7c21b0235 Merge branch 'master' into bug1825 2014-02-25 15:24:32 +01:00
Frederik Petersen 21aed2395c Added assert for second PersistentRegattasForRaceIDs in test case 2014-02-25 15:18:44 +01:00
Frederik Petersen 0cb0e13353 Fixed and refactored import of PersistentRegattasForRaceIDs
Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-02-25 15:14:38 +01:00
Frederik Petersen 32ba332022 Created failing test case for bug 1825 2014-02-25 15:08:42 +01:00
Frederik Petersen 0084d2b61f Added failing test for persistence of PersistentRegattasForRaceIDs 2014-02-25 13:01:24 +01:00
fmittag b5bff27a10 Added startDate and endDate as new properties of the 'Event' domain class (including edit UI) 2014-02-24 16:04:33 +01:00
Jens Rommel 71df453414 Fixed constructor mis-use in MasterDataImportTest
--> "test" is not a valid MongoDb objectId and thus not a valid MediaTrackId
2014-02-22 21:33:04 +01:00
Jens Rommel 6a75723fa6 Eventually fixed media track importing. Required a major redesign of some media APIs:
- introduced new method MediaDB.insertMediaTrackWithId
- moved import logic into racing event service
2014-02-20 17:03:28 +01:00
Frederik Petersen 534d8c6a15 Fixed NPE and tests for data import 2014-02-19 17:34:53 +01:00
Frederik Petersen 74cb4b6431 Merge branch 'master' into bug1776 2014-02-19 17:19:31 +01:00
Frederik Petersen ce71baa411 Added progress indication to master data import 2014-02-19 17:00:40 +01:00
Jens Rommel 9d8da37ce9 Added test cases 2014-02-19 10:50:30 +01:00
Frederik Petersen 2e1ec8fde7 MasterDataImport leaderboard names are now fetched using the server
resolved by the importing server rather than the web client

fixes 1706
2014-02-18 11:40:00 +01:00
Fredrik Teschke 78c848e594 added GPSFixStore concept to TrackedRace
- needs to be passed through RacingEventServiceImpl -> lots of changes in
  test cases
- changes in adapters, as GPSFixStore is also passed around in
  RaceAdapter etc.
2014-02-15 12:20:12 +01:00
Fredrik Teschke 07f5efe154 Merge branch 'master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
2014-02-12 21:58:31 +01:00
Frederik Petersen 1da11a140a Merge branch 'master' into masterdataimport-bug1765 2014-02-10 13:45:39 +01:00
Frederik Petersen 5878c0d613 Fixed master data import test 2014-02-10 13:32:44 +01:00
Frederik Petersen dd7df6bdef Moved DummyTrackedRace
to avoid package-bundle-name problem
2014-02-10 12:17:55 +01:00
Frederik Petersen 9d984c0ea9 Removed unused dependency 2014-02-09 17:06:23 +01:00
Frederik Petersen c2a645a5ed Changed MasterDataResource location
and added test for race log event persistence
2014-02-09 16:49:08 +01:00
Frederik Petersen 89385d802f Moved TopLevelMasterData to domain package
removed unused master data json facilities
2014-02-09 16:08:59 +01:00
Axel Uhl a216ef0795 made names of TracTracConnectionConstants consistent with their string representations 2014-02-08 23:34:32 +01:00
Frederik Petersen ea5dae85a2 Fixed race log import in master data import
one test still fails due to competitor resolving
2014-02-08 17:44:17 +01:00