Axel Uhl
7fb0dfcf99
Merge branch 'master' into tracapi
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.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/LeaderboardForKielWeekTest.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/SerializationWithOnlineRaceTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
java/com.sap.sailing.domain.tractracadapter.test/META-INF/MANIFEST.MF
java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHP49erFX2013Test.java
java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPArenalTest.java
java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPLahaina3Test.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/AbstractReceiverWithQueue.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.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/MarkPassingReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.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/RaceStartedAndFinishedReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-06-03 01:47:08 +02:00
Axel Uhl
53a0b36e8e
consolidated all Util stuff in com.sap.sse.common.Util now
2014-06-03 00:01:14 +02:00
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
ed8ab3d5ad
moved Named to com.sap.sse.common
2014-06-02 23:53:36 +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
c4cea6660d
introduced com.sap.sse.common.Util as superclass of com.sap.sailing.common.Util and added com.sap.sse.common to the required bundles of all users of com.sap.sailing.common.Util
2014-06-02 23:17:49 +02:00
Axel Uhl
fa89463bf2
Merge branch 'master' into tracapi
2014-05-16 18:35:33 +02:00
Axel Uhl
61991d6440
made robust against competitors that are not found in SwissTiming start lists
2014-05-16 18:33:33 +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
78b65ae114
the randomized wait interval in the SwissTiming connector killed a bunch of tests assuming faster response; withdrew the random wait;
...
This was a workaround for bug 171 (see comment #2 ). We need to wait for what I expect to be a fix coming from SwissTiming.
2014-05-13 14:38:05 +02:00
Axel Uhl
88215764a5
use SwissTiming race UUID as RaceDefinition ID
2014-05-13 01:26:15 +02:00
Axel Uhl
b4c2202fd4
see bug 171, comment #2 ; introducing a random delay as a workaround for mass-loading of SwissTiming races
2014-05-13 00:06:58 +02:00
Axel Uhl
e39836cdb3
working on old bug 171; when one connection in a whole series fails, subsequent connections were affected; resolved these dependencies
2014-05-12 23:45:33 +02:00
Fredrik Teschke
fb0f187d55
Merge branch 'gpsfixstore-independent-of-race' into ftes-gpximport
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/SailingDomain.gwt.xml
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.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/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.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/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-05-01 23:05:08 +02:00
Axel Uhl
626bf0b672
as part of bug 1903, renamed RacesHandle to RaceHandle
2014-04-29 15:51:08 +02:00
Axel Uhl
eb4a923e83
further improved logging for SwissTiming connector
2014-04-29 13:54:04 +02:00
Axel Uhl
01618aea2e
improved log messages for SwissTiming connector, now that we have reasonable race names and descriptions early on
2014-04-29 13:48:12 +02:00
Axel Uhl
a716539ca4
working towards a solution for bug 1910; use asynchronous connectivity for SailMasterConnectorImpl so the timeout can work
2014-04-29 13:38:42 +02:00
Axel Uhl
2ffc89c479
fixed merge accident by introducing a missing StartList parameter in SwissTimingFactoryImpl
2014-04-28 15:20:08 +02:00
Axel Uhl
b576a7a141
Merge branch 'master' into gpsfixstore-independent-of-race
...
Conflicts were mainly around the introduction of GPSFixStore combined with the introduction of raceName in the SwissTiming connector and
the StartList coming from Manage2Sail
Conflicts:
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.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-04-28 15:14:04 +02:00
Axel Uhl
d4c70381b5
removed redundant TODO comment
2014-04-28 14:03:03 +02:00
Axel Uhl
7f40af1d97
added support for SwissTiming WND wind message
2014-04-28 13:57:26 +02:00
fmittag
c16961b53f
changed default live delay for swisstiming tracking from 5s to 6s
2014-04-25 16:27:23 +02:00
Axel Uhl
0bcc13d1cc
handle case when SwissTiming removes a mark passing (empty rounding time / rank for a valid mark index)
2014-04-25 14:35:46 +02:00
Axel Uhl
3ea1002388
make default ST regatta name unique per race
2014-04-25 14:00:46 +02:00
Axel Uhl
300639d786
avoid NPE when SwissTiming socket couldn't be opened
2014-04-25 13:56:53 +02:00
fmittag
1abb9cf876
fixed SwissTiming tracking into an existing regatta + race name cleanup
2014-04-25 12:06:05 +02:00
fmittag
878425df8f
finished implementation of reading the startlist always from M2S -> STL messages will be ignored in the future
2014-04-24 18:09:38 +02:00
fmittag
e9f9aa34fa
first version of reading the startlist from Manage2Sail insteaf of the STL message
2014-04-23 21:38:10 +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
fmittag
c6bc13dcf7
passed boat class (now sometimes known and not always part of the raceId anymore) through the call hierachy of the swisstiming tracking classes to use it in the DomainFactory for the regatta and race defintion creation
2014-03-22 14:22:48 +01:00
fmittag
ca811477a2
Merge remote-tracking branch 'origin/swisstiming-2.0' into swisstiming-2.0
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2014-03-20 21:52:25 +01:00
fmittag
45f3642d04
initial commit for new UI of management panel for swisstiming tracked races based on Manage2sail event URL's
2014-03-20 21:41:42 +01:00
Axel Uhl
af9ef0319d
made lastTimeZoneSuffix race-independent as the entire connector instance is now specific to a single race
2014-03-20 11:49:34 +01:00
Axel Uhl
a9a3b9833d
request using LSN starting at maxSequenceNumber+1 instead of at maxSequenceNumber
2014-03-20 10:41:21 +01:00
Axel Uhl
3f48d3e935
fixed _STOPSERVER rendevouz again; tests green again
2014-03-20 10:35:44 +01:00
Axel Uhl
1391176532
implemented OPN/LSN messages for bug 1866 and report stored data loading progress based on the OPN response; _STOPSERVER message now fails rendevouz...
2014-03-20 10:32:56 +01:00
Axel Uhl
5515760ee7
removed dedicated race-specific listener pattern because now the entire SailMasterConnector is race specific
2014-03-20 09:20:22 +01:00
Axel Uhl
2498374055
made tests work again for now; need to work on the OPN/LSN logic next...
2014-03-20 00:26:48 +01:00
Axel Uhl
e370b43d80
got a number of tests to succeed again
2014-03-19 23:21:34 +01:00
Axel Uhl
d898a25674
the workspace compiles again, but several SwissTiming tests now fail after the major refactoring
2014-03-19 22:42:58 +01:00
Axel Uhl
3a6e9b84df
removed canSendRequests parameter and added raceID and description parameter to constructors/factories for SailMaster connector
2014-03-19 22:16:58 +01:00
Axel Uhl
1e4544ba50
removed the tests that tested only StoreAndForward which is no longer needed for the new SwissTiming architecture;
...
SwissTiming will be providing an "SAP Gateway" which stores messages for us. We'll be able to query messages
even for a live race, using an "LSN" message sent to the gateway. Therefore, StoreAndForward as well as the
tests specific to this architecture are no longer required. The remaining tests are all green now.
2014-03-01 00:22:12 +01:00
Axel Uhl
f2056de871
changed SailMasterMessage constructor such that it can handle the optional preceding message number
2014-02-28 22:02:51 +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
Nick Klose
a24c054af4
Reverted getDistanceToStartLine() and fixed Waypoint construction in swisstimingadapter.
2014-02-03 14:19:06 +01:00
Nick Klose
3018bd8bfe
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
2013-12-09 18:35:16 +01:00
Nick Klose
96075f5cc1
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.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/DomainFactoryImpl.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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/DraggableCourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ESSCourseDesignDialog.java
2013-12-09 13:22:09 +01:00
fmittag
62b3a9c6ae
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorStore.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-12-06 19:19:09 +01:00
fmittag
d037441787
added load/store/editing of the new attribute displayColor for a competitor
2013-12-06 18:40:15 +01:00
Axel Uhl
Fredrik Teschke
fmittag
Nick Klose