Axel Uhl
d86ef87132
fixed server tests where the refactoring of TracTrac API calls hadn't correctly passed the TrackerManager along
2013-10-24 18:26:07 +02:00
D049941
983201e04a
Merge remote-tracking branch 'external/master' into riccardo
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/TracTracEventManagementPanel.java
2013-10-24 15:52:16 +02:00
Axel Uhl
49b8aaa505
actually removed bundle dependency from server to tractracadapter
2013-10-24 15:39:31 +02:00
Axel Uhl
e053f76f8b
first compilable version after moving TracTrac specifics away from server bundle
2013-10-24 15:37:08 +02:00
Lukas Niemeier
313085c456
# added server code to create, edit and delete device configurations
2013-10-23 16:02:09 +02:00
Christopher Ronnewinkel (D036654)
7798dfd400
Merge branch 'origin/master'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/RegattaAreaCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java
2013-10-23 15:06:54 +02:00
Lennart Hensler
7dad61c471
Merge branch 'master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/build.properties
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
2013-10-23 14:10:07 +02:00
Fredrik Teschke
f7a3f5c8df
added competitor persistence; a first attempt to cherry-pick and merge this feature from the cmd-android-tracking branch
...
Conflicts:
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.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BoatJsonDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/BoatJsonSerializer.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/tracking/impl/CreateCompetitorPostServlet.java
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2013-10-23 10:01:12 +02:00
fmittag
f91e13577f
Merge remote-tracking branch 'origin/master' into leaderboardView2
...
Conflicts:
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.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-10-22 15:26:38 +02:00
Axel Uhl
8821c009ed
Merge remote-tracking branch 'server/master'
2013-10-16 18:20:29 +02:00
Axel Uhl
60364a65c9
working towards a fix for bug 1190 (stabilize wind replication against race conditions)
2013-10-16 18:19:58 +02:00
Lukas Niemeier
8a34842d14
# renamed TabletConfiguration to DeviceConfiguration
2013-10-16 16:04:17 +02:00
Axel Uhl
c44f8ef54a
Merge branch 'master' into leaderboardView2
2013-10-15 16:49:45 +02:00
Jens Rommel
36a0fc7e84
Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import
2013-10-15 12:36:08 +02:00
Jens Rommel
abd3f0dd44
Expanded read-only TrackedRace return type of get*Race() methods to mutable DynamicTrackedRace where appropriate.
...
According to Axel, the originally intended separation of read-onyl and mutable API via this approach turned out not to be as successful as expected.
2013-10-15 12:27:28 +02:00
Jens Rommel
48a1a6c187
Added seletion-aware wind import
2013-10-15 11:25:40 +02:00
Axel Uhl
ee1ea25f02
Merge branch 'master' into leaderboardView2
...
Conflicts:
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/leaderboard/LeaderboardPanel.java
2013-10-14 22:47:32 +02:00
Lennart Hensler
b81868d7f5
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-10-08 13:20:01 +02:00
Lennart Hensler
7e33dcf0bc
Merge branch 'master' into trackedRaceExtensions
2013-10-08 12:04:41 +02:00
Lennart Hensler
71481d8f1f
Merge remote-tracking branch 'extern/master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2013-10-07 09:04:36 +02:00
Axel Uhl
e504187f7e
fixing bug 1537 by also avoiding duplicate replication of course area additions
2013-10-02 18:05:06 +02:00
Axel Uhl
a81ada466f
Bug 1537: this commit fixes the problem for event creation, but not yet for course area addition
2013-10-02 17:25:20 +02:00
Lennart Hensler
39c1597f9f
Fixed launch configs and ui manifest after merge
2013-10-02 14:03:22 +02:00
fmittag
744eb458ab
Merge remote-tracking branch 'origin/master' into leaderboardView2
2013-10-01 14:15:30 +02:00
Axel Uhl
6283cd916d
Merge branch 'master' into bug655
2013-09-25 20:24:03 +02:00
Axel Uhl
069204f2e2
introduced RaceLog.load(RaceLogEvent) which, as opposed to add(...), does not notify listeners about the changes
2013-09-25 20:23:17 +02:00
Axel Uhl
eed2af9d90
added a failing test case for the NPE during the deserialization of competitor-specific race log events;
...
The problem is that the competitor ID may not be resolvable in the receiving DomainFactory's competitor cache.
The root cause is that the receiver tries to resolve the race log event in the first place instead of simply
storing the race log event in the RaceLog. The solution will be not to trigger events when storing the race log
events into the RaceLog during master data import.
2013-09-25 20:03:48 +02:00
Axel Uhl
e7200cfb3b
adjusted launch configurations to ensure the Manage2Sail result importer bundle is launched
2013-09-25 14:17:41 +02:00
fmittag
2b75928c4d
Merge remote-tracking branch 'origin/master' into leaderboardView2
2013-09-24 12:21:35 +02:00
Axel Uhl
60e86f9702
refactored creation of ScoreCorrectionImpl and subclass instances so that it happens in leaderboard constructors;
...
Prepares for the linking of the score correction object back to its leaderboard in the score correction's constructor.
This will allow for the detection of race column ordering and hence the default application of score corrections
depending on time point if there are tracked races before or after that time point for a given competitor.
2013-09-24 08:48:58 +02:00
Axel Uhl
822aff3194
started work on bug 655 by adding TimePoint argument to isScoreCorrected API
2013-09-23 16:11:44 +02:00
Axel Uhl
abdae7e871
tricky Merge branch 'master' into otracelog; some of the otracelog changes had selectively been applied to master; need to check branch validity first
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/clients/LoadClient.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventSenderTask.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
2013-09-17 17:57:38 +02:00
D049941
6acb01339f
New interface and bundle for test support added. The interface defines a
...
method to clear the state of the application (including persisted data)
and is used by the new bundle to create a well known state without any
data, except the default leaderboard.
Since this method should only be used in an isolated test environment,
the defining interface is only visible to the new bundle, which is not
deployed by default.
2013-09-12 17:42:25 +02:00
Axel Uhl
43d278ae19
Merge remote-tracking branch 'server/master'
2013-09-12 17:21:21 +02:00
Axel Uhl
c0204b58ff
using non-preemptive stopping of receivers in TracTracTrackerImpl to make sure all data received is delivered; see also bug 1517
2013-09-12 17:09:54 +02:00
fmittag
4407d11615
Merge remote-tracking branch 'origin/master'
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-09-12 16:08:54 +02:00
fmittag
54b7568c92
Fix for 'Added an indicator in the swisstiming management console for trackable races if there is a course or a startlist available'
2013-09-12 16:06:21 +02:00
fmittag
ac1cfd6c97
Added an indicator in the swisstiming management console for trackable races if there is a course or a starlist available
2013-09-11 20:58:43 +02:00
Axel Uhl
b098280f03
reverted the effects of commit ce4d2aaabb and instead use "fine" as log level instead of "info" for bundle life cycle messages
2013-09-11 17:54:32 +02:00
Axel Uhl
f355770c1b
fixing bug 1506 by adding a null check; loading leaderboards with no leaderboard selected was the problem
2013-09-11 10:04:55 +02:00
Lennart Hensler
71351dad49
Merge remote-tracking branch 'origin/master' into trackedRaceExtensions
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/DummyTrackedRace.java
2013-09-06 13:23:24 +02:00
Lennart Hensler
23567a282e
Added missing methods in the mocks
2013-09-06 13:01:08 +02:00
fmittag
b0d4cca151
Merge remote-tracking branch 'origin/master' into leaderboardView2
2013-09-04 11:50:52 +02:00
fmittag
cf1135d12f
a try to switch the startup order of the gateway bundles to avoid bug 1511
2013-09-04 10:00:20 +02:00
fmittag
ce4d2aaabb
removed stacktrace output in ExtenderBundleTracker
2013-09-03 18:13:55 +02:00
fmittag
2feab09115
fixed issue in proxy launch config
2013-09-03 12:18:33 +02:00
fmittag
523e1ece66
updated launch configs for a workaround for Bug 1511 - Jetty synchronization bug when registering multiple web app bundles
2013-09-03 12:00:56 +02:00
fmittag
a025d84e24
made removeLeaderboard() in RacingEventService more safe in case the leaderboard to remove does not exist
2013-09-01 14:29:03 +02:00
fmittag
daee1914a3
Merge remote-tracking branch 'origin/master' into leaderboardView2
2013-08-30 15:28:06 +02:00
fmittag
921f0663ff
update launch configs and classpaths to use the new libraries
2013-08-30 15:19:06 +02:00
Axel Uhl
D049941
Lukas Niemeier
Christopher Ronnewinkel (D036654)
Lennart Hensler
Fredrik Teschke
fmittag
Jens Rommel
Lennart Hensler