Commit Graph
549 Commits
Author SHA1 Message Date
Kai Börnert 561a938a65 further restructuring of dto classes 2018-11-29 14:56:25 +01:00
Kai Börnert 3d49644443 cleaned up dtos a little 2018-11-28 09:49:33 +01:00
Kai Börnert 9774654679 split of client and server side data classes 2018-11-28 08:22:47 +01:00
Thomas Wiese 1a6441693f Merge branch 'permission-vertical' into bug4709_pv
Conflicts:
	java/com.sap.sailing.server.gateway/resources/shiro.ini
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2018-11-23 16:05:09 +01:00
Kai Börnert 1fe28a232d wip for defaultTenant switching 2018-11-21 17:26:28 +01:00
Thomas Wiese 33f0f9a4f1 Merge branch 'permission-vertical' into bug4709_pv 2018-11-15 11:02:32 +01:00
Kai Börnert 6a2916bead fixed missing dependencies for tests 2018-11-14 16:18:35 +01:00
Kai Börnert 12df19092f fixed and simplified further tests 2018-11-13 15:40:36 +01:00
Thomas Wiese 2985b6fca4 Merge branch 'permission-vertical' into bug4709_pv
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/resources/shiro.ini
2018-11-08 09:18:39 +01:00
Kai Börnert 703478aff0 preparation for ownership setting on masterdata import 2018-11-06 14:26:32 +01:00
Thomas Wiese cc2c751223 Merge branch 'bug4709' into bug4709_pv
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SlicingTest.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CreateRegattaCallback.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.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java
	java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2018-10-24 15:20:27 +02:00
Thomas Wiese ca0633dbc7 add secret for registration link to regatta dialog in the admin console 2018-10-15 14:23:32 +02:00
Thomas Wiese 7b14c71207 add attribute registrationLinkSecret to regatta 2018-10-11 10:50:34 +02:00
Kai Börnert c08e8b4369 bug4768 added multiple parts that will explicitly set permissions,
created an interface to allow most ownable objects to directly return
the QualifiedObjectIdentifier
2018-10-10 13:16:16 +02:00
Kai Börnert 35a6126c64 bug4768 improved manifest 2018-10-08 15:33:34 +02:00
Kai Börnert 7abb107ccb bug4768 wip: as soon as the SecurityService becomes available, ensure
that all ownerships are explicit
2018-10-05 16:22:31 +02:00
Kai Börnert f4c040dd3b bug4678 the test classes need to see com.sap.sse.security to compile 2018-10-05 16:21:26 +02:00
Thomas Wiese b254806a10 Revert "Move CompetitorRegistrationType from com.sap.sailing.domain.common to com.sap.sailing.domain.base"
This reverts commit b1bb9af5b6.
2018-10-04 14:01:38 +02:00
Thomas Wiese b1bb9af5b6 Move CompetitorRegistrationType from com.sap.sailing.domain.common to com.sap.sailing.domain.base 2018-10-04 10:03:59 +02:00
Thomas Wiese 22d06882c3 rename regatta attribute canCompetitorRegisterToOpenRegatta to competitorRegistrationType and swicht over to enum datatype 2018-09-21 17:41:57 +02:00
Thomas Wiese d992a3e9a0 Add parameter for user regsitration to regatta 2018-09-18 16:09:41 +02:00
Steffen Schaefer 25cda6bfd5 Bug 4212: Renamed test class that used to reference GPSFixStore 2018-06-25 13:55:53 +02:00
Steffen Schaefer 4196d2a7b7 Bug 4212: JavaDoc adjustments after removal of GPSFixStore 2018-06-25 13:55:02 +02:00
Kai Börnert 2b06677c7c bug4212 removal of GPSFixStore 2018-06-21 13:37:00 +02:00
Maximilian Groß 37917a50a4 Merge branch 'master' into bug4491
# Conflicts:
#	java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java
#	java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.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/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/client/StringMessages_fr.properties
#	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java
#	java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
2018-05-28 08:35:21 +02:00
Axel Uhl 3c4d05da28 Merge branch 'bug4527-failing-test' into bug4527
Change-Id: I259a8fcacebabebe59e26165d528a3adc033f876
2018-05-14 21:40:54 +02:00
Axel Uhl 6698aade42 a failing test case for competitor replication
Change-Id: I9587db4e4b54b104e50ac93a5e7be89916cf3029
2018-05-14 21:38:06 +02:00
Axel Uhl b095a063a8 bug 4527: allow for synchronous RaceListener registrations
Change-Id: Ibb6a064222d9cb1ef0944df5fee9dd0e3675ab8e
2018-05-14 15:36:04 +02:00
Axel Uhl 916dd866bf added a failing test case for bug 4527
Change-Id: I6f054588d2b8843624af27a5cbcb341ed6514e44
2018-05-14 10:29:15 +02:00
Maximilian Groß e977678869 Merge branch 'master' into bug4491
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.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_es.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
#	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/LeaderboardsResource.java
2018-04-20 13:10:37 +02:00
Axel Uhl b4f1c8fb10 more getCompetitorStore()-->getCompetitorAndBoatStore() renames
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
2018-04-13 09:01:27 +02:00
Axel Uhl 4c319f5f6c renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
2018-04-12 14:18:16 +02:00
Maximilian Groß ed1fae0c8f divided datamining from sailing specific classes 2018-04-12 07:40:59 +02:00
Axel Uhl 360f72a6a7 Merge branch 'master' into bug2822_boatcolors 2018-03-24 08:49:11 +01:00
Axel Uhl bd90f921dd added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule 2018-03-24 01:45:37 +01:00
EC2 Server 626a3eeb95 Merge branch 'master' into bug2822_boatcolors 2018-03-09 15:50:45 +00:00
Frank Mittag 5de4d8367b fixed prefiltering of competitors for regattas with changing boats for the CompetitorRegistrationDialog 2018-03-06 16:40:14 +01:00
Axel Uhl ac309e52a0 fixed test case after TracTrac adjusted historic Bundesliga metadata
Change-Id: Ife54f3d2ac7dbe449af7d504dfcd86ded1a0adc1
2018-03-06 16:29:23 +01:00
Frank Mittag 9ad514909f Further test cleanup 2018-01-11 15:48:41 +01:00
Frank Mittag e629372c5a Cleanup of some test and removal of a createCompetitorAndBoat method() in AbstractLeaderboardTest 2018-01-11 14:39:32 +01:00
Axel Uhl 86f1236e97 create a dedicated test regatta with canBoatsOfCompetitorsChangePerRace==true, fixing test for bug2822
Change-Id: Iaf91ea326ae62525345c4709b2e85f42321c6afc
2017-12-29 17:05:33 +01:00
Axel Uhl a8d8e3aa94 fixed test (expected vs. actual); improved javadocs 2017-12-28 22:11:09 +01:00
Axel Uhl 0451fab1d2 Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
Change-Id: Id8ebf0c05a7a269c2f98342af1f43970127532ab
2017-12-25 12:52:32 +01:00
Axel Uhl 9b0773b36a use Competitor instead of their ID in RaceDefinition's Competitor-Boat map
Change-Id: I09df42c3ffa97434791c94a8da88523061ce5cea
2017-12-22 14:02:58 +01:00
Frank Mittag e75339039a Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes 2017-12-04 14:44:54 +01:00
Frank Mittag 812fef2f22 Removed not needed RegattaLogRegisterAndBoatEvent after discussion with Axel.
All registration on regatta level will be of type RegattaLogRegisterCompetitorEvent where the passed competitor is either of type Competitor or CompetitorWithBoat depending on the regatta type
2017-12-04 14:38:59 +01:00
Axel Uhl 2e07176410 added failing test case for bug 4387
Change-Id: I5059f3cc94db585fa3a5da64ac50a285b13a1e6f
2017-12-03 15:22:14 +01:00
Frank Mittag c5be235354 added a boat replication test 2017-11-24 15:09:40 +01:00
Frank Mittag d45de24610 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
#	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/PersistentCompetitorStore.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Frank Mittag 7517a9a26c fixed a couple of tests after removal of BoatStore.getOrCreateBoat(competitor) 2017-11-16 11:05:07 +01:00