Commit Graph
158 Commits
Author SHA1 Message Date
Benjamin Ebling bcd1d43207 KW Safe commit 2014-06-24 11:57:03 +02:00
Axel Uhl 7fb0dfcf99 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHP49erFX2013Test.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPArenalTest.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPLahaina3Test.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/AbstractReceiverWithQueue.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.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/MarkPassingReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceStartedAndFinishedReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-06-03 01:47:08 +02:00
Axel Uhl 2157f02c5b Merge branch 'master' into search
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/racelog/tracking/impl/MongoGPSFixStoreImpl.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesPostServlet.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java
2014-06-03 01:10:25 +02:00
Fredrik Teschke 24787bd9bf add metadata collection for GPSFixStore 2014-06-03 00:52:54 +02:00
Axel Uhl 53a0b36e8e consolidated all Util stuff in com.sap.sse.common.Util now 2014-06-03 00:01:14 +02:00
Axel Uhl cb9354b1a0 moved Util from com.sap.sailing.common to com.sap.sse.common 2014-06-02 23:57:16 +02:00
Axel Uhl 0c47e86304 moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common 2014-06-02 23:31:26 +02:00
Axel Uhl c4cea6660d introduced com.sap.sse.common.Util as superclass of com.sap.sailing.common.Util and added com.sap.sse.common to the required bundles of all users of com.sap.sailing.common.Util 2014-06-02 23:17:49 +02:00
Axel Uhl 3267116a38 Merge branch 'master' into tracapi 2014-05-31 02:08:51 +02:00
Axel Uhl a9eefe1622 moved TrackFileImportDeviceIdentifierImpl into the domain bundle's trackfiles package to avoid serialization dependency from server to gateway 2014-05-31 00:55:21 +02:00
Axel Uhl 772fc78172 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackedRacesExportTest.java
2014-05-30 14:30:46 +02:00
Axel Uhl 200da4bdff added some Javadoc in the trackfiles import stuff 2014-05-30 10:15:37 +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
Axel Uhl fe230d7812 Merge branch 'master' into tracapi 2014-05-19 11:02:48 +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 f65350326a fix NullPointerE in first check if mappings were already loaded 2014-05-19 00:09:55 +02:00
Axel Uhl a71823feec Merge branch 'master' into tracapi 2014-05-16 14:16:28 +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
Axel Uhl c00c68597e ftes-rltracking merge had to adjust RacesHandle-->RaceHandle and added a missing gpsFixStore parameter to a constructor 2014-05-13 21:04:00 +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 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 42daff4758 added DeviceIdentifierDTO and track file import to adminconsole 2014-05-02 04:11:31 +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 dd9d1ebfc2 removed field from AbstractLeaderboardDTO, instead prevent this by raising an exception 2014-04-29 00:08:35 +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 ec15b110c8 include race id in denoteForTrackingEvent -> allows choosing custom stable ID 2014-04-24 07:18:37 +02:00
Fredrik Teschke 17f718edc0 allow removing denotation for racelog tracking from racelogs 2014-04-23 23:16:59 +02:00
Fredrik Teschke 13a1776cc0 simplified steps for racelog-tracking 2014-04-23 21:24:24 +02: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 53ef9027c9 add hashCode() to device identifiers 2014-03-16 16:59:55 +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 0d99127cda update tracking start and end when mappings change 2014-03-11 20:54:39 +01:00
Fredrik Teschke 34a4e59a0a moved functions to RaceLogTrackingAdapter 2014-03-11 20:15:32 +01:00
Fredrik Teschke 1ebed6373e changes to placeholder identifier and (de)serialization 2014-03-10 15:00:35 +01:00
Fredrik Teschke 9cffd20913 added ping mark functionality to adminConsole 2014-03-07 22:42:14 +01:00
Fredrik Teschke 335e090ebc added placeholder identifier and ping identifier 2014-03-07 19:00:42 +01:00
Fredrik Teschke 0e991ce33f also add events to by-id-map when loading 2014-03-06 16:55:10 +01:00
Fredrik Teschke 7d4133f6e4 added mark passing calculation to racelog-tracked races 2014-03-05 10:31:24 +01:00
Fredrik Teschke ba76c488ca propagate course changes after race creation in RaceLogTracking 2014-02-27 09:31:39 +01:00
Fredrik Teschke cd23f6f0e5 don't fail if there is no course definition in the RaceLog 2014-02-26 18:10:10 +01:00
Fredrik Teschke ef1f72b72b new RaceLogTracking tab in AdminConsole 2014-02-26 17:55:39 +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 621872933e if course is missing in RaceLog, revoke StartTracking event 2014-02-17 00:29:33 +01:00
Fredrik Teschke 91fc6033b2 fixed problem with exception that was not serializable 2014-02-16 23:02:17 +01:00
Fredrik Teschke bb205f3917 manage RaceLog tracked races in AdminConsole (dnote for RL-tracking, add tracker) 2014-02-16 19:02:30 +01:00