Axel Uhl
431df4750f
trying to switch to mockito 1.10.14 again
2014-12-01 01:47:22 +01:00
Axel Uhl
5b014eb944
downgraded to mockito-core-1.9.5.jar for now; still fighting target platform issues with any mockito-core-1.10.x version...
2014-12-01 01:28:48 +01:00
Axel Uhl
cbd6c04833
formatting in pom.xml only
2014-12-01 00:58:16 +01:00
Axel Uhl
3ac4bca7d4
removed mockito old version 1.9.5
2014-11-30 12:36:59 +01:00
Axel Uhl
3cc17078e2
Merge branch 'ftes-maven-p2-local' into bug2465
2014-11-30 12:10:45 +01:00
Axel Uhl
bf7d841974
rename local target definition so it is easier to recognize in Eclipse target definition selection
2014-11-30 12:10:15 +01:00
Axel Uhl
1a4390a52c
added project preferences for operationaltransformation project
2014-11-30 11:58:16 +01:00
Axel Uhl
3f40724c8c
ignore generated p2 repository from git
2014-11-30 11:57:40 +01:00
Axel Uhl
4c231f3844
Merge branch 'ftes-maven-p2-local' into bug2465
2014-11-30 11:54:15 +01:00
Axel Uhl
dae1ae8a50
trying to upgrade Mockito to 1.10.13 so we get Java8 default interface method implementation support, as required by mediaservice tests
2014-11-30 11:53:45 +01:00
Axel Uhl
3e456170bf
fixed issue described by comment #5 in bug 2408; the ID of operations sent from replica to master is stored in thread local and attached to operations sent out on behalf of this
2014-11-30 01:47:22 +01:00
Axel Uhl
8e7ab908e7
replicate operations initiated on replica to master and ignore them when they come back to that replica; see bug 2408
2014-11-29 23:50:06 +01:00
Axel Uhl
10d2e48a78
Merge branch 'master' into bug2465
2014-11-29 20:34:47 +01:00
Axel Uhl
cdb23e8f4f
removed unused imports and an unused private method in LeaderboardGroupSelectorComposite
2014-11-29 20:33:04 +01:00
Axel Uhl
75fb41bdd1
Merge branch 'master' into bug2465
2014-11-28 18:13:11 +01:00
Axel Uhl
22d9ecdd3b
working on bug 2408, adding an implementation that has the replica side of serializing an operation to the master through an HTTP request
2014-11-28 18:12:09 +01:00
Axel Uhl
47abca3054
solving bug 2480 also for SecurityOperation implementations
2014-11-28 17:34:47 +01:00
Axel Uhl
28d708b6c7
fixing bug 2480 for RacingEventService replication by implementing isRequiresExplicitTransitiveReplication correctly on all RacingEventServiceOperations
2014-11-28 17:27:20 +01:00
Axel Uhl
3b499d8492
working towards a solution for bug 2480 by adding OperationWithResult.isRequiresExplicitTransitiveReplication and respecting it in replicate(...)
2014-11-28 16:39:08 +01:00
Axel Uhl
672ca1b5c8
moved TimerWithRunnable to com.sap.sse and let com.sap.sse.security depend on it, allowing TimerWithRunnable to use Java8 features
2014-11-28 15:03:48 +01:00
Jan Broß
6e71dab973
Merge remote-tracking branch 'origin' into bug2438
2014-11-28 13:55:23 +01:00
Jan Broß
83b4535628
Resolve #2438 by removing MapsInitializer according to http://developer.android.com/reference/com/google/android/gms/maps/MapsInitializer.html
2014-11-28 12:15:58 +01:00
fmittag
3255b74465
Merge remote-tracking branch 'origin/eventmanagementpanel'
2014-11-28 11:48:42 +01:00
fmittag
80d6a87180
Merge remote-tracking branch 'origin/master' into eventmanagementpanel
2014-11-28 11:46:19 +01:00
fmittag
055a8c7e1d
added sorting to the leaderboard group selection listbox in EventManangementPanel
2014-11-28 10:48:38 +01:00
fmittag
fb7e7d3f2e
removed commented line
2014-11-27 15:44:27 +01:00
fmittag
3fdca85253
moved "edit assigned leaderboard groups" of an event to a separate tab in the EventEditDialog
2014-11-27 15:32:44 +01:00
Axel Uhl
1059e1292e
Merge branch 'master' into bug2465
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java
2014-11-27 10:55:58 +01:00
Fredrik Teschke
45e64333de
return default pass id for racelog
2014-11-26 23:55:46 +01:00
Axel Uhl
ec382dea4e
extended patching of local p2 target path for Cygwin users
2014-11-26 23:20:39 +01:00
Fredrik Teschke
dd583a4b59
Merge remote-tracking branch 'origin/master' into racelog-to-abstract-log-refactoring
2014-11-26 18:40:45 +01:00
Fredrik Teschke
ee7ebe1261
use pass id of last event in RaceLog for getCurrrentPassId()
2014-11-26 18:31:32 +01:00
Fredrik Teschke
101dba0d82
rename ->LogEventAuthorImpl (instantiating a class named Abstract* feels wrong)
2014-11-26 18:27:18 +01:00
Fredrik Teschke
bb9293c668
remove ECLIPSE_HOME information from script (not needed to build local p2 repo)
2014-11-26 17:17:04 +01:00
Fredrik Teschke
05cc8d6877
update wiki: only one target def with new name, which can also be tested via mvn
2014-11-26 16:54:33 +01:00
Axel Uhl
178ed846a1
Merge branch 'master' into bug2465
2014-11-26 07:31:34 +01:00
Axel Uhl
e1425d7e5e
fixed duration test after changing toString representation
2014-11-26 07:30:53 +01:00
Axel Uhl
940ea72677
Merge branch 'master' into bug2465
2014-11-26 00:43:27 +01:00
Axel Uhl
249b276f19
fixed toString on MillisecondsDusationImpl regarding unit display
2014-11-26 00:42:51 +01:00
Axel Uhl
565c9d9225
made the map storing the sessions scheduled for onChange notifications in a static instead of an instance map
2014-11-26 00:34:01 +01:00
Axel Uhl
b3a0ba280f
delay the sending of change notifications for a Session.touch() event
2014-11-25 21:43:42 +01:00
Axel Uhl
64f64f661d
removed the no longer needed clear... methods from the security MongoObjectFactory again
2014-11-25 14:02:21 +01:00
Axel Uhl
eb63284306
updated "REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl" in wiki description for replica start-up
2014-11-25 09:38:24 +01:00
Axel Uhl
30caf7d0ea
Merge branch 'master' into bug2465
2014-11-25 09:20:36 +01:00
Axel Uhl
c5cc680a31
added PDF describing TracTrac's external REST APIs to com.tractrac.clientmodule/doc
2014-11-25 09:20:06 +01:00
Axel Uhl
b5b0c61b1c
fixing Shiro session replication by not replacing the caches but replacing the cache contents;
...
Shiro seems to hold long-term references to the caches handed out by the CacheManager. Replacing those
caches during initial load doesn't help. They need to have their *contents* replaced instead.
2014-11-24 23:21:47 +01:00
Axel Uhl
7f345c0880
fixing serialization of ReplicatingCache, making securityService transient
2014-11-24 18:26:02 +01:00
Axel Uhl
b3942707c6
fixed issue with ReplicatingCache in the context of ReplicatingCacheManager
2014-11-24 18:22:39 +01:00
Axel Uhl
add7d499e1
Merge branch 'master' into bug2465
2014-11-24 18:21:52 +01:00
Axel Uhl
8ebab4ca50
basic authentication and session replication is in place; no longer use EhCache as it seems very tricky to replicate; still issues with details of session authentication replication
2014-11-24 17:56:43 +01:00
Axel Uhl
Jan Broß
fmittag
Fredrik Teschke