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
69b0466a6c
Merge branch 'master' into tracapi
2014-02-20 23:51:12 +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
Axel Uhl
b6e19b6536
Merge branch 'master' into tracapi
...
Conflicts:
java/pom.xml
2014-02-20 10:32:47 +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
Axel Uhl
e3f53c3455
Merge remote-tracking branch 'server/master' into tracapi
2014-02-17 17:36:14 +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
Fredrik Teschke
2a06384907
Merge branch 'gpsfixstore-independent-of-race-copy-from-cmd-android-tracking' into gpsfixstore-independent-of-race
...
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/MongoGPSFixStoreFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreFactoryImpl.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/racelog/tracking/servlet/RecordFixesPostServlet.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.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-15 18:08:20 +01:00
Fredrik Teschke
78c848e594
added GPSFixStore concept to TrackedRace
...
- needs to be passed through RacingEventServiceImpl -> lots of changes in
test cases
- changes in adapters, as GPSFixStore is also passed around in
RaceAdapter etc.
2014-02-15 12:20:12 +01:00
Fredrik Teschke
2663382a51
added recelog tracking adapter etc., moved this functionality out of the RacingEventService
2014-02-15 08:40:32 +01:00
Simon Pamies
187d4280cf
Added Leaderboard to RegattaOverview, also added tests for regatta update with replication
2014-02-13 20:53:58 +01:00
Simon Pamies
b47e896546
Event association now also works for updating regattas with a new event
2014-02-13 19:00:34 +01:00
Simon Pamies
a9c1fa16b2
Making sure that regatta association is also effective upon creation and
...
also gets replicated
2014-02-13 18:55:27 +01:00
Simon Pamies
e4206894fe
Upon loading from database regattas now register themselves at events
2014-02-13 18:43:31 +01:00
Simon Pamies
31c6aa8993
Added test to ensure that UpdateSeries also replicates newly created series
2014-02-13 17:10:35 +01:00
Axel Uhl
97a1fc5d92
first working TracAPI-based tracking
2014-02-13 12:30:52 +01:00
Simon Pamies
6c57f40ee2
Extend ExpandedListEditorUi in a way that one can specify wheter remove
...
buttons should be shown
2014-02-13 09:44:37 +01:00
Simon Pamies
ec7037fb15
Extended regatta edit dialog to make it possible to add series to an existing regatta
2014-02-13 09:43:36 +01:00
Fredrik Teschke
07f5efe154
Merge branch 'master' into gpsfixstore-independent-of-race
...
Conflicts:
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/tracking/Track.java
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
2014-02-12 21:58:31 +01:00
Axel Uhl
f68384e6fb
adjusted scoring to the use of hasSplitFleetContiguousScoring regarding the contiguity of scores
2014-02-12 01:45:09 +01:00
Axel Uhl
e66a44de2c
more UI integration for hasSplitFleetContiguousScoring, towards fixing bug 1260
2014-02-12 00:22:36 +01:00
Axel Uhl
3606de7fd3
added the hasSplitFleetContiguousScoringColumn to the series visualization table
2014-02-11 21:38:59 +01:00
Axel Uhl
2c05186385
first shot at integrating the hasSplitFleetContiguousScoring field in the Series create/edit UI
2014-02-11 21:36:05 +01:00
Axel Uhl
4d690869a7
Eventing for setting of hasSplitFleetScore flag on Series and RaceColumn; by the way fixing bug 1752; eventing for Series.setIsMedal was missing
2014-02-11 21:12:56 +01:00
D049941
8796463410
Missing required bundles added.
2014-02-11 11:33:47 +01:00