Commit Graph
100 Commits
Author SHA1 Message Date
Fredrik Teschke c8fc3f7435 Merge branch 'master' of sapsailing.com:/home/trac/git into ftes-import-abstract-from-routeconverter 2014-05-30 01:30:51 +02:00
Fredrik Teschke 2396ff0ed7 make file stream reusable in import servlet, and added testcase 2014-05-30 01:28:00 +02:00
Fredrik Teschke f046521bfe abstracted import functionality, so that it is route-converter independent
- use OSGi service registry to register and find import services
- user may specify importer to use, or else rely on file-extension based resolution
- moved and renamed some import/export classes
2014-05-30 00:02:31 +02:00
Fredrik Teschke ec9d6897e5 fixed tab indent 2014-05-29 23:58:07 +02:00
Fredrik Teschke 203b4b2176 ignore failing test case for loading fixes for now: further investigation on branch ftes-failing-testcase-loading-fixes 2014-05-23 20:30:07 +02:00
Fredrik Teschke 7c3b835ca6 improved JavaDoc for Revokable 2014-05-23 15:39:40 +02:00
Fredrik Teschke 24b9ced4d9 fix spelling error in javadoc 2014-05-23 15:37:09 +02:00
Fredrik Teschke b0c51a5419 Merge branch 'master' of sapsailing.com:/home/trac/git 2014-05-23 15:34:56 +02:00
Fredrik Teschke 0622d4d2ab don't throw exception when trying to revoke event that already was revoked 2014-05-23 15:34:17 +02:00
Fredrik Teschke aa95162f8f add failing testcase for two clients that revoke the same racelog event 2014-05-23 11:31:23 +02:00
Fredrik Teschke a176b0a17e Merge remote-tracking branch 'origin/master' 2014-05-19 01:41:18 +02:00
Fredrik Teschke 064e8452ef add string representation to serialization output of placeholder identifier for adminconsole 2014-05-19 01:40:58 +02:00
Fredrik Teschke e822886017 Merge remote-tracking branch 'origin/master' 2014-05-19 01:13:28 +02:00
Fredrik Teschke 650fa9e47d fix wrong assumption in test and buggy assert in tracking adapter 2014-05-19 01:13:14 +02:00
Fredrik Teschke a41c6ff7e4 add images for racelog-tracking screenshot walkthrough in wiki 2014-05-19 00:58:14 +02:00
Fredrik Teschke f65350326a fix NullPointerE in first check if mappings were already loaded 2014-05-19 00:09:55 +02:00
Fredrik Teschke d982116d3d Merge remote-tracking branch 'origin/master' 2014-05-19 00:05:10 +02:00
Fredrik Teschke 02977bd163 add convenience UI for importing tracks and directly mapping them to competitors 2014-05-19 00:05:01 +02:00
Fredrik Teschke 0a3ec9f9c0 switched around order of adding StartTracking event and adding the RaceLogRaceTracker as listener 2014-05-16 13:36:25 +02:00
Fredrik Teschke 193fa889fa removed unnecessary printStackTrace after logger output 2014-05-16 01:52:45 +02:00
Fredrik Teschke 74558da53a group listener registrations on GPSFixStore by device identifiers 2014-05-16 01:50:49 +02:00
Fredrik Teschke cf57834034 catch non-detected port and starboard marks 2014-05-16 01:08:25 +02:00
Fredrik Teschke a37291626b removed course from test, that caused mark passing inference to fail due to missing mark positions 2014-05-16 00:54:23 +02:00
Fredrik Teschke 2ed0ead422 Merge remote-tracking branch 'origin/master' 2014-05-16 00:28:04 +02:00
Fredrik Teschke 5bfea9d309 removed unnecessary wait in test 2014-05-16 00:27:32 +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 c9bfef9848 removed overly redundant repitition of Marks in the RaceCourseDTO and nested DTOs 2014-05-09 09:48:47 +02:00
Fredrik Teschke 4dc1ae1ea1 add support for alle track file formats natively supported by RouteConverter 2014-05-09 07:39:47 +02:00
Fredrik Teschke c8a202af26 added missing debug IDs that went lost during refactoring 2014-05-09 06:32:05 +02:00
Fredrik Teschke 7e9274d35a changed serialization type of GPSFixes for MongoDB to DBObject instead of Object 2014-05-08 23:46:48 +02:00
Fredrik Teschke 4dae5ea4c8 added missing debug id to leaderboard table (deleted by accident during refactoring) 2014-05-08 23:31:06 +02:00
Fredrik Teschke 0db5134478 changes to race log tracking diagram text 2014-05-08 19:13:14 +02:00
Fredrik Teschke 50cc4716bc added numbers to race log tracking arch diagram 2014-05-08 19:10:16 +02:00
Fredrik Teschke 515a575910 Add source file (odg) for race log tracking architecture diagram 2014-05-08 19:06:22 +02:00
Fredrik Teschke 9647a607e5 fixed further test concerning device id serialization and logic of placeholder identifier 2014-05-08 18:26:50 +02:00
Fredrik Teschke 329c4556b4 fixed test error in deserializing device identifiers by reworking logic of placeholder device id 2014-05-08 18:24:16 +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
Fredrik Teschke 0f1efe52db changed serializers to deal with switch serialization pair 2014-05-02 13:49:46 +02:00
Fredrik Teschke 1c81230e8c switched around deviceId serialization pair, 'prettified' device mapping table 2014-05-02 13:41:17 +02:00
Fredrik Teschke 49ca30c0a1 added additional fields to track file import identifier 2014-05-02 12:52:50 +02:00
Fredrik Teschke bf8ebdc09a fixed locking bug that was introduced by e022fe57e0 2014-05-02 12:08:59 +02:00
Fredrik Teschke fdde85a9e1 Merge remote-tracking branch 'origin/gpsfixstore-independent-of-race' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-05-02 04:13:07 +02:00
Fredrik Teschke 42daff4758 added DeviceIdentifierDTO and track file import to adminconsole 2014-05-02 04:11:31 +02:00
Fredrik Teschke fc93d50c1b fixed bug: made RaceLogTrackingInfoDTO serializable 2014-05-02 03:49:45 +02:00
Fredrik Teschke b9e28d811b added track file import 2014-05-02 03:41:19 +02:00
Fredrik Teschke 6467222dd9 added device identifier for imports from track files 2014-05-02 01:03:55 +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
Fredrik Teschke 939bec4307 tabs to spaces in trackfiles 2014-05-01 22:56:28 +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
Fredrik Teschke e2a25847b0 documented backward-compatible change to parsing of NMEA sentence 2014-04-29 13:35:16 +02:00
Fredrik Teschke 6f557fc6cf don't have to correct for magnetic variation, as GPS gives course over ground 2014-04-29 13:29:39 +02:00
Fredrik Teschke c4ea026c8a changed to use of Arrays.asList 2014-04-29 13:10:31 +02:00
Fredrik Teschke 0df7b5895a only enable setting competitor-boatclass when adding a new competitor 2014-04-29 13:08:32 +02:00
Fredrik Teschke 658fb95733 revert change that made boatClass non-final 2014-04-29 13:05:54 +02:00
Fredrik Teschke 14645a8f98 remove unusded registrations set from persistence activator 2014-04-29 00:33:29 +02:00
Fredrik Teschke d55144a9cc removed unused function interface 2014-04-29 00:30:51 +02:00
Fredrik Teschke 625564d4d2 use racelog tracking info DTO instead of putting rl-tracking data in FleetDTO 2014-04-29 00:25:34 +02:00
Fredrik Teschke dd9d1ebfc2 removed field from AbstractLeaderboardDTO, instead prevent this by raising an exception 2014-04-29 00:08:35 +02:00
Fredrik Teschke fe04a8eb25 change to two marks for offset passing instruction 2014-04-28 23:54:59 +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
Fredrik Teschke ab6ae2429d delete BaceRaceColumnListener, because unused 2014-04-28 23:30:09 +02:00
Fredrik Teschke b47ae6b263 renamed architecture image files 2014-04-26 18:05:18 +02:00
Fredrik Teschke f6351414fc Merge branch 'master' of sapsailing.com:/home/trac/git 2014-04-26 16:34:29 +02:00
Fredrik Teschke d50e3ff898 add architecture doc/image for racelog tracking 2014-04-26 16:34:21 +02:00
Fredrik Teschke 2389484277 fixed error due to change of racelog interface 2014-04-26 14:47:46 +02:00
Fredrik Teschke 2fd03af659 added copying for comp. registrations + course, with new popup for selecting races 2014-04-26 14:34:15 +02:00
Fredrik Teschke be28101cef DefineMarkEvent as revokable, added new finder for events of type 2014-04-26 14:32:17 +02:00
Fredrik Teschke 3932dd4bdd don't require revokable in revokeEvent(), instead throw exception 2014-04-26 14:31:09 +02:00
Fredrik Teschke c76592c560 changed text of add gate button 2014-04-25 10:17:43 +02:00
Fredrik Teschke 2642d33f66 remove race selection after refreshing leaderboard 2014-04-25 10:14:50 +02:00
Fredrik Teschke ec15b110c8 include race id in denoteForTrackingEvent -> allows choosing custom stable ID 2014-04-24 07:18:37 +02:00
Fredrik Teschke 70ae0e9543 3-table course designer 2014-04-24 06:59:25 +02:00
Fredrik Teschke 7fa3e066b6 pulled out link creation for raceboards, using EntryPointLinkFactory 2014-04-24 02:20:12 +02:00
Fredrik Teschke 83610c20bb simplified derivation of device mappings from mapping events 2014-04-24 01:12:55 +02:00
Fredrik Teschke 7508b7ccee defined passing instruction applicability to 1/2 mark-controlpoints 2014-04-24 00:53:38 +02:00
Fredrik Teschke ec882d37f1 allow for any RGB color in MarkEditDialog 2014-04-24 00:08:03 +02:00
Fredrik Teschke 8a0d1a9203 confirm if races without competitor registrations should be tracked 2014-04-23 23:36:43 +02:00
Fredrik Teschke 17f718edc0 allow removing denotation for racelog tracking from racelogs 2014-04-23 23:16:59 +02:00
Fredrik Teschke 3524639080 added method for revoking events to racelog 2014-04-23 23:16:33 +02:00
Fredrik Teschke 13a1776cc0 simplified steps for racelog-tracking 2014-04-23 21:24:24 +02:00
Fredrik Teschke 764b30ac50 updated SailingGWT.launch to version from master, including sse in classpath 2014-04-07 23:52:53 +02:00
Fredrik Teschke 8371a727b5 Merge branch 'master' into gpsfixstore-independent-of-race 2014-04-07 23:44:59 +02:00
Fredrik Teschke bb89cc363f removed WebSocket module from AdminConsole entry point 2014-04-07 23:44:36 +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 bae50abce2 Merge remote-tracking branch 'origin/master' 2014-04-07 23:16:10 +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 b5c1abfe32 Merge branch 'master' into gpsfixstore-independent-of-race 2014-04-07 18:26:35 +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
Fredrik Teschke caa84807c1 populate AddDeviceMappingDialog with old data, if error occured 2014-03-28 13:20:42 +01:00
Fredrik Teschke 92aef41f0c introduced smartphone UUID identifier as standard, imei identifier for testing only 2014-03-28 11:42:42 +01:00
Fredrik Teschke cf2fe722b9 set passing instructions in course management widget 2014-03-28 10:54:05 +01:00
Fredrik Teschke 18ad69d7d3 keep track of event ids responsible for device mappings 2014-03-17 00:04:49 +01:00
Fredrik Teschke 92a8d01bb2 made device mapping table sortable 2014-03-16 23:14:26 +01:00
Fredrik Teschke 22ee1ac10f close device mapping via admin console 2014-03-16 23:09:49 +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 7080b706e9 added device mapping table to dialog 2014-03-16 21:52:33 +01:00
Fredrik Teschke 3796fc975e pulled out generic table wrapper 2014-03-16 21:09:35 +01:00
Fredrik Teschke a716775c44 added closing event for open ended device mappings 2014-03-16 20:46:16 +01:00