Commit Graph
13 Commits
Author SHA1 Message Date
Fredrik Teschke 1d3ab7704f Merge branch 'timerange' into racelog-tracked-race 2014-02-10 04:57:37 +01:00
Fredrik Teschke 14645e968d Merge branch 'devicetype-identifier-json-serialization' into racelog-tracked-race 2014-02-10 04:39:21 +01:00
Fredrik Teschke d4a5d63494 fixed errors in (de)serializing device identifiers and fixes 2014-02-09 21:14:27 +01:00
Fredrik Teschke 87f7ebc18d added serialization of fixes, and device identifier 2014-02-09 19:45:17 +01:00
Fredrik Teschke e753f7eee8 DeviceIdentifierPersistenceHandlers do not necessarily need to create new DBObject 2014-02-02 16:32:01 +01:00
Fredrik Teschke 23a8cc8214 fix bug #1740: create new DBObject instead of enriching in DeviceIdentifierPersistenceHandler 2014-02-02 16:25:26 +01:00
Fredrik Teschke af4cbca8d8 added op on TimeRange: timeDifference to TimePoint 2014-02-02 15:37:33 +01:00
Fredrik Teschke 0ac043b092 add timerange 2014-02-02 15:20:16 +01:00
Fredrik Teschke b48bae009d Merge branch 'master' into devicetype-identifier 2014-02-02 09:48:06 +01:00
Fredrik Teschke 2e1f43236c refactoring of the OSGI based service type finder
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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingTrackingLogEventData.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-02-02 09:21:44 +01:00
Fredrik Teschke eaf266e228 changed how deviceTypeServiceFinder is set (Axel's changes)
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
2014-01-28 22:06:46 +01:00
Fredrik Teschke ed9d3fef8c deleted unused exception and used other runtime exception to alert when no deviceMapper found 2014-01-28 21:06:00 +01:00
Fredrik Teschke 0879ca7600 added DeviceTypeIdentifier and related files from cmd-android-tracking branch 2014-01-28 18:12:21 +01:00