Axel Uhl
c0b4c26cc0
Merge branch 'master' into newhome
2014-05-21 14:26:34 +02:00
Axel Uhl
59f8d49640
Merge branch 'master' into tracapi
2014-05-21 00:14:05 +02:00
Axel Uhl
c51ded4a92
fixed initial load serialization for remote sailing server references with proper logging
2014-05-19 23:20:03 +02:00
Axel Uhl
b6fc523852
moved functionality of remote server reference and event cache management to new class RemoteSailingServerSet
2014-05-19 23:02:35 +02:00
Axel Uhl
3d14fbc546
made robust for remote server URLs entered without http:// prefix; fixed error handling for remote server refs
2014-05-19 22:37:45 +02:00
Axel Uhl
732551bcc5
named event cache updater thread
2014-05-19 22:23:30 +02:00
Axel Uhl
f6a41cbb7e
renamed RemoveSailingServer to RemoveRemoteSailingServerReference
2014-05-19 22:16:59 +02:00
Axel Uhl
5d552525ec
hold remote server references in memory in RacingEventService and periodically update event cache
2014-05-19 22:13:44 +02:00
Axel Uhl
a1b80d9695
worked through remote server config UI
2014-05-19 17:14:52 +02:00
Axel Uhl
d5442bd2e8
slight change in how obtaining the remote events works
2014-05-19 16:16:21 +02:00
Axel Uhl
a60be3850a
formatting and naming
2014-05-19 15:47:45 +02:00
Axel Uhl
62f1e5620c
Merge branch 'master' into bug1930
2014-05-19 14:48:00 +02:00
Benjamin Ebling
ad1d63effd
Initial simple user management
2014-05-16 11:06:59 +02:00
Axel Uhl
c47259dfea
Merge branch 'master' into tracapi
2014-05-15 09:45:57 +02:00
Axel Uhl
6d9cfbd637
fixed an unlocking statement (had accidentally used unlockAfterRead after a lockForWrite)
2014-05-15 09:44:40 +02:00
Axel Uhl
5a811465cd
Merge branch 'master' into tracapi
2014-05-15 07:39:29 +02:00
Axel Uhl
102caa8f76
replaced ConcurrentSkipListSet by Collections.newSetFromMap(new ConcurrentHashMap()) which doesn't require comparability
2014-05-15 07:37:21 +02:00
Axel Uhl
4428f71388
Merge branch 'master' into tracapi
2014-05-15 00:06:30 +02:00
Axel Uhl
aff7ecef7a
added missing concurrency protection to regattasByName by using a lock
2014-05-15 00:04:54 +02:00
Axel Uhl
77bea92fde
implemented locking instead of synchronization (see bug 1935) for regattaTrackingCache
2014-05-14 23:13:16 +02:00
Axel Uhl
587824d807
replaced use of synchronized for raceTrackersByRegatta by the use of a corresponding lock
2014-05-14 22:57:58 +02:00
Axel Uhl
5a3defcf82
avoid needless iteration across all regattas' trackers when regatta is known in all callers
2014-05-14 21:31:46 +02:00
Axel Uhl
de395104b1
turned regattasObservedForDefaultLeaderboard into a ConcurrentSkipListSet to avoid the use of synchronized
2014-05-14 21:23:40 +02:00
Axel Uhl
cf49175417
fixed the consistent use of raceTrackersByIDLocks for write access to raceTrackersByID
2014-05-14 21:20:34 +02:00
Axel Uhl
40d57dbdda
working on the completion of bug 1935 regarding the consistent use of locks instead of synchronized where possible
2014-05-14 21:09:05 +02:00
fmittag
26d9fc7c34
Merge remote-tracking branch 'origin/master' into newhome
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
2014-05-14 17:39:20 +02:00
Axel Uhl
2ea2457409
added net.sf.marineapi to Jetty on 8889 launch config with Proxy
2014-05-14 13:11:59 +02:00
Axel Uhl
5c2fc3b888
Merge branch 'master' into tracapi
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-05-13 20:21:33 +02:00
fmittag
57f5698712
added a method in the SailingService to read all events from all registered sailing servers for the new homepage
2014-05-13 18:53:45 +02:00
fmittag
908f0bc6c7
Implemented replication operations for adding and removing a sailing server instance
2014-05-13 16:07:05 +02:00
Benjamin Ebling
ed5f7f88d1
Merge branch 'master' into usermanagement
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).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
2014-05-13 14:28:31 +02:00
fmittag
2e0916cdd5
Made use of futures for the parallel reading of events from distributed sailing servers
2014-05-13 13:49:50 +02:00
fmittag
aa09ed79e2
Merge remote-tracking branch 'origin/master' into bug1930
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-05-13 10:52:51 +02:00
Simon Pamies
780d1ec12c
Somehow marineapi has been missing from the dependencies
2014-05-13 09:14:12 +02:00
fmittag
9f19c84237
connected UI and backend to manage sailing server instances and to read the list of events from all registerd sailing servers
2014-05-12 17:51:52 +02:00
fmittag
d4820f2c98
added loading and storing for SailingServer instances
...
improved admin UI
2014-05-12 14:16:52 +02:00
Axel Uhl
d4c3b5309d
Merge branch 'master' into tracapi
2014-05-10 18:14:02 +02:00
Fredrik Teschke
4b4b61b6c5
Merge remote-tracking branch 'origin/master' into ftes-rltracking
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.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/GPSFixTrackImpl.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/server/SailingServiceImpl.java
2014-05-09 20:30:32 +02:00
Fredrik Teschke
9c3524bddc
fixed error introduced by using two locks for wind and gps fix store in tracked race
2014-05-08 18:16:30 +02:00
Axel Uhl
7ca425d4a2
added observer pattern for Competitor, Team, Boat and Person
2014-05-07 22:57:27 +02:00
fmittag
270537177e
Merge remote-tracking branch 'origin/master' into newhome
2014-05-03 15:27:29 +02:00
fmittag
bb34b9e5d3
some playaround with the new main.css
2014-05-03 15:26:38 +02:00
Fredrik Teschke
bf8ebdc09a
fixed locking bug that was introduced by e022fe57e0
2014-05-02 12:08:59 +02:00
Fredrik Teschke
fb0f187d55
Merge branch 'gpsfixstore-independent-of-race' into ftes-gpximport
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/SailingDomain.gwt.xml
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.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/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.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.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/server/SailingServiceImpl.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-05-01 23:05:08 +02:00
Axel Uhl
356968b852
Merge branch 'master' into tracapi
...
Conflicts:
java/target/refreshInstance.sh
2014-05-01 19:06:25 +02:00
Axel Uhl
48e9aba687
introduced signed cross track error; renamed previous cross track error calculations to "absolute" accordingly
2014-04-29 18:27:55 +02:00
Axel Uhl
626bf0b672
as part of bug 1903, renamed RacesHandle to RaceHandle
2014-04-29 15:51:08 +02:00
Axel Uhl
ebb7ed03b9
Merge branch 'master' into tracapi
...
Conflicts:
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java
The conflict was caused by the fix that avoids null values being part of the collection returned by RaceHandleImpl.getRaces(...).
This has a relationship with bug 1903 (Change RacesHandle to RaceHandle).
2014-04-29 15:48:52 +02:00
Fredrik Teschke
2f3e1f9d66
Merge remote-tracking branch 'origin/gpsfixstore-independent-of-race' into gpsfixstore-independent-of-race
2014-04-29 13:40:41 +02:00
Axel Uhl
a716539ca4
working towards a solution for bug 1910; use asynchronous connectivity for SailMasterConnectorImpl so the timeout can work
2014-04-29 13:38:42 +02:00
Axel Uhl
Benjamin Ebling
fmittag
Simon Pamies
Fredrik Teschke