Fredrik Teschke
cd5b1bc1d0
change naming of RegattaLike registration methods
2014-12-24 10:07:09 +01:00
Fredrik Teschke
01864a92b8
Merge branch 'regatta-log' of sapsailing.com:/home/trac/git into regatta-log
2014-12-23 14:09:50 +01:00
Fredrik Teschke
081c46b11c
add persistence for regatta log
2014-12-23 14:09:00 +01:00
Axel Uhl
d761546343
Merge branch 'master' into regatta-log
2014-12-23 12:24:34 +01:00
Axel Uhl
9b2dab7518
use NamedReentrantReadWriteLock and LockUtil consistently in polar service
2014-12-23 12:12:32 +01:00
Axel Uhl
608330e826
Merge branch 'master' into regatta-log
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2014-12-22 14:22:32 +01:00
Fredrik Teschke
a6c17ad1ec
Merge remote-tracking branch 'origin/master' into regatta-log
...
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingAdapter.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
2014-12-19 14:31:41 +01:00
Axel Uhl
1a67e2b5b3
Merge branch 'master' into bug2502
2014-12-19 08:48:58 +01:00
Axel Uhl
cebfa0b7ad
Merge branch 'master' into structureImport
...
Conflicts:
java/com.sap.sailing.gwt.ui/pom.xml
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_ru.properties
2014-12-18 09:06:06 +01:00
Axel Uhl
4f7afa891d
use NamedReentrantReadWriteLock and LockUtil in master data import
2014-12-17 15:24:23 +01:00
Nicolas
639a8926af
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.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
2014-12-14 17:01:29 +01:00
Alexander Ries
fb300c8a8a
check if orientation is null at onorientationChange event
2014-12-14 15:26:38 +11:00
Axel Uhl
066b6daca4
added "boolean preemptive" parameter to Tracker.stop() method, passing it through for TracTracRaceTrackerImpl;
...
using it to stop trackers immediately when clearing RacingEventService for initial load, as well as when the
timeout expires or when the regatta is untracked.
2014-12-13 22:17:12 +01:00
Axel Uhl
c912ccb857
fixed finding of regatta in raceTrackersByRegatta; did look it up using TrackedRegatta instead of Regatta
2014-12-13 21:53:26 +01:00
Axel Uhl
3b0ea9aeb1
avoiding NPE during clearing state at beginning of replication when there are no race trackers for a regatta
2014-12-13 18:15:48 +01:00
Axel Uhl
e9f5185a83
fix for bug 2507, re-establishing the raceLogReplicator as listener on RegattaImpl and FlexibleLeaderboardImpl after initial load
2014-12-13 01:23:13 +01:00
Nicolas
9b0fe47ee3
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.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/server/SailingServiceImpl.java
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2014-12-11 19:59:45 +01:00
Axel Uhl
c757548fae
Merge branch 'master' into structureImport
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.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.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-12-11 18:15:44 +01:00
Fredrik Teschke
6608da120f
Merge remote-tracking branch 'origin/master' into regatta-log
...
Conflicts:
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2014-12-11 11:19:39 +01:00
Axel Uhl
163e7ca0f6
making the ThreadLocal objectcs instance variables in the Replicables helps the tests that failed due to a lack of isolation between the many Replicable objects in the same VM
2014-12-11 10:06:36 +01:00
Axel Uhl
64451c2702
fixing bug 2493; introduced a ThreadLocal telling whether replica is receiving initial load or running a master operation; not firing back to master if this flag is set
2014-12-11 09:57:18 +01:00
Frederik Petersen
f03cacd7cf
Rechecked polar bundle in launch configs
...
these were overridden in previous merges
2014-12-10 13:01:16 +01:00
Axel Uhl
13474b7137
fixed initialization of discard threshold field in series edit/create dialogs; added structureimport to launch configs
2014-12-09 15:52:13 +01:00
Fredrik Teschke
ae0daa4b23
improve RegattaLike naming, documentation and implementation
2014-12-08 09:16:37 +01:00
Fredrik Teschke
01a972093f
preparations to replicate RegattaLog in RacingEventServiceImpl
2014-12-05 20:01:01 +01:00
Fredrik Teschke
27f325e1cd
simplify events for RegattaLog replication
2014-12-05 18:27:38 +01:00
Fredrik Teschke
6d836fdfe4
refactored and simplified RaceLogIdentifier logic (so it can be reused for RegattaLog-IDs)
2014-12-05 17:36:00 +01:00
Fredrik Teschke
92bdc0f266
make test race-condition safe: wait until loading fixes based on RegattaLog is finished
2014-12-05 11:44:25 +01:00
Fredrik Teschke
91316dd4b1
use regattalog in RaceLogRaceTracker and TrackedRace
2014-12-05 10:13:24 +01:00
Fredrik Teschke
78b7f1c3b7
only let RegattaLeaderboard and FlexibleL have a RegattaLog
2014-12-05 04:00:36 +01:00
Nicolas
d9ccf1f817
Added String message.
2014-12-05 00:36:15 +01:00
Axel Uhl
c979f8f214
added xrr bundles to launch configs; added StructureImportPanel to AdminConsole's Connector panel; added missing string properties and fixed table selection model
2014-12-04 15:25:46 +01:00
Fredrik Teschke
4f27218192
instead of null use EmptyRegattaLogStore
2014-12-04 14:18:36 +01:00
Fredrik Teschke
3d2639987a
pass null as RegattaLogStore for now
2014-12-04 11:15:20 +01:00
Fredrik Teschke
2c986f7be9
Merge branch 'ftes-regatta-log' into regatta-log
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateDuringNonAtomicSerializationTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-12-04 10:32:18 +01:00
Fredrik Teschke
3df5c8f72d
Merge remote-tracking branch 'origin/racelog-to-abstract-log-refactoring' into regatta-log
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-12-04 10:01:17 +01:00
Axel Uhl
c86da39976
reverted SailingServer (Proxy).launch to master version
2014-12-03 17:10:35 +01:00
Axel Uhl
4550f975dc
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
java/pom.xml
2014-12-03 13:10:20 +01:00
Axel Uhl
656118dae0
Merge branch 'master' into structureImport; pretty broken; in particular ListEditorComposite and SailingService will need close review for phony changes
...
Conflicts:
java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleFeatures.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FleetListEditorComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaManagementPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsEditDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsListEditor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.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_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java
java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/ScoreCorrectionProviderImpl.java
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.xrr.resultimport.test/src/com/sap/sailing/xrr/resultimport/test/ParserTest.java
java/com.sap.sailing.xrr.resultimport/src/com/sap/sailing/xrr/resultimport/impl/ScoreCorrectionProviderImpl.java
java/com.sap.sailing.xrr.resultimport/src/com/sap/sailing/xrr/resultimport/impl/XRRParserUtil.java
java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/listedit/ListEditorComposite.java
java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/listedit/StringListEditorComposite.java
2014-12-03 10:54:12 +01:00
Nicolas
d3a4a6984a
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
2014-12-02 20:37:08 +01:00
Axel Uhl
a8ddb0bfbf
Merge remote-tracking branch 'server/master'
2014-12-02 18:25:42 +01:00
Fredrik Teschke
f2bbda6fd9
begin adding RegattaLogStore
2014-12-01 23:39:08 +01:00
Axel Uhl
6fecb642a4
moved interface containing the clearState method to SSE; will add it to SecurityService as well; clearing servlet already finds all implementing services
2014-12-01 15:53:59 +01:00
Nicolas
31d920d4e7
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceLogListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
2014-11-30 14:05:02 +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
28d708b6c7
fixing bug 2480 for RacingEventService replication by implementing isRequiresExplicitTransitiveReplication correctly on all RacingEventServiceOperations
2014-11-28 17:27:20 +01:00
Jan Broß
4ca3333e69
Added regattaLog replication for regattas (flexible leaderboard missing so far)
2014-11-28 17:08:05 +01:00
fmittag
3eea2fe247
added 'startDate' and 'endDate' attribute to Regatta (persistence, replication and gateway)
2014-11-28 13:45:01 +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
9bf3d7c9c7
pull shared events and analyzers onto AbstractLog level
2014-11-27 01:26:53 +01:00
Fredrik Teschke
Axel Uhl
Nicolas
Alexander Ries
Frederik Petersen
Jan Broß
fmittag