Commit Graph
1132 Commits
Author SHA1 Message Date
fmittag c68a058a2c Merge remote-tracking branch 'origin/master' into gwt26 2014-03-03 14:55:51 +01:00
fmittag 8d309ddf91 Upgrade to gwt 2.6
- added gwt version 2.6 jars
- added org.apache.commons.lang to all target platforms
- upgraded gwt-maven plugin to 2.6
2014-03-03 12:12:25 +01:00
Lennart Hensler 66d008630f Merge remote-tracking branch 'origin/master' into dataMining 2014-03-01 17:50:51 +01:00
Axel Uhl 7d4363a1d8 Merge remote-tracking branch 'server/master' 2014-02-27 18:31:05 +01:00
Fredrik Teschke 9e58c6148a exchanged tabs with spaces 2014-02-27 16:44:06 +01:00
Axel Uhl ac9e4b9a79 remove RaceBoard ViewMode enum which only had one literal left 2014-02-27 16:42:30 +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
fmittag de2edfcf37 Merge remote-tracking branch 'origin/master' into event_times
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2014-02-25 19:10:59 +01:00
Lennart Hensler 8b39db5517 Merge remote-tracking branch 'origin/master' into dataMining 2014-02-25 15:34:46 +01:00
Frederik Petersen 0cb0e13353 Fixed and refactored import of PersistentRegattasForRaceIDs
Conflicts:
	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
2014-02-25 15:14:38 +01:00
Frederik Petersen 84d9b20436 Fixed persistence of PersistentRegattaForRaceID for data import
fixes 1824
2014-02-25 13:07:21 +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
Lennart Hensler ee183b4c9c Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2014-02-24 10:39:47 +01:00
Axel Uhl 4bfaff3491 Merge remote-tracking branch 'server/master' 2014-02-24 10:22:53 +01:00
Axel Uhl 27240634a1 fixing bug 1809 by using a WindTrack in the master data import instead of the raw fixes collection that doesn't get locked during serialization 2014-02-24 10:18:49 +01:00
Frederik Petersen a4f6d5d9f0 Added java doc to DataImportLockWithProgress 2014-02-24 09:36:01 +01:00
Frederik Petersen 7bb2b2c2c7 Fixed map entry deletion for data import lock 2014-02-24 09:03:56 +01:00
Frederik Petersen 8e01b10e6f Changed synchronized statements to ReeantrantRWLock 2014-02-24 08:38:19 +01:00
Frederik Petersen 59f9a1f7c1 Fixed event-regatta association
see bug 1796
2014-02-24 07:55:14 +01:00
Axel Uhl 57a0f824f2 Merge branch 'master' into dataMining 2014-02-22 17:03:22 +01:00
Axel Uhl 373fff1a30 turned around the default for persistentcompetitors.clear from true to false 2014-02-21 17:41:40 +01:00
Lennart Hensler c5b562032b Fixed Server launch config with proxy 2014-02-21 16:31:42 +01:00
Lennart Hensler 15ffa269c2 Merge remote-tracking branch 'extern/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/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
2014-02-21 16:20:01 +01:00
Jens Rommel ce28d9ffce Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-21 15:10:17 +01:00
Axel Uhl bc0de434d7 use less aggressive time period for polling master data import progress 2014-02-20 23:02:53 +01:00
Jens Rommel 6a75723fa6 Eventually fixed media track importing. Required a major redesign of some media APIs:
- introduced new method MediaDB.insertMediaTrackWithId
- moved import logic into racing event service
2014-02-20 17:03:28 +01:00
Lennart Hensler e029939b49 Fixed the server launch config (No Proxy) 2014-02-20 09:22:24 +01:00
Frederik Petersen 534d8c6a15 Fixed NPE and tests for data import 2014-02-19 17:34:53 +01:00
Frederik Petersen 74cb4b6431 Merge branch 'master' into bug1776 2014-02-19 17:19:31 +01:00
Frederik Petersen d2dda24af1 Fixed some progress indication thingies 2014-02-19 17:17:52 +01:00
Frederik Petersen ce71baa411 Added progress indication to master data import 2014-02-19 17:00:40 +01:00
Jens Rommel c031a2e38a Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-19 12:40:31 +01:00
Frederik Petersen 86cf9762a1 Data Import now uses lock 2014-02-19 10:16:09 +01:00
Frederik Petersen d81a894cce Added data import lock 2014-02-19 10:14:51 +01:00
Simon Pamies b628f61b3d Revamped coding 2014-02-19 17:02:01 +08:00
Simon Pamies 3301f7b92a Making sure that no domain handling code is executed in MongoObjectFactoryImpl 2014-02-19 16:22:31 +08:00
Jens Rommel bc9d39a282 Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-19 09:21:40 +01:00
Simon Pamies dc07558aad Adding remove series functionality 2014-02-19 14:57:22 +08:00
Jens Rommel 4b9d91d06c Changed media track import, hoping that it will make it more robust (see bug 1778).
Instead of deleting and re-adding changed tracks, they are no being updated in place.
2014-02-18 15:50:44 +01:00
Frederik Petersen d24b033910 Merge branch 'master' into bug1706 2014-02-18 12:04:14 +01:00
Frederik Petersen 9c7c82e49e Fixed problem in master data import
a lot of overhead was sent over the line due to the persistent race id
mappings, because regatta information was sent over the line
2014-02-18 12:01:18 +01:00
D049941 f05ccdda20 Merge remote-tracking branch 'origin/master' into riccardo-selenium
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/ListEditorComposite.java
2014-02-17 15:58:32 +01:00
Simon Pamies 86ffc2d41b Made Series renamable also in UI, added test for replication. This
change leads to masterdata import failing if the other server is not at
the exact same level.
2014-02-17 13:10:48 +01:00
Fredrik Teschke 7d00664ae6 added racelog editing to AdminConsole 2014-02-16 22:49:08 +01:00
Fredrik Teschke 0e6c4f2fad test case that creates race with RaceLogTrackingAdapter 2014-02-16 16:35:55 +01:00
Fredrik Teschke 9e3541582d built racelog-tracking adapter and related classes, not yet tested 2014-02-16 14:30:19 +01:00
Axel Uhl 8834a7b3d6 added Axel's test case and fix for serializable DeviceIdentifier 2014-02-16 10:15:13 +01:00
Fredrik Teschke 80b6c7cd9b added JavaDoc for racelog tracking 2014-02-16 10:03:57 +01:00
Fredrik Teschke 99b57ebcc9 added missing code snippet, that must have gotten lost during merge 2014-02-16 09:03:26 +01:00
Fredrik Teschke 0fa71f8fae Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
Conflicts:
	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-15 22:27:05 +01:00