Commit Graph
910 Commits
Author SHA1 Message Date
Lukas Niemeier c16f2c07ef # removed synchronize (not needed) 2013-12-06 17:57:05 +01:00
Axel Uhl 2992622af5 removed redundant white space 2013-12-06 17:20:21 +01:00
Axel Uhl a36277c62b fixed indentation 2013-12-06 17:15:52 +01:00
Axel Uhl f890ce2cd1 consolidated imports 2013-12-06 17:12:51 +01:00
Axel Uhl eac50c5fa2 don't redundantly replicate the UpdateSpecificRegatta operation in updateRegatta(...) 2013-12-06 17:12:01 +01:00
Axel Uhl 1efebeef57 Merge branch 'master' into racecommittee_app 2013-12-06 14:49:01 +01:00
Lukas Niemeier 7b4a480de0 # clarified RaceState interface 2013-12-06 02:37:34 +01:00
Axel Uhl 72ee807004 working towards true wind calculation 2013-12-05 22:18:21 +01:00
Lukas Niemeier 061936c97e # renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
2013-12-04 16:18:33 +01:00
Lukas Niemeier 492124fd16 # renamed proceduresconfiguration to RegattaConfiguration 2013-12-04 02:49:46 +01:00
Lukas Niemeier 3f30c1353e # golf down time ui 2013-12-04 01:10:13 +01:00
Lukas Niemeier d4601894dc # use pass-trough interface instead of getCompetitorStore chain 2013-12-03 18:38:36 +01:00
Lukas Niemeier 5b238f500a Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/CompetitorMasterDataDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/LeaderboardGroupMasterDataJsonDeserializer.java
2013-12-03 18:34:33 +01:00
Lukas Niemeier 69ff32e1d8 # extended GateLineOpeningTime to store Golf-Down time
# added configuration to enable setting the Golf-Down time
# implemented Start prerequisites for all RacingProcedures
2013-12-02 18:33:08 +01:00
Frederik Petersen dd39c1615a Workaround fix for id serialization in master data import
needs more thorough fix when bug 1599 is "fixed"
2013-12-02 16:37:11 +01:00
Axel Uhl da0c3f914c Merge branch 'master' into racecommittee_app 2013-12-01 23:52:20 +01:00
Lukas Niemeier 04e8671a11 Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-11-29 18:24:13 +01:00
Lukas Niemeier 453ac2b142 Merge branch 'master' into racecommittee_app
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
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-29 16:42:07 +01:00
Axel Uhl 3aea22dd01 offer system properties to configure Igtimi client ID, secret and redirect URI 2013-11-29 15:57:14 +01:00
Axel Uhl 86e0c591cf Merge branch 'master' into igtimi 2013-11-26 17:52:40 +01:00
Lukas Niemeier b09239ae60 # added a DateTimePicker control
# added UI to enter Start time in AdminConsole
2013-11-26 02:27:41 +01:00
Lukas Niemeier 30560c19bf # racing procedure configuration attached to regatta
# some help text in UI
2013-11-25 16:46:05 +01:00
Lukas Niemeier 773670d608 # revamped the configuration system to support remote configuration of racing procedures 2013-11-25 00:01:25 +01:00
Lukas Niemeier 7d63298739 merge fix 2013-11-20 19:20:43 +01:00
Frederik Petersen 0fbf6071de Changed master data import to use gzip 2013-11-20 16:29:32 +01:00
Lukas Niemeier 953eaaa668 Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
2013-11-20 12:25:57 +01:00
Frederik Petersen 81760e6dec Replaced trackedRegatta with regatta name in getWindTrack calls
also added wind import
2013-11-20 12:05:10 +01:00
Lukas Niemeier ad41f2e80c Merge branch 'master' into racecommittee_app
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
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-20 11:37:40 +01:00
Axel Uhl 69cac77be9 added apache logging, httpclient and httpcore to all launch configurations 2013-11-20 11:11:01 +01:00
Axel Uhl bf522fc65a error handling in access token callback servlet 2013-11-20 11:08:19 +01:00
Frederik Petersen a988003d15 Moved central windstore into racingeventservice
also removed addRace and addEvent services from legacy adminapp
2013-11-20 09:02:55 +01:00
Frederik Petersen 4e9b9ee333 Merge branch 'master' into masterdataimport-wind 2013-11-20 09:00:07 +01:00
Axel Uhl 3542cf7e67 using a GzipOutputStream to compress initial replication; results in a factor of 4 compression, roughly 2013-11-19 11:27:57 +01:00
Lukas Niemeier 34b852f0c4 # changed RaceLogEvent#getTimePoint to return createdAt (was logical timestamp before) 2013-11-18 22:05:18 +01:00
Axel Uhl fffd915d44 used method naming to clarify that the race IDs handled here are the toString() representations 2013-11-18 17:32:01 +01:00
Axel Uhl 052f4ffbdb fixed typo 2013-11-18 17:30:27 +01:00
Axel Uhl (Server) 3ea586844f Merge branch 'master' into igtimi 2013-11-18 14:11:20 +01:00
Axel Uhl 3959dde0c5 formatting only 2013-11-17 00:52:07 +01:00
Lukas Niemeier 58efde4c15 # default racing procedure and default course designer configurable for regtattas 2013-11-16 16:32:30 +01:00
Frederik Petersen 51bd2e0c40 Merge branch 'master' into fix-masterdataimport-overalllg-persistence
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
2013-11-16 16:15:58 +01:00
Frederik Petersen a724200499 Fixed persistence of overall leaderboardgroup data in masterdataimport
and tested it
2013-11-16 16:00:31 +01:00
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