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
1ee408a87e
Merge remote-tracking branch 'server/master'
...
Change-Id: I885eb7276576560efc6af0c7b4f35c1a0640639b
2019-01-23 17:05:25 +01:00
Axel Uhl
919444b0c4
bug 4875: using replaceOne instead of updateOne when during migration a RaceLogEvent must be replaced
...
Change-Id: I4b59a63ccb0abf27c014f40002342e130795c1fe
2019-01-23 16:25:29 +01:00
Alessandro Stoltenberg
dc5b5dd57a
Added MONGODB_URI to status script
2019-01-23 15:30:17 +01:00
Axel Uhl
6a2552a3fa
try closing the socket instead of the streams;
...
this is also what happens in a try-with-resource
Change-Id: I53686c84f69149173e1894d0b9b3d26778c55b08
2019-01-23 11:14:28 +01:00
Axel Uhl
dbf33e1693
catch SocketException; it seems a valid alternative to reading -1 if the server has closed the connection
...
Change-Id: Iaee1dd2a35cea0b00f338fd3bb8f2e13067813f8
2019-01-23 10:51:53 +01:00
Axel Uhl
6a26465cc5
reverted to per-byte request reading but close input stream before closing output stream on server
...
Change-Id: I711b6652838b53bda91e209c9573d58cfe73ad79
2019-01-23 10:27:13 +01:00
Axel Uhl
07ede58212
temporarily reverted request reading to the use of BufferedReader;
...
knowing it will kill the POST case I'd like to see whether this fixes
the "Connection reset" issue observed during test execution on Linux
Change-Id: I74879dc4a682759dad63184ed38cf5c575281fda
2019-01-23 10:13:51 +01:00
Axel Uhl
119ab574ca
also close socket (again) after properly closing input stream
...
Change-Id: I74d9b6fe74decb8d1f43ed8bff8d2f72d2c8fe2b
2019-01-22 22:17:10 +01:00
Axel Uhl
9e130314f3
close socker input stream properly before leaving the socket to GC
...
Change-Id: I35484bc0523045e450f5c417c61012ef0a79b7a9
2019-01-22 21:16:35 +01:00
Axel Uhl
589df34a03
Merge branch 'master' into bug4018
...
Change-Id: I4508d0187921733eceea5fa12e04147476eb09b6
2019-01-22 21:03:22 +01:00
Axel Uhl
bcb1346555
removed Socket.close() call in replication test frame to avoid killing client-side connection prematurely
...
Change-Id: I5793a2fdee9e4403323446e2eece9b4a84b1f538
2019-01-22 18:10:32 +01:00
Benjamin Barth
8d4b16ac0b
Service methods and security logic for RoleDefinitions on UserGroups
2019-01-22 18:00:46 +01:00
Benjamin Barth
d327603694
Persistence logic for RoleDefinitions on UserGroups
2019-01-22 18:00:44 +01:00
Benjamin Barth
25f6b45820
First preparations for RoleDefinitions on UserGroups
2019-01-22 18:00:42 +01:00
Kai Börnert
4b34b58102
Merge branch 'master' into bug4412
2019-01-22 17:45:55 +01:00
Kai Börnert
9151016251
Merge branch 'master' into permission-vertical
2019-01-22 16:52:38 +01:00
Kai Börnert
d40c870416
only ensure the default users do exist, and do not reload from db when
...
starting selenium tests
2019-01-22 16:50:27 +01:00
Kai Börnert
e8b297e929
properly invalidate Sessions in Shiro when clearing the
...
ReplicatingCache, used to store Sessions
2019-01-22 16:49:41 +01:00
Kai Börnert
deeb4bd01a
simplify tests to not reload all users from db at setup
2019-01-22 16:49:02 +01:00
Kai Börnert
4e76faf323
allow to recreate default tenant, without loading all users from db for
...
testing
2019-01-22 16:48:27 +01:00
Axel Uhl
c35793b76d
fixed another issue with to-master-replication-queue running empty but scheduled flag not being reset
...
Change-Id: I434328d7618aae631330ee53a015e06030d13d7a
2019-01-22 15:04:27 +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
112548b293
now really added test which was missing from previous commit
...
Change-Id: I22fb542e23dc885e0b5d828f215ecdc6dbd03ad5
2019-01-22 11:04:28 +01:00
Axel Uhl
bb07391659
added test for sending replication operation to master through HTTP POST
...
Change-Id: Ie16a2abb308dc3ae860cf729374362d9b5d21516
2019-01-22 10:50:19 +01:00
Vladislav Chumak
78764ac04a
Fixed IncrementalManeuverComputationTest
2019-01-22 10:45:14 +01:00
Kai Börnert
ffdc00537d
Merge branch 'master' into permission-vertical
2019-01-22 10:35:46 +01:00
Kai Börnert
2ee6b02126
reduced diff from variable names
2019-01-22 10:19:53 +01:00
Kai Börnert
da818a2277
improved javadoc for securityservice
2019-01-22 09:11:18 +01:00
Axel Uhl
4532677c3e
register the ReplicationService object on the replicables when they become a replica, not on master
...
Change-Id: I354ab9b9442307c0b90b44b5949c0d03611e18e7
2019-01-22 00:23:40 +01:00
Axel Uhl
0b1f049496
reverted problematic use of POST in HttpUrlConnectionHelper introduced in bce05a434cb732390dab69aae3d3fcb26218153c;
...
can't write after having read
Change-Id: Icde37667bb4c6292416bcc761a59c0d91a62517a
2019-01-22 00:19:00 +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
4543dd2089
uncompileable interims commit for bug4018: started with an operation re-send queue
...
Change-Id: I20acb4bd2d10226911055b8b92efa64bd56272a4
2019-01-21 18:49:51 +01:00
Alessandro Stoltenberg
20fb09dad2
Added minimum half boundary width to ValueRangeFlexibleBoundaries. Windstreamlets have 0.35 knots minimum half boundary width.
2019-01-21 11:23:28 +01:00
Axel Uhl
18dbecea15
release notes update for new availability checks
...
Change-Id: I6129dfde8181c518c61ec17960697c7ee3d2c9bc
2019-01-18 18:34:26 +01:00
Axel Uhl
f8a2d2fb0d
java/target/status now delivers an exit code of 0 if the server is available, and 1 if not;
...
it considers the outputs of /index.html, scanning for a 2XX HTTP
response code, checks the availability of the RacingEventService using
the /sailingserver/api/v1/status end point and checks the replication
stack for availability using /replication/replication?action=STATUS
Change-Id: Ic277aa5a248b5bc31a7042f46b388e734655c980
2019-01-18 18:24:48 +01:00
Axel Uhl
72a035f2e6
Merge branch 'master' into bug4018
...
Change-Id: Ic192ecc479ba1c5e8293652b0d924c6bc6b99587
2019-01-18 18:10:05 +01:00
Axel Uhl
f1a65cc7c1
added a /sailingserver/api/v1/status end point with availability check
...
Change-Id: Iba11cadebda22fae5b19171c994e21a5244965ea
2019-01-18 18:01:35 +01:00
Axel Uhl
34b360cc3e
replication status under /replication/replication?action=STATUS
...
Change-Id: I63cfd64609e458690a89da3ed5478ee5f239579b
2019-01-18 17:35:58 +01:00
Axel Uhl
313552dd24
added security.persistence bundle to more launch configs
...
Change-Id: I0bf8855ba47899931ccaac284c2be80d8b434c0a
2019-01-18 14:08:32 +01:00
Axel Uhl
548b437cde
don't forward exception during sending replication operation to master, only log; better log message
...
Change-Id: I9afe7860cab381ccab3aed91e11b631903ebced9
2019-01-18 14:08:01 +01:00
Axel Uhl
546cac6548
added persistence support for clearing ReplicatingCacheManager and ReplicatingCache; added session garbage collection upon SecurityService construction
...
Change-Id: I78475411ef01916678e383922d9d0bd11dfd5aec
2019-01-18 13:45:12 +01:00
Steffen Schaefer
9b943d6cab
Added missing bundles
2019-01-17 18:29:13 +01:00
Kai Börnert
76a115ebba
fixed initialisation order
2019-01-17 18:12:17 +01:00
Kai Börnert
768719101f
leftover removal
2019-01-17 18:03:42 +01:00
Steffen Schaefer
ade77afd48
Added method that was unintentionally removed in the last merge
2019-01-17 18:02:24 +01:00
Kai Börnert
81ee2a194e
Merge branch 'permission-vertical' of
...
ssh://trac@sapsailing.com/home/trac/git into permission-vertical
Conflicts:
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2019-01-17 16:07:28 +01:00
Kai Börnert
8bac619d5e
changed clearState to properly reinitialize all security related
...
services to the state a clean server startup would create
2019-01-17 15:06:20 +01:00