Commit Graph
1211 Commits
Author SHA1 Message Date
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
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
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
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
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 bcf70a7497 Merge branch 'master' into tracapi
Merge conflict was only in comments and had to do with renaming of event to regatta which happened a long time ago

Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-04-28 14:46:36 +02:00
Axel Uhl 300639d786 avoid NPE when SwissTiming socket couldn't be opened 2014-04-25 13:56:53 +02:00
Axel Uhl 52e0bb12b4 factored construction of default regatta parameters for an IRace; used this to remove any existing tracked race from the correct default regatta 2014-04-11 00:54:46 +02:00
Axel Uhl 793af4f175 Merge branch 'master' into tracapi 2014-04-08 08:51:28 +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 e959d76417 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.java
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/pom.xml
2014-03-27 14:37:41 +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