Commit Graph
356 Commits
Author SHA1 Message Date
Axel Uhl 27f364323c removed obsolete TODO 2014-04-27 23:32:05 +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 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
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 a716775c44 added closing event for open ended device mappings 2014-03-16 20:46:16 +01:00
Fredrik Teschke 0961eb9003 changed structure of device identifier handlers, and added string serialization handler 2014-03-16 15:40:47 +01:00
Fredrik Teschke 1ebed6373e changes to placeholder identifier and (de)serialization 2014-03-10 15:00:35 +01:00
Fredrik Teschke 335e090ebc added placeholder identifier and ping identifier 2014-03-07 19:00:42 +01:00
Axel Uhl a77832e8b1 adjusted event (de)serialization tests so that serializer / deserializer are tested in conjunction;
Testing only the serializer doesn't catch deserialization errors for specific attribute states after
serializing them.
2014-03-07 18:10:07 +01:00
Axel Uhl 304339b8f6 maintain null values for event's start/end dates through serialization 2014-03-07 17:41:27 +01:00
Fredrik Teschke a6581093d8 added DefineMarkEvent 2014-03-07 10:54:21 +01:00
Fredrik Teschke 8282c77c63 restructured revoke event, introduced Revokable interface 2014-03-07 10:26:11 +01:00
Simon Pamies d06ed7dfc9 Make sure to handle cases where startDate or endDate are null 2014-03-06 22:42:25 +01:00
fmittag cb9a436476 made EventJsonSerializer null-safe for startDate and endDate 2014-02-27 15:50:15 +01:00
Fredrik Teschke 7132a31d34 Revert "added racelog editing to AdminConsole"
This reverts commit 7d00664ae6.

Conflicts:
	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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2014-02-26 14:48:35 +01:00
Fredrik Teschke ab94e53fc7 Revert "fixes in POMs to allow GWT client side to access code in serialization bundle"
This reverts commit d28b822aef.
2014-02-26 14:44:00 +01:00
fmittag b5bff27a10 Added startDate and endDate as new properties of the 'Event' domain class (including edit UI) 2014-02-24 16:04:33 +01:00
Fredrik Teschke d28b822aef fixes in POMs to allow GWT client side to access code in serialization bundle 2014-02-17 10:05:47 +01:00
Fredrik Teschke 1c9d3300db removed stored RaceLog in RaceLogConnectivityParams, instead fetch new from RacingEventService each time (might have changed) 2014-02-17 00:57:56 +01:00
Fredrik Teschke aa320ad2be two small fixes in JSON deserializers 2014-02-17 00:30:07 +01:00
Fredrik Teschke 2be2cac90e added from and to to serializer, were missing 2014-02-16 23:56:20 +01:00
Fredrik Teschke 7d00664ae6 added racelog editing to AdminConsole 2014-02-16 22:49:08 +01:00
Fredrik Teschke 904aa9c04b serialize and deserialize whole competitor/mark in RaceLogEvents, and then resolve against DomainFactory when deserializing 2014-02-16 10:58:35 +01:00
Fredrik Teschke f96cb785ad added RegisterCompetitorEvent for race log 2014-02-15 22:15:51 +01:00
Fredrik Teschke cca68ccf67 renamed CreateRaceEvent to more fitting StartTrackingEvent 2014-02-15 18:52:45 +01: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 c69e31a994 encorporate hasSplitFleetContiguousScoring in RESTlet output 2014-02-12 00:41:00 +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 0e8d95f887 Merge branch 'racelog-tracked-race' into gpsfixstore-independent-of-race
Conflicts:
	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/impl/NoAddingRaceLogWrapper.java
2014-02-10 09:25:52 +01:00
Fredrik Teschke 971a0405a2 added RaceLog events for RaceLog-based tracking 2014-02-10 09:08:01 +01:00
Fredrik Teschke 924c172364 Merge branch 'devicetype-identifier-json-serialization' into gpsfixstore-independent-of-race 2014-02-09 21:14:47 +01:00
Fredrik Teschke d4a5d63494 fixed errors in (de)serializing device identifiers and fixes 2014-02-09 21:14:27 +01:00
Fredrik Teschke 9bda9ccfb4 Merge branch 'devicetype-identifier-json-serialization' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceAndSessionIdentifierWithGPSFixesDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/GPSFixJsonDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/GPSFixMovingJsonDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/GPSFixMovingNmeaDTOJsonDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/GPSFixNmeaDTOJsonDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/SmartphoneImeiIdentifierJsonDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceAndSessionIdentifierWithGPSFixesSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GPSFixJsonSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GPSFixMovingJsonSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GPSFixMovingNmeaDTOJsonSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GPSFixNmeaDTOJsonSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/SmartphoneImeiIdentifierJsonSerializer.java
2014-02-09 20:00:25 +01:00
Fredrik Teschke 87f7ebc18d added serialization of fixes, and device identifier 2014-02-09 19:45:17 +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 12c6451c8b Started changing master data export to use java binary object serializ. 2014-02-07 16:31:52 +01:00
Fredrik Teschke 9f743715b6 added JSON (de)serializers for GPS fixes, IMEIs and compound documents 2014-02-02 10:22:11 +01:00
Axel Uhl 28fa8c528b fixed a bunch of NPE issues in the RCapp 2014-01-27 10:26:59 +01:00
Frederik Petersen ed6d224a1c Carried points, score corrections, suppressed competitors
are all imported even if no corresponding race is loaded on
the exporting side.

also fixed competitor id serialization
2014-01-23 16:10:00 +01:00
Frederik Petersen c008cd923a Added failing test for carried points persistance 2014-01-22 15:11:52 +01:00
Axel Uhl 049431e629 fixed indentation 2014-01-22 08:06:14 +01:00
Nick Klose a172d69861 Edits after review for merge with master. 2014-01-17 11:36:28 +01:00
Nick Klose 0893ef858d Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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_de.properties
2014-01-16 16:06:28 +01:00
Frederik Petersen ab9ba0459d RaceId in master data windtrack serialization is now serialized depending
on its type
2014-01-08 10:07:01 +01:00
Nick Klose aaad94801c Merge branch 'master' into mark-rounding-inference
Conflicts:
	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
2013-12-16 10:45:28 +01:00
Axel Uhl 4bc9ea0d84 fixed bug 1656 (NPE during master data import due to a null color) 2013-12-13 20:50:28 +01:00
Axel Uhl 4ad6594a25 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
2013-12-10 09:30:41 +01:00
Axel Uhl a35c1bbc95 fixed competitor color serialization after switching from String to Color 2013-12-10 09:28:31 +01:00
Axel Uhl bca2a9b982 fixed serialization/deserialization for null colors 2013-12-09 23:08:02 +01:00