Commit Graph
47027 Commits
Author SHA1 Message Date
Kai Börnert 742bda02ae Merge branch 'master' into permission-vertical 2018-12-18 14:34:02 +01:00
Kai Börnert 18df63ac5c added missing this in StrippedUserDTO 2018-12-18 14:03:54 +01:00
Alessandro Stolten e162b0215b Updated WaypointInferrer (markdown) 2018-12-18 12:32:47 +00:00
Alessandro Stolten 0e6118d14c Updated WaypointInferrer (markdown) 2018-12-18 12:23:04 +00:00
Kai Börnert cd2eafc80e adjusted securityservice to allow different ownerTenant for
createSimpleUser than the default one.
2018-12-18 10:08:53 +01:00
Steffen Schaefer aa16714fd5 Implemented custom serialization for UserImpl again. This should fix
deserialization of object cycles (UserImpl -> HashSet -> RoleImpl ->
UserImpl) where uninitialized objects are inserted into a HashSet.
2018-12-18 08:34:41 +01:00
Steffen Schaefer 70b036826c Merge branch 'master' into permission-vertical 2018-12-18 08:04:44 +01:00
Alessandro Stolten fbd569684a Updated WaypointInferrer (markdown) 2018-12-17 17:21:52 +00:00
Alessandro Stolten e8b5ff21f9 Updated WaypointInferrer (markdown) 2018-12-17 17:19:05 +00:00
Alessandro Stolten 5ec55115b4 Updated WaypointInferrer (markdown) 2018-12-17 17:17:23 +00:00
Steffen Schaefer d46a8a7d7e Adjusted equals and hashCode implementations to conform to the
description in the JavaDocs. In addition this fixes potential problems
in the UI where we do not enforce a single instance pattern.
2018-12-17 18:00:05 +01:00
Benjamin Barth 3ec8c428f5 Integrated new user roles editor implementation to UserEditDialog 2018-12-17 16:38:32 +01:00
Benjamin Barth 058c05e7fa Added new ListEditorComposite implementation to editor user roles 2018-12-17 16:38:31 +01:00
Alessandro Stolten 2d4663fe0f Updated WaypointInferrer (markdown) 2018-12-17 14:57:47 +00:00
Steffen Schaefer ac40bd0128 Merge branch 'master' into permission-vertical 2018-12-17 15:45:31 +01:00
Steffen Schaefer d88c38308c Fixed ClassCastExceptions after merge that included an upgrade of the
Mongo API
2018-12-17 15:12:51 +01:00
Steffen Schaefer 52ac3f423d Fixed Typo 2018-12-17 15:04:24 +01:00
Kai Börnert f6eccadd23 bug4825 further fixing of the series place error handling 2018-12-17 15:02:59 +01:00
Steffen Schaefer afb9faccc2 Merge branch 'master' into permission-vertical 2018-12-17 14:37:22 +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
Kai Börnert dbec90e59b Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git 2018-12-17 13:01:16 +01:00
Axel Uhl 1b992be8d2 Merge remote-tracking branch 'server/master'
Change-Id: Ia32603e5b45bc92902c6e6d54e29236f1a9c72d0
2018-12-17 12:15:23 +01:00
Axel Uhl b01df511f4 re-generated the Sailing Server (No Proxy).launch using analyzeProduct.sh
Change-Id: I15974f8c51e9fa32d775992849719dacad61f838
2018-12-17 12:13:57 +01:00
Kai Börnert af420e5cf0 Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git 2018-12-17 11:44:00 +01:00
Kai Börnert 097dd36945 bug 4825 removed streaming logic with non null results, as null is
required in this case to trigger the fallbacks/errorscreens
2018-12-17 11:37:42 +01:00
Alessandro Stolten 5dbc999bee Created WaypointInferrer (markdown) 2018-12-17 10:04:59 +00:00
Steffen Schaefer 6b865f3ee5 Consistently using LeaberboardGroup's UUID for security 2018-12-17 10:37:45 +01:00
Benjamin Barth 63d8e371d6 Unified inheritance hierarchy of SAPSailing authentication filters 2018-12-17 10:29:27 +01:00
Axel Uhl 05b2138fb6 added new bundles and fragments to Selenium launch config
Change-Id: If01e55e2ef7ab0a5dc43a7d708a43402c0563244
2018-12-15 12:18:58 +01:00
Axel Uhl 159086e801 fixed datamining.ui name in feature.xml specification
Change-Id: I59c68994203b3487b11dc06c36d736bbe9c6395b
2018-12-15 01:07:41 +01:00
Axel Uhl dc0572d066 added pom.xml for com.sap.sailing.server.interface bundle
Change-Id: Ic73e1b8cc97d8e2f22c970d19ee35c556d63d45c
2018-12-15 00:47:27 +01:00
Axel Uhl c6925499b9 added datamining.ui and gwt.user to the respective features; required at run-time
Change-Id: I7709d6d53e5f584e618eb691e3566c7a0d6ee225
2018-12-15 00:33:15 +01:00
Axel Uhl e625c4e5bc updated README for usage of analyzeProduct.sh
Change-Id: I530d9605c5bde7629be7667f795c2120b50e6705
2018-12-15 00:05:16 +01:00
Axel Uhl df1784a9cc added com.sap.sailing.server.interface to the sailing feature
Change-Id: Ic83bb53154260eb827054989ed66ff335f8fcc13
2018-12-15 00:03:40 +01:00
Axel Uhl c88a09b076 added com.sap.sailing.server.interface pom.xml and added it to java's pom.xml
Change-Id: I912348daab0e0202b3e3ae8f3bf8bc2e16b86a7b
2018-12-14 23:59:27 +01:00
Axel Uhl 72bc50fc0d move RacingEventService into a separate com.sap.sailing.server.interface bundle
Change-Id: Ib75bf6a46be9eaf2d9ccfad85832a3be8a7686be
2018-12-14 23:56:24 +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 f33f1b60af Merge branch 'master' into docker
Change-Id: I23f9779abcb4d6d9efd34cb04697f4b518ffb3c3
2018-12-14 14:59:42 +01:00
Axel Uhl e41abfe972 upgraded Java11 Hudson Slave AMI
Change-Id: Ic7569919b1af4b8a2f42004456b72b1b97fafef8
2018-12-14 14:55:18 +01:00
Axel Uhl b5730a719b fixed script to patch .launch files; added mongodb bundle to sse runtime feature
Change-Id: I9d65f15b476c3ca0d55035237a4f311ca124d7c8
2018-12-14 14:54:27 +01:00
Axel Uhl 550f8771a5 Merge branch 'master' into docker
Change-Id: I670ed4b220e48790ab71bf6cb96b1701cf32ca4b
2018-12-14 13:19:53 +01:00
Axel Uhl 19af798ed3 fixed launch config patching another time; added missing org.eclipse.osgi.util bundle to sse runtime feature
Change-Id: I0d93cf604d72c07e23c997d860d756052a1f8826
2018-12-14 13:09:36 +01:00
Axel Uhl 82d5899619 fixed patching of .launch configuration
Change-Id: I972823ab113acfa76d690f73af616404ef425aeb
2018-12-14 12:59:04 +01:00
Axel Uhl 4c03b8d694 analyzeProduct.sh can now also patch an existing .launch configuration
Change-Id: I8090610e50f6a1c37399023758c26129dade58df
2018-12-14 12:55:59 +01:00
Axel Uhl 6c14157b4f the analyzeProduct.sh script now produces two lines for a consistent .launch file
Change-Id: I23c52e4ca4dbc025f38ef20745a306cd5f1c075e
2018-12-14 12:36:57 +01:00
Axel Uhl 342e5782db adjusted features such that .runtime features pick target platform bundles only, other features pick workspace bundles only
Change-Id: Iaf6c28a083e3ea226160884b4a0c32217fbb95e8
2018-12-14 11:43:44 +01:00
Axel Uhl 5a921e6529 more scripts to extract bundles from target definition, launch config and product definition
Change-Id: Ie0f1deaeefaf82a1dd7018bd4e63c37e5503fe02
2018-12-14 10:45:08 +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 77d2eaa5d9 removed .prefs from .gitignore
Change-Id: If356a507072827f74da31083fb1731cf2c71e07d
2018-12-14 10:11:04 +01:00
Kai Börnert 0b1430a99a Merge branch 'permission-vertical' of ssh://sapsailing.com/home/trac/git into permission-vertical 2018-12-13 17:26:09 +01:00