Steffen Schaefer
73b377a6cd
Merge branch 'master' into permission-vertical
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2019-01-24 09:41:58 +01:00
Axel Uhl
d2c3bdf2b5
ensure in-order delivery of messages from replica to master;
...
always pass operations to be sent to master into the queue so they
cannot be delivered to the master earlier than other queued operations
after connectivity has been restored
Change-Id: I7b1409dc4663659039058ce2c0511a26009114b4
2019-01-22 14:31:58 +01:00
Kai Börnert
57bdcc1bcc
Merge branch 'master' into permission-vertical
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
java/com.sap.sse/src/com/sap/sse/util/HttpUrlConnectionHelper.java
2019-01-22 12:21:19 +01:00
Kai Börnert
333e4fa0bc
Merge branch 'master' into permission-vertical
...
Conflicts:
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/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2019-01-22 11:12:07 +01:00
Axel Uhl
e633e66766
introduced queueing service for operations unsent to master
...
Change-Id: I0021082ec96b26b4302821a37acf2eb085baf2af
2019-01-21 23:10:45 +01:00
Axel Uhl
34b360cc3e
replication status under /replication/replication?action=STATUS
...
Change-Id: I63cfd64609e458690a89da3ed5478ee5f239579b
2019-01-18 17:35:58 +01:00
Steffen Schaefer
0a03e2718a
Merge branch 'master' into permission-vertical
...
Conflicts:
java/com.sap.sse.security/META-INF/MANIFEST.MF
java/com.sap.sse.security/src/com/sap/sse/security/impl/ReplicableSecurityService.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
java/com.sap.sse/src/com/sap/sse/util/HttpUrlConnectionHelper.java
2019-01-17 14:13:21 +01:00
Axel Uhl
6ce072ee3f
raised session timeout from 24h to 1y consistently in all shiro.ini files
...
Change-Id: Ic6fe7773c8796ad5606c528937cde1b61c4f8fe8
2019-01-15 18:31:57 +01:00
Axel Uhl
5bebb7af48
Added missing web subject factory configuration to the other shiro.ini configs
...
Change-Id: I874a50d4e175729d652f2a237ea249045685977f
2019-01-07 18:10:08 +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
4c4752a748
extracted replication interfaces into separate bundle to avoid having to activate the replication service only for registering a replicable
...
Change-Id: I22e423efee06e653a9ed3b9bea13b3b0153f7156
2018-12-14 21:27:17 +01:00
Axel Uhl
9117da2595
Merge remote-tracking branch 'server/permission-vertical' into permission-vertical
...
Change-Id: Iae3a28d2fe06ed5bdf38418537480c451c157b74
2018-12-04 17:46:14 +01:00
Axel Uhl
b8c5fdffc3
Merge branch 'master' into permission-vertical
...
Change-Id: I983bec4adfd8e8c67e1af232a829ad1d8407b117
2018-12-04 15:20:22 +01:00
Kai Börnert
6551072e5e
extended ObjectInputStreamResolvingAgainstCache with a listener, that
...
gets called on cache misses and hits
added unified ownership handing on masterdataimport
2018-12-04 14:40:41 +01:00
Axel Uhl
49db8126bb
allow solution to run with both, Java8 and Java11 with same target platform
...
Change-Id: I4f7772aaa1d9d1b65a2452ad98d8c51809fef2b4
2018-11-30 21:20:06 +01:00
Axel Uhl
8d772196de
Adding com.sun.istack bundle to satisby jaxb implementation bundle's imports
...
Change-Id: Ia2a93ad709c16f81dcb3d9d15d2117e509f9c4e1
2018-11-26 22:11:52 +01:00
Axel Uhl
6c04f43d54
added jaxb-api and jaxb-impl as well as com.sun.activation.javax.activation to local p2 and target platform definition
...
Change-Id: I26de811d87e83660642e526f35a05baa0fbb53bb
2018-11-26 01:13:01 +01:00
Axel Uhl
bc94bcfad4
added dependency from polars to javax.xml.bind
...
Change-Id: I4db95f12a09618954c223b57b52e16e59e2a9f37
2018-11-25 19:52:18 +01:00
Axel Uhl
7819b39faa
Merge branch 'master' into permission-vertical
...
Change-Id: I8d1fab815610c344e20db356fddc98c998e8f574
2018-08-02 13:44:44 +02:00
Vladislav Chumak
77d25eb580
Fixed fallback twa for jibes
2018-07-25 15:16:22 +02:00
Vladislav Chumak
b51671237f
Corrected minDiff calculation between best maneuver angle candidates
2018-07-25 12:53:38 +02:00
Vladislav Chumak
01fe50ff04
Fixed incorrect maneuver angle calculation from twa in
...
getManeuverLikelihoodAndTwsTwa
2018-07-25 12:23:11 +02:00
Axel Uhl
f213912fec
Merge branch 'master' into permission-vertical
2018-07-19 23:18:44 +02:00
Alessandro Stoltenberg
1f41b2c964
bug4572: refactoring and deleting old entries for maneuver.maneuverLoss replaced by maneuver.maneuverLoss.projectedDistanceLost. Changes made respectivly also for the corresponding DTOs.
2018-07-09 15:39:49 +02:00
Axel Uhl
8c9477dac0
tried to merge master; failed for ManeuverWithCoarseGrainedBoundariesImpl; Alessandro, please continue
...
Change-Id: I03bccd6ad5291464d0aa08b1f64902be57702713
2018-07-09 13:51:10 +02:00
Vladislav Chumak
316ccc3b43
Added polar feature to exported estimation data + corrected polars bugs
2018-07-05 10:52:05 +02:00
Alessandro Stoltenberg
e512cb78eb
Merge remote-tracking branch 'origin/master' into bug4572
2018-06-18 18:02:06 +02:00
Axel Uhl
6127967114
Merge branch 'master' into permission-vertical
...
Change-Id: I056fa53fd62de0aefbcbcb0e52c824f4764e2a27
2018-06-12 22:04:26 +02:00
Alessandro Stoltenberg
d2d38412ef
Renamed all getManeuver() methods that have return type Distance to getManeuverLossDistanceLost()
...
Renamed all variables maneuverLoss of type Distance to maneuverLossDistanceLost
2018-05-17 15:21:20 +02:00
Maximilian Groß
ed1fae0c8f
divided datamining from sailing specific classes
2018-04-12 07:40:59 +02:00
Axel Uhl
806a4d5c28
Merge branch 'master' into permission-vertical
2018-03-30 23:03:03 +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
Frank Mittag
8b82e2c20c
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
2018-03-05 16:45:42 +01:00
Axel Uhl
22d83b8dc8
Merge branch 'master' into permission-vertical
...
Change-Id: I54b3956cba2284c3d0ad22ba162a40e8b4abfd06
2018-03-05 11:46:46 +01:00
Axel Uhl
5330c621b1
fixed Javadoc after beat angle --> TWA rename
...
Change-Id: I11f3821cf661ef5113dde498b2ee71263b82c118
2018-02-26 16:00:24 +01:00
Kai Boernert
a4b23289b5
renamed to twa
2018-02-26 13:24:56 +01:00
Kai Boernert
cde3ac9210
Moved BeatAngle calculations to trackedrace level, as no leg values are
...
used anyway. In the chart is is rendered nearly pixel perfect.
changed English text
Adjusted test cases to use the new method.
2018-02-22 15:45:04 +01:00
Frank Mittag
d2b3fc62c0
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
2018-02-21 10:48:43 +01:00
Axel Uhl
805fffc0c9
Merge branch 'master' into permission-vertical
...
Change-Id: I43c8ce9b07daa50251a27c939f3ec3733c337b27
2018-02-19 11:35:52 +01:00
Steffen Schaefer
fa1d53edfd
Bug 4450: removed unused websocket bundles
2018-02-16 08:50:23 +01:00
Axel Uhl
7a1c0e8dc7
Merge branch 'master' into permission-vertical
...
Change-Id: I472fe056f16097deac6b5f7357774be61ca5aa4c
2018-02-14 21:51:04 +01:00
Steffen Schaefer
f6851c53c7
Bug 4442: Updated Jetty dependencies to consistently use version 9.4.8
2018-02-06 15:46:26 +01:00
Steffen Schaefer
572d2fdf68
Bug 4442: Removed the usage of websocket server
2018-02-06 15:38:16 +01:00
Jonas Dann
c9a617385d
Merge branch 'master' into permission-vertical
2017-11-28 18:41:19 +01:00
Jonas Dann
4894ba6a55
Fixed shiro configs
2017-11-24 13:24:23 +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
Axel Uhl
4c8209624f
bug 4297: fixing deadlock by first copying fixes, the releasing track lock, then calling processElement
...
Change-Id: Id30d1205d807ef992ff7d2d60184e18deeec389d
2017-08-31 19:22:25 +02:00
Frank Mittag
c5f08e3dfa
Fixed compile errors after lastest master merge (caused my Competitor/Boat separation related issues)
2017-08-28 16:57:22 +02:00
Frank Mittag
68ae4f561c
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# 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/MongoObjectFactoryImpl.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.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/base/impl/AbstractRaceColumn.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.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.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/RegattasResource.java
# 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
2017-08-28 16:12:00 +02:00
Steffen Schaefer
Axel Uhl
Kai Börnert
Vladislav Chumak
Alessandro Stoltenberg
Maximilian Groß
Frank Mittag
Steffen Schaefer
Jonas Dann