Axel Uhl
0dbd2f4f45
publish non-public competitor data only if READ permission is provided; otherwise still serialize public information if READ_PUBLIC is given
...
Change-Id: I536ec02b6051f22a849393452b80de098fc1e29f
2019-05-04 17:57:21 +02:00
Axel Uhl
242513b42e
Merge branch 'master' into permission-vertical
2019-04-13 08:25:19 +02:00
Robert Benedikt
e7a97749bc
Merge branch 'master' into bug4703
...
# Conflicts:
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultEditableImpl.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultWithIdImpl.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/PenaltyFragment.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java
2019-04-12 11:34:24 +02:00
Kai Börnert
250783b4ae
Merge branch 'master' into permission-vertical
...
Conflicts:
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/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2019-02-11 09:25:45 +01:00
Robin Kuck
ab27f9f155
Merge remote-tracking branch 'origin/master' into bug4469
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2019-01-05 14:30:00 +01:00
Steffen Schaefer
1e00d2d194
Merge branch 'master' into permission-vertical
...
# Conflicts:
# java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
# java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.polars.datamining/META-INF/MANIFEST.MF
# java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java
# java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java
# java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
# java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
# java/com.sap.sailing.server/META-INF/MANIFEST.MF
# 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
# java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingServiceImpl.java
# java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java
# java/com.sap.sse.security.test/META-INF/MANIFEST.MF
# java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java
# java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java
# java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
# java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java
# java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java
# java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java
# java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2018-12-17 14:36:37 +01:00
Axel Uhl
550f8771a5
Merge branch 'master' into docker
...
Change-Id: I670ed4b220e48790ab71bf6cb96b1701cf32ca4b
2018-12-14 13:19:53 +01:00
Axel Uhl
4c0042160d
fixed Java Compiler settings to 1.8 for com.sap.sailing.server.gateway.serialization.test
...
Change-Id: Ia853640417f6341aeb5efe8f87575c262b794079
2018-12-14 10:11:49 +01:00
Axel Uhl
69814b86db
added bundle dependency of gateway.serialization.test to org.hamcrest
...
Change-Id: Ie7f43c4eb5b8f4cfef6a2aff47b5ff41999a2c68
2018-12-11 13:00:50 +01:00
Axel Uhl
6a28b6d052
added settings to gateway.serialization.test project
...
Change-Id: I4f397837aa255858b6fc1c3898cd8a8f3aced65a
2018-12-10 17:01:29 +01:00
Axel Uhl
4dd9f10e2c
removed further deprecations by switching imports from junit.* to org.junit
2018-12-10 03:46:28 +01:00
Axel Uhl
d8c2cf8cd3
upgraded target platform to newer MongoDB driver from org.eclipse.orbit;
...
A 3.x driver is required to connect to Microsoft Azure Cosmos. Upgrading
the target platform accordingly requires further upgrades, including Hamcrest
and JUnit libraries. This, in turn, deprecates or obsoletes numerous APIs,
parts of which that caused compilation *errors* I've replaced by their new
counterparts. Several more warnings still remain and need to be tackled by
replacing the usages to their new counterparts.
2018-12-10 03:00:59 +01:00
Robin Kuck
21d9a1261c
Merge remote-tracking branch 'origin/master' into bug4469
2018-11-06 20:42:15 +01:00
Steffen Schäfer
9c2ff665a7
Merge branch 'master' into permission-vertical
...
Conflicts:
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.gateway/webservices/api/v1/index.html
java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/Activator.java
java/com.sap.sse.security/META-INF/MANIFEST.MF
2018-10-23 13:10:46 +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
D067890
7708222141
bug4104: First approach of implementing image service
2018-09-25 16:05:56 +02:00
D067890
3780459f64
bug4104: Private tags are nor stored in the user storage
2018-08-27 18:37:20 +02:00
Joshua Schulz
c47625fdff
Merge remote-tracking branch 'origin/master' into bug4469
...
Conflicts:
java/com.sap.sse.security.ui/Security UI sdm.launch
java/com.sap.sse.security.ui/Security UI.launch
2018-08-20 10:08:56 +02:00
D067890
c79f6d2cee
bug4104: While creating tag or button you can set isVisibleForPublic
2018-08-16 13:38:16 +02:00
D067890
208f5663ed
bug4104: Tags contain boolean isPublic field
2018-08-16 11:47:57 +02:00
Manuel Zedel
d1a061533a
more test fixes
2018-08-13 10:03:56 +02:00
Henri Kohlberg
68fe2ca6d1
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104
...
# Conflicts:
# 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
2018-08-06 10:48:19 +02:00
Vladislav Chumak
e8c43db114
Changed polars based features for maneuver estimation data
2018-07-26 16:25:01 +02:00
Henri Kohlberg
028caf907a
Bug 4104: Removed username from RaceLogTagEvent as this information is laready saved in author object.
2018-07-19 17:02:32 +02:00
D067890
6cbfbd42e9
bug4104: fixed minor error
2018-07-19 08:50:33 +02:00
D067890
1a6d626479
bug4104: Add test for de-/serialization of RaceLogTagEvents
2018-07-18 16:35:59 +02:00
D067890
cadabc0a82
Merge branch 'master' into bug4104
...
# Conflicts:
# java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
# java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2018-07-18 16:16:58 +02:00
Robin Kuck
feae868fc5
Merge remote-tracking branch 'origin/master' into bug4469
2018-07-17 21:59:48 +02:00
D067890
487d2f2577
bug4104: added unit test for RaceLogTagEventSerializer
2018-07-13 11:07:56 +02:00
D067890
8e4ee0151f
bug4668: minor fix in test
2018-07-12 10:24:07 +02:00
D067890
bbf8f13b36
bug4668: Removed unused imports
2018-07-12 09:37:17 +02:00
D067890
d945f551e3
bug 4668: minor fix of test
2018-07-12 09:34:25 +02:00
D067890
008a5b4cff
bug4668: Added tests for deserialization of RaceLogEvents
2018-07-12 09:19:41 +02:00
Robin Kuck
7da918f223
Merge remote-tracking branch 'origin/master' into bug4469
2018-07-11 11:32:00 +02:00
D067890
0ede320c21
Added RaceLogEvent for tagging, added fitting visit methods
2018-07-09 16:21:25 +02:00
Vladislav Chumak
53abb3e730
Added export for gps fixes with estimation data
2018-07-09 09:16:03 +02:00
Vladislav Chumak
2774989686
Added polar feature to exported estimation data + corrected polars bugs
2018-07-09 09:16:03 +02:00
Vladislav Chumak
e94ca51c15
Added export for gps fixes with estimation data
2018-07-05 12:37:32 +02:00
Vladislav Chumak
316ccc3b43
Added polar feature to exported estimation data + corrected polars bugs
2018-07-05 10:52:05 +02:00
Robin Kuck
753897a917
Merge remote-tracking branch 'origin/master' into bug4469
2018-06-12 23:54:28 +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
Robin Kuck
56b23f92b5
Merge remote-tracking branch 'origin/master' into bug4469
2018-05-13 16:56:58 +02:00
Vladislav Chumak
feb85df6f9
Added measurements for GPS-holes within maneuver estimation data
2018-05-04 19:41:33 +02:00
Robin Kuck
28523ce624
Merge remote-tracking branch 'origin/master' into bug4469
...
# Conflicts:
# java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java
2018-04-30 11:56:24 +02:00
Maximilian Groß
97be670c2b
fixed imports
2018-04-20 13:25:17 +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
Vladislav Chumak
9db575b1a5
Added position to CompleteManeuverCurveWithEstimationData
2018-04-17 14:35:22 +02:00
Vladislav Chumak
7f3115cfc9
Merge remote-tracking branch 'origin/maneuver_refactoring'
2018-04-15 14:31:18 +02:00
Vladislav Chumak
8f86d0a862
Added deserialization for DetailedBoatClassJsonSerializer, fixed test
2018-04-13 19:02:34 +02:00
Vladislav Chumak
f702fea3d0
Implemented serialization/deserialization test for estimation data
2018-04-13 18:08:09 +02:00
Axel Uhl
Robert Benedikt
Kai Börnert
Robin Kuck
Steffen Schaefer
D067890
Joshua Schulz
Manuel Zedel
Henri Kohlberg
Vladislav Chumak
Maximilian Groß