Commit Graph
977 Commits
Author SHA1 Message Date
Axel Uhl 44b3b95db2 solved persistence problem for overall leaderboard 2013-11-16 15:19:10 +01:00
Axel Uhl bf974089f6 started to work on bug 1508: export/import suppressed competitors for overall leaderboard 2013-11-15 23:39:49 +01:00
Axel Uhl 72c297a970 Fixed bug 1611 by making backward compatible 2013-11-15 22:07:45 +01:00
Axel Uhl 1624d4e929 Merge branch 'master' into igtimi 2013-11-15 19:47:28 +01:00
Frederik Petersen d3103c8983 Merge branch 'master' into fix-masterdataimport-overall-leaderboard
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/masterdata/impl/LeaderboardGroupMasterDataJsonSerializer.java
2013-11-15 16:17:13 +01:00
Frederik Petersen 967e3de29e MetaColumn factors are now imported with MasterDataImport
see bug #1605

also added an assert to the according OverallLeaderboard test case
2013-11-15 16:13:55 +01:00
Axel Uhl 80da9fa4c7 added Igtimi bundles to feature, launch configs and pom.xml 2013-11-15 15:49:45 +01:00
Simon Pamies 7009450110 Changed logging level to see when replication has been finished 2013-11-15 10:33:13 -02:00
Simon Pamies 14f451dd27 Fixed nasty replication error with HashMap containing FutureTask instances that can't be serialized 2013-11-14 19:57:05 -02:00
Lennart Hensler 361524ded2 Merge branch 'master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/build.properties
	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/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2013-11-13 14:55:10 +01:00
Frederik Petersen 99d3b5c0df Prepared dummy tracked race for master data wind import 2013-11-13 09:05:21 +01:00
fmittag 198140911a Merge remote-tracking branch 'origin/master' into leaderboardView2
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
2013-11-11 16:01:51 +01:00
Lukas Niemeier dac0fd3494 # added SharedDomainFactoryImpl implementing SharedDomainFactory
# DomainFactoryImpl extends SharedDomainFactoryImpl (code reuse)
# Split SharedDomainFactory and CompetitorStore interfaces (no more forwarding)
2013-11-11 03:40:09 +01:00
Lukas Niemeier ea69b28ad2 Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/CollectionNames.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/base/SharedDomainFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
2013-11-11 03:00:31 +01:00
Axel Uhl 025f288a3b allow resetting many competitors at once 2013-11-07 22:04:42 +01:00
Axel Uhl 64d14f742d renamed persistentCompetitorStore to competitorStore because it may also be a TransientCompetitorStoreImpl 2013-11-07 20:44:06 +01:00
fmittag 3f34d0c149 Merge remote-tracking branch 'origin/master' into leaderboardView2
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2013-11-07 13:16:43 +01:00
Axel Uhl 6af681ca0f reload option works now that the team's nationality is updated upon reload 2013-11-07 10:50:57 +01:00
Axel Uhl 4d7c5e3a40 support UI action to force competitor refresh to defaults 2013-11-07 09:34:48 +01:00
Frederik Petersen 8f1246e8cd Refactored TrackedRaceImpl wind funtionality into abstract super class
This enables us to let the DummyTrackedRace for the master data import to
use the wind track functionality, to save imported wind into the db, by
using the existing code.
2013-11-06 17:15:17 +01:00
Lennart Hensler 93594fa380 Merge branch 'master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2013-11-05 17:02:44 +01:00
Axel Uhl e4e929182d by default, clear the persistent competitor store during server start; introduced the persistentcompetitors.clear property to control this 2013-11-05 16:24:19 +01:00
Axel Uhl 4fb042ac90 don't support competitor removal through UI; the only reasonable option for persistently removing competitors seems at server start-up 2013-11-05 15:01:21 +01:00
Axel Uhl c468fceabe also support setting the "NONE" nationality 2013-11-05 14:44:07 +01:00
Axel Uhl 1806926058 Merge branch 'master' into persistentCompetitors 2013-11-05 13:31:46 +01:00
Axel Uhl bd3119f905 invalidate CompetitorDTO cache which now moved to CompetitorStore; use locking in CompetitorStore 2013-11-05 11:24:29 +01:00
Axel Uhl 82ce1980a9 first untested version of a competitor edit dialog 2013-11-05 08:57:02 +01:00
Axel Uhl aa7f11d257 made competitor removal replication-ready 2013-11-04 21:47:12 +01:00
Christopher Ronnewinkel (D036654) ecc99473d1 revert run configuration; 2013-11-04 17:51:17 +01:00
Lukas Niemeier 422d24eaa5 Merge branch 'otracelog' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
2013-11-04 01:48:14 +01:00
Axel Uhl fe8bd57a19 allow a competitor to be modified through the UpdateCompetitor operation 2013-10-31 18:10:56 +01:00
Axel Uhl 5068f0268a RacingEventServiceImpl now uses PersistentCompetitorStore and loads/stores competitors to DB 2013-10-31 13:21:01 +01:00
Axel Uhl 670c2dd935 moved getCompetitors() to CompetitorStore so it's also available on transient competitor store for testing 2013-10-30 22:18:22 +01:00
Axel Uhl 6bcc4c092a compilable version breaking the constructor cycle of PersistentCompetitorStore, DomainFactoryImpl and DomainObjectFactoryImpl 2013-10-30 18:37:34 +01:00
Axel Uhl 2c878e13b4 formatting only 2013-10-30 17:11:21 +01:00
Lukas Niemeier bb58d78236 Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.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.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2013-10-30 14:38:14 +01:00
Axel Uhl 43cbda4c4c fixed serialization of persistent competitor store 2013-10-30 13:19:37 +01:00
Axel Uhl 9bd2b71efa made CompetitorStore serializable 2013-10-30 11:42:37 +01:00
Axel Uhl fae59cac79 Introduced CompetitorStore with a transient implementation being used for now in DomainFactoryImpl;
RacingEventServiceImpl already has a PersistentCompetitorStore that will then have to be injected into the
DomainFactoryImpl used by RacingEventServiceImpl
2013-10-29 11:45:31 +01:00
Axel Uhl a4701aa1b5 consolidated imports to remove warnings 2013-10-29 09:49:11 +01:00
Axel Uhl 3da17302f8 removed DomainFactory.INSTANCE use except from test cases; renamed MongoFactory to PersistenceFactory 2013-10-28 17:26:26 +01:00
Axel Uhl be1f8815fb fixed a merge error that affected deserialization of media track library 2013-10-26 13:26:43 +02:00
Axel Uhl c0e88838c4 adjusted other launch configs to automatically start connector bundles now; required because connectors are now discovered using OSGi service lookup 2013-10-26 00:01:45 +02:00
Axel Uhl 03531c7c80 moved start and finish line advantage analysis to TrackedRace 2013-10-25 23:10:19 +02:00
Axel Uhl 74a03d543c first half-way reasonable start/finish line advantage display; still need to move this to TrackedRace 2013-10-25 22:31:38 +02:00
Axel Uhl 497f4a75c6 adjusted use of swiss timing replay adapter to the same pattern used for the tractrac and swisstiming live tracking 2013-10-25 13:30:24 +02:00
Axel Uhl 4e22cee4d7 moved SwissTiming adapter stuff away from RAcingEventService 2013-10-25 10:00:32 +02:00
Lukas Niemeier 5230799349 # added replication to device configuratiom 2013-10-24 20:00:39 +02:00
Lukas Niemeier d8192aa7b2 # added removing of device configurations (persistence) 2013-10-24 19:38:51 +02:00
Lukas Niemeier 4418418545 # added persistence to device configurations 2013-10-24 19:24:24 +02:00