Commit Graph
397 Commits
Author SHA1 Message Date
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 3267116a38 Merge branch 'master' into tracapi 2014-05-31 02:08:51 +02:00
Axel Uhl 73281a291e trigger persistence from within AddLeaderboardGroupToEvent and RemoveLeaderboardGroupFromEvent operations; support multi-LeaderboardGroup operations 2014-05-28 21:56:24 +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 306ecbbe3e enable and test replication of the modification operations for Event.leaderboardGroups 2014-05-28 16:32:32 +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
Fredrik Teschke bf8ebdc09a fixed locking bug that was introduced by e022fe57e0 2014-05-02 12:08:59 +02:00
Axel Uhl 626bf0b672 as part of bug 1903, renamed RacesHandle to RaceHandle 2014-04-29 15:51:08 +02:00
Fredrik Teschke 658fb95733 revert change that made boatClass non-final 2014-04-29 13:05:54 +02:00
Axel Uhl 52e0bb12b4 factored construction of default regatta parameters for an IRace; used this to remove any existing tracked race from the correct default regatta 2014-04-11 00:54:46 +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 04cbf17087 Merge branch 'master' into polar-api
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).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
2014-03-17 08:10:26 +01:00
Frederik Petersen 79061f1c96 Merge branch 'master' into polar-api 2014-03-12 11:25:24 +01:00
Axel Uhl 79934c22c5 refactored such that no access violation is required to create a test race log event in the DB; used a second master instance 2014-03-10 17:37:23 +01:00
Axel Uhl 6f38211749 a first failing test case for bug 1666; wouldn't compile on Maven due to access violations; need to refactor first 2014-03-10 17:07:00 +01:00
Axel Uhl a77832e8b1 adjusted event (de)serialization tests so that serializer / deserializer are tested in conjunction;
Testing only the serializer doesn't catch deserialization errors for specific attribute states after
serializing them.
2014-03-07 18:10:07 +01:00
Frederik Petersen 85f11b32df Merge branch 'master' into polar-api 2014-03-06 10:47:26 +01:00
Fredrik Teschke 0f94d9a47f dropdown list for boatclass in CompetitorEditDialog 2014-03-05 11:33:18 +01:00
fmittag f5a6d730cb Merge remote-tracking branch 'origin/master' into event_times 2014-02-27 15:43:14 +01:00
Axel Uhl b5ba16f8ec fixing bug 1647 by adding @Rule to a bunch of tests that may tend to timeout 2014-02-27 14:57:18 +01:00
Frederik Petersen 483a9deb80 Merge branch 'master' into polar-api
Conflicts:
	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.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.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 (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/RacingEventServiceImpl.java
	java/pom.xml
2014-02-26 12:31:44 +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
Simon Pamies 86ffc2d41b Made Series renamable also in UI, added test for replication. This
change leads to masterdata import failing if the other server is not at
the exact same level.
2014-02-17 13:10:48 +01:00
Fredrik Teschke 0fa71f8fae Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-02-15 22:27:05 +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
Simon Pamies 187d4280cf Added Leaderboard to RegattaOverview, also added tests for regatta update with replication 2014-02-13 20:53:58 +01:00
Simon Pamies 31c6aa8993 Added test to ensure that UpdateSeries also replicates newly created series 2014-02-13 17:10:35 +01:00
Simon Pamies 7360e41155 Revamped TracTracRaceTrackerImpl to make status of a race available to the tracker - this is useful to control caching 2014-02-06 18:55:21 +00:00
Nick Klose 85b411d047 Fixed more tests. 2014-01-29 17:41:40 +01:00
Axel Uhl 936f4e888d use a dedicated domain factory for the delayed leaderboard replication test to ensure there is no competitor in there from previous tests 2014-01-22 17:52:29 +01:00
Axel Uhl aecae92cd0 added more logging to find out why DelayedLeaderboardCOrrectionsReplicationTest is failing 2014-01-22 17:22:09 +01:00
Axel Uhl a13eeb3c59 added some logging to understand why DelayedLeaderboardCorrectionsReplicationTest fails only on central Hudson 2014-01-22 15:53:30 +01:00
Axel Uhl 0d2e02bda2 fixed replication test for delayed score corrections after those are now handled slightly differently with a filled competitor store;
The delayed leaderboard corrections are now resolved immediately upon loading if competitors are already known in the domain factory
and its competitor store. To preserve the test's behavior, this commit ensures that well-defined, new domain factories and
competitor stores are used for master and replica instance.
2014-01-22 01:35:06 +01:00
Frederik Petersen e25aeb5daf Implemented the polar fix cache updater 2013-12-18 12:00:24 +01:00
Axel Uhl 4ad6594a25 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
2013-12-10 09:30:41 +01:00
Axel Uhl 1404c18f67 replaced all usages of RGB Strings by the use of Color where possible; particularly in Competitor and CompetitorDTO 2013-12-09 22:06:29 +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 6d543b46b4 renamed new attribute displayColor of competitor back to color 2013-12-07 16:25:54 +01:00
fmittag 5918bb1d14 Merge remote-tracking branch 'origin/master' into competitorpanel_reuse 2013-12-07 14:22:27 +01:00
Axel Uhl 95f04c8e89 fixed replication tests for regatta updates so that they use the operation and apply it to master 2013-12-06 22:14:48 +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
Lukas Niemeier dc25f9ccb5 # removed the "any" DeviceConfigurationMatcher 2013-12-06 03:04:43 +01:00
Nick Klose 7dcd85bf05 Fixed another Nautical-Side Test. 2013-12-05 16:38:37 +01:00
Lukas Niemeier 061936c97e # renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
2013-12-04 16:18:33 +01:00
Lukas Niemeier 492124fd16 # renamed proceduresconfiguration to RegattaConfiguration 2013-12-04 02:49:46 +01:00
Lukas Niemeier d4601894dc # use pass-trough interface instead of getCompetitorStore chain 2013-12-03 18:38:36 +01:00
Lukas Niemeier 04e8671a11 Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-11-29 18:24:13 +01:00
Lukas Niemeier 453ac2b142 Merge branch 'master' into racecommittee_app
Conflicts:
	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.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-29 16:42:07 +01:00