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
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
48e9aba687
introduced signed cross track error; renamed previous cross track error calculations to "absolute" accordingly
2014-04-29 18:27:55 +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
Fredrik Teschke
658fb95733
revert change that made boatClass non-final
2014-04-29 13:05:54 +02:00
Fredrik Teschke
e022fe57e0
used separate flags and logs for loading from windStore and gpSFixStore in tracked race
2014-04-28 23:54:18 +02:00
Axel Uhl
b576a7a141
Merge branch 'master' into gpsfixstore-independent-of-race
...
Conflicts were mainly around the introduction of GPSFixStore combined with the introduction of raceName in the SwissTiming connector and
the StartList coming from Manage2Sail
Conflicts:
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
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-04-28 15:14:04 +02:00
Axel Uhl
300639d786
avoid NPE when SwissTiming socket couldn't be opened
2014-04-25 13:56:53 +02:00
Fredrik Teschke
bf31f4c1ea
Merge branch 'master' into gpsfixstore-independent-of-race
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling.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 (No Proxy, winddbTest).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-04-07 23:35:57 +02:00
Fredrik Teschke
e2bde6370d
added missing dataming bundles to launch configs
2014-04-07 22:16:08 +02:00
Fredrik Teschke
b280e1aa1a
added missing apache.commons.lang to launch configs
2014-04-07 22:12:36 +02:00
Fredrik Teschke
5270eb7426
used fresh versions of launch configs from master, as launch order was messed up
2014-04-07 18:32:50 +02:00
Fredrik Teschke
821f1307bf
Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractTimePoint.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
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.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java
java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMRMarkPassingTest.java
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/tracking/impl/DynamicTrackedRaceImpl.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.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/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/LeaderboardConfigPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceCourseManagementPanel.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/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.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
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, 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
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
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
2014-03-28 18:34:58 +01:00
Axel Uhl
b78eaa095d
re-added manage2sail bundle to launch configs
2014-03-22 15:50:12 +01:00
Axel Uhl
e978666d6d
Merge branch 'master' into swisstiming-2.0
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
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.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, 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-03-22 15:46:26 +01:00
Axel Uhl
54010ef6d5
Merge remote-tracking branch 'server/sse_gwt_refactoring'
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SetStartTimeDialog.java
2014-03-22 14:55:36 +01:00
Axel Uhl
3d227edea0
adjusted name and Javadoc for SailingService.getStartTime which now also returns the racing procedure
2014-03-22 14:35:24 +01:00
Axel Uhl
61fbcfd26a
setStartTime was changed to setStartTimeAndProcedure; the parameter type and the respective method on RacingEventService needed according renaming
2014-03-22 14:34:50 +01:00
Simon Pamies
b7dafe6353
Adapted set start time dialog to also set the racing procedure right
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2014-03-22 14:28:16 +01:00
fmittag
61b5bbe2be
added new bundle com.sap.sailing.manage2sail to have a place for common manage2sail related code
2014-03-19 17:43:36 +01:00
fmittag
c902ddeea3
Merge remote-tracking branch 'origin/dataMining' into sse_gwt_refactoring
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/AbstractEntryPoint.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/datamining/DataMiningEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/PolarSheets.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/VideoPopup.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
java/com.sap.sailing.server/SailingServer (No Proxy).launch
2014-03-18 14:29:55 +01:00
fmittag
26379cff1a
Merge remote-tracking branch 'origin/master' into sse_gwt_refactoring
...
Conflicts:
java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-03-18 13:13:58 +01:00
Lennart Hensler
42569d1b07
Merge remote-tracking branch 'origin/master' into dataMining
...
Conflicts:
java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-03-17 22:25:39 +01:00
Axel Uhl
e293866128
added implementation and test case for the flexible leaderboard column rename use case;
...
race log for a renamed column must be migrated in DB which in particular requires removing the race log
events under their old race log identifier key
2014-03-17 16:10:32 +01:00
Axel Uhl
9bdbdbe093
warn user of race log removal in case the race list of a regatta series is modified
2014-03-17 15:33:26 +01:00
fmittag
64b0f8ee8a
moved com.sap.sailing.common.filter package content to com.sap.sse.common and added com.sap.sse.common bundle to all launch configurations
2014-03-17 14:32:10 +01:00
Fredrik Teschke
8028bb55b0
don't capture class object in exception, GWT can't deal with generic class object
2014-03-16 23:09:31 +01:00
Fredrik Teschke
9c8f02deed
display and edit device mappings in admin console
2014-03-16 15:41:20 +01:00
Lennart Hensler
a6dbf58d7e
Merge remote-tracking branch 'origin/master' into dataMining
...
Conflicts:
java/com.sap.sailing.datamining.shared/META-INF/MANIFEST.MF
java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java
java/com.sap.sailing.datamining/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-03-15 08:18:56 +01:00
D049941
b27d364ac0
Launch configurations fixed
2014-03-14 15:52:37 +01:00
Axel Uhl
3351645f4a
Merge remote-tracking branch 'server/master'
2014-03-12 15:59:41 +01:00
fmittag
0569fa54c7
Merge remote-tracking branch 'origin/master'
2014-03-12 15:34:35 +01:00
Axel Uhl
18d3935ba6
Merge branch 'bug1666'
2014-03-12 15:27:13 +01:00
Axel Uhl
688b50ae5d
fixed remaining issue described in bug1666 comment #7 by explicitly storing race log events after receiving them instead of re-adding them
2014-03-12 08:42:03 +01:00
Axel Uhl
528b14b10e
refactored according to comment #3 on bug 1666: race log now is "merged" upon re-load instead of replaced;
...
Tests are required for the merging logic.
2014-03-12 00:04:17 +01:00
Axel Uhl
c5bbc7566a
interims uncompilable commit that still follows the idea of replicating the RaceLogLoaded operation which is invalidated by bug 1666 comment #3 .
2014-03-11 23:08:19 +01:00
Axel Uhl
ccff8becb0
suggestion for a fix to bug 1845. MasterDataImportTest still all green
2014-03-11 21:41:04 +01:00
Axel Uhl
beef855a02
refactored race log replication operations such that now it should be straightforward to introduce a race log reloaded operation
2014-03-10 18:13:00 +01:00
Fredrik Teschke
1ebed6373e
changes to placeholder identifier and (de)serialization
2014-03-10 15:00:35 +01:00
Axel Uhl
ba4a4d4ceb
removed gateway.test.support bundles from default launch configs again
2014-03-10 11:40:49 +01:00
Axel Uhl
fa69e108e0
added the gateway.test.support bundle to autostart for the local launch configs and use default Windows Firefox location in test environment
2014-03-10 11:00:29 +01:00
Fredrik Teschke
9cffd20913
added ping mark functionality to adminConsole
2014-03-07 22:42:14 +01:00
Lennart Hensler
2fbf86c9e7
Merge remote-tracking branch 'origin/master' into dataMining
2014-03-06 17:23:07 +01:00
Fredrik Teschke
ca783d378a
add getter for CompetitorStore to RacingEventService
2014-03-06 16:57:07 +01:00
fmittag
9c631e2ad6
Merge remote-tracking branch 'origin/master' into gwt26
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-03-06 16:03:11 +01:00
fmittag
8bf5a48b38
corrected manifest.mf for gateway.test.support bundle and added autostart property to ensure that this web bundle is always running
2014-03-06 16:00:59 +01:00
Fredrik Teschke
Axel Uhl
Simon Pamies
fmittag
Lennart Hensler
D049941