Commit Graph
358 Commits
Author SHA1 Message Date
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
Fredrik Teschke 92aef41f0c introduced smartphone UUID identifier as standard, imei identifier for testing only 2014-03-28 11:42:42 +01:00
Frederik Petersen 0f585068f2 Added wind export checkbox in master data import panel
allows the user to disable the wind export/import, which will lead to
significantly smaller data sizes
2014-03-18 15:25:50 +01:00
Fredrik Teschke 1ebed6373e changes to placeholder identifier and (de)serialization 2014-03-10 15:00:35 +01:00
Frederik Petersen aebca86fac Fixed bug 1825
this breaks import compability with any older versions
2014-03-06 10:10:47 +01:00
Frederik Petersen d35323fe0a Improved master data import tests and ...
...fixed bug in uncompressed import
2014-03-06 09:10:01 +01:00
Frederik Petersen 8d2e405c52 Started working on fixing bug 1825 2014-02-25 15:31:03 +01:00
Axel Uhl f96d2d62cb Working on a solution for bug 1807; call invalidate(...) after listener removal; ensure listeners are added also if oldCacheValue is present;
There is still a problem left: removing a series that has race columns doesn't seem to trigger listeners.
2014-02-24 13:24:55 +01:00
Simon Pamies b3e2d28753 Merged ess-singapore containing the temporary fix for the igtimi windbot gps miscalculation, the update of MAX_HOPS for tractrac stored data, the fix for the race committee app and max_speed for xml export 2014-02-24 10:19:13 +08:00
Fredrik Teschke 07f5efe154 Merge branch 'master' into gpsfixstore-independent-of-race
Conflicts:
	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/tracking/Track.java
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
2014-02-12 21:58:31 +01:00
Axel Uhl be2ac5f552 fixed example URL for single regatta restlet 2014-02-12 00:38:01 +01:00
Fredrik Teschke 5c714e5a31 restructured race log tracking: moved to racelogtrackingadapter bundles, renamed packages, moved some interfaces 2014-02-10 16:42:36 +01:00
Fredrik Teschke 713c6200df integrated TypeBasedServiceFinders with the racelog-tracking 2014-02-10 09:44:59 +01:00
Fredrik Teschke 9264620f5f added tests for RecordFixes servlet, and fixed a few related bugs 2014-02-09 22:32:27 +01:00
Fredrik Teschke cd7e77fa47 added RecordFixes servlet 2014-02-09 20:06:56 +01:00
Fredrik Teschke 87f7ebc18d added serialization of fixes, and device identifier 2014-02-09 19:45:17 +01:00
Frederik Petersen a3b029a1c4 Put master data resource url path in class annotation 2014-02-09 16:59:32 +01:00
Frederik Petersen c2a645a5ed Changed MasterDataResource location
and added test for race log event persistence
2014-02-09 16:49:08 +01:00
Frederik Petersen 89385d802f Moved TopLevelMasterData to domain package
removed unused master data json facilities
2014-02-09 16:08:59 +01:00
Frederik Petersen 627df08d9e Changed master data import to use java.io serialization
scorecorrections don't seem to work yet
2014-02-08 13:58:04 +01:00
Frederik Petersen 12c6451c8b Started changing master data export to use java binary object serializ. 2014-02-07 16:31:52 +01:00
Simon Pamies 8586e97849 Also displaying message if there are no wind fixes 2014-01-31 17:33:05 +01:00
Axel Uhl 53ed72bd5e Merge remote-tracking branch 'server/master'
Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/WindStatusServlet.java
2014-01-31 17:17:07 +01:00
Axel Uhl 454487fd2c share Igimi LiveDataConnection for equal combinations of device serial numbers 2014-01-31 16:49:36 +01:00
Simon Pamies dda547fd95 Fixed expedition integration 2014-01-31 16:46:17 +01:00
Simon Pamies 38cb52b589 Added wind status servlet that shows wind information for igtimi as well as expedition 2014-01-31 13:35:20 +01:00
Axel Uhl ce59ff176c Merge branch 'master' into racecommittee_app 2014-01-27 23:38:23 +01:00
Frederik Petersen d2d71945ec MasterDataImport now streams gzipped data while already responding 2014-01-27 22:56:03 +01:00
Axel Uhl 37b609d25a Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.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
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.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/RaceBoard.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RegattaOverview.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/Spectator.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/TvView.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/UserManagement.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
2014-01-21 22:51:44 +01:00
Axel Uhl a99b7cdd77 fixing bug 1511 by making gateway bundle non-lazy, moving the GWT cache web filter to gwt.ui bundle and removing dependency from gwt.ui to gateway 2014-01-10 17:05:03 +01:00
Axel Uhl a395400e34 don't activate the gateway web bundle lazily; it must be activated explicitly by load/startup order 2014-01-10 16:55:40 +01:00
Axel Uhl 01f2edb2ae avoid warnings in Selenium bundle; removed hard-coded file system path for Firefox executable for Selenium tests 2013-12-11 00:22:06 +01:00
Axel Uhl 1749cd54dd removed expedition dependency from RacingEventService 2013-12-09 15:37:31 +01:00
Lukas Niemeier 29f1892dce # added polling 2013-12-07 18:34:32 +01:00
Lukas Niemeier 69016652a1 Merge branch 'master' into racecommittee_app 2013-12-05 16:25:51 +01:00
Lukas Niemeier 061936c97e # renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
2013-12-04 16:18:33 +01:00
Frederik Petersen 398940d766 Fixed response encoding of jax-rs web services
also fixed master data import URI encoding and compress option handling
2013-12-04 10:37:49 +01:00
Lukas Niemeier 492124fd16 # renamed proceduresconfiguration to RegattaConfiguration 2013-12-04 02:49:46 +01:00
Lukas Niemeier 69ff32e1d8 # extended GateLineOpeningTime to store Golf-Down time
# added configuration to enable setting the Golf-Down time
# implemented Start prerequisites for all RacingProcedures
2013-12-02 18:33:08 +01:00
Lukas Niemeier 04e8671a11 Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-11-29 18:24:13 +01:00
Lukas Niemeier 453ac2b142 Merge branch 'master' into racecommittee_app
Conflicts:
	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.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-29 16:42:07 +01:00
Lukas Niemeier 30560c19bf # racing procedure configuration attached to regatta
# some help text in UI
2013-11-25 16:46:05 +01:00
Lukas Niemeier 773670d608 # revamped the configuration system to support remote configuration of racing procedures 2013-11-25 00:01:25 +01:00
Frederik Petersen 0fbf6071de Changed master data import to use gzip 2013-11-20 16:29:32 +01:00
Lukas Niemeier 953eaaa668 Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
2013-11-20 12:25:57 +01:00
Lukas Niemeier ad41f2e80c Merge branch 'master' into racecommittee_app
Conflicts:
	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.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-20 11:37:40 +01:00
Frederik Petersen a988003d15 Moved central windstore into racingeventservice
also removed addRace and addEvent services from legacy adminapp
2013-11-20 09:02:55 +01:00
Lukas Niemeier 54fe07eb68 # simplified the creation of a RaceState
# added a temp method to set the start time via regattaoverview
2013-11-19 11:58:16 +01:00
Lukas Niemeier f83e54e781 # split read and write part of state / racingprocedures
# EventRaceStatesJsonGetServlet uses (Readonly)RaceState now
2013-11-18 18:48:44 +01:00
Lukas Niemeier 58efde4c15 # default racing procedure and default course designer configurable for regtattas 2013-11-16 16:32:30 +01:00