Armin Zamani
e8742c504a
Merge branch 'master' into racecommittee_integrated
2013-03-20 23:40:05 +01:00
Armin Zamani
f924559542
introduced the course design update URI as part of the constructors for
...
tractrac race creation
2013-03-20 19:31:23 +01:00
fmittag
9a3319b5f1
fixed a bug with the replication of default regattas (id replication was broken)
...
added a test case for replicating default regattas
2013-03-20 19:12:15 +01:00
Armin Zamani
d97d442244
added race log specific bundles to run configuration again
2013-03-19 22:08:58 +01:00
Armin Zamani
44d78fadd9
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
2013-03-19 22:05:33 +01:00
Axel Uhl
937d54b3ed
added XRR import bundle to launch configs; fixed mix-up of boat class name and event name in XRR result import
2013-03-19 21:11:44 +01:00
Armin Zamani
619f0fead9
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupFactory.java
2013-03-19 19:08:36 +01:00
Axel Uhl
8a1c604d99
ultimate fix for bug 1310, now also removing overall leaderboard from racing event service
2013-03-19 18:26:45 +01:00
Axel Uhl
ce81b899d4
fixing bug 1310 by removing the overall leaderboard from the DB when removing the leaderboard group
2013-03-19 18:19:57 +01:00
Axel Uhl
6bef155bc5
Quick fix for bug 1310: return null as leaderboard loading result when trying to load an overall leaderboard as a flexible leaderboard
2013-03-19 18:15:29 +01:00
Lukas Niemeier
e6054b176b
# fixed 8889 launch config
2013-03-19 16:14:37 +01:00
Armin Zamani
f8688f1c94
Bug fix: For races that were loaded as TrackedRaces and race columns
...
were added in the default flexible leaderboard, the race log was missing
2013-03-17 19:32:17 +01:00
Simon Pamies
25b30b420a
More logging for serializing
2013-03-07 16:32:02 +01:00
Simon Pamies
05cedb8f38
As eventsById is already emptied we're not counting old size
2013-03-07 16:14:25 +01:00
Simon Pamies
caceca7647
Added more logging about events being serialized
2013-03-07 16:14:25 +01:00
Axel Uhl
c3ea5cb602
fixed broken (inactive) display of races in leaderboard group / spectator view
...
The problem was the addition of seriesName in FleetDTO which was included in equals/hashCode but not properly initialized
for flexible leaderboards. It was set to "Default" instead of null and hence the comparison to the null value as delivered
by the FlexibleLeaderboard failed.
2013-03-07 00:40:53 +04:00
Simon Pamies
ea739d8e0c
Ensuring that association between tracked race and column is not removed
...
completely
2013-03-05 12:38:00 +01:00
Simon Pamies
792dfd7de2
Made sure that event is correctly replicated upon initial load, also
...
stopping trackers upon initial load on replica
2013-03-05 11:10:54 +01:00
Armin Zamani
94944464f3
Fixed some errors after merge
2013-03-03 18:24:18 +01:00
Armin Zamani
79a39ef402
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java
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/adminconsole/LeaderboardDescriptor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.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/server/SailingServiceImpl.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardDiscardingRulesTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.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
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateFlexibleLeaderboard.java
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateRegattaLeaderboard.java
2013-03-03 17:40:51 +01:00
fmittag
be38ea453c
Fixed several issues related to regatta leaderboard creation
...
- Replication issues
- Bug 1249 - Sort regattas in "Create regatta leaderboard" dialog
- Bug 1250 - Display name not applied by Create Regatta Leaderboard dialog
2013-03-03 14:53:19 +01:00
Armin Zamani
76a249ad23
Added some Javadocs for explanation of our implementation and renamed
...
some methods
2013-03-03 14:02:32 +01:00
Armin Zamani
a96e692b5f
changed SailingGWT.launch again after merge, removed wrong and
...
unnecessary additional workspace_bundles key
2013-03-01 15:52:25 +01:00
Armin Zamani
d7f9bbbaf9
Just formatting: Changed tabs to spaces by formatting hole files (Ctrl +
...
I in Eclipse) that we might have touched while developing on this branch
2013-03-01 14:33:37 +01:00
Lukas Niemeier
c9452731ff
# remove race log replicator listener on regatta remove
2013-02-27 00:08:35 +01:00
Armin Zamani
b34298c6d8
replication: added missing connection of Regatta raceColumnlisteners in
...
RacingEventService to RaceLogRegplicator
2013-02-26 18:10:06 +01:00
Armin Zamani
e055c9ee12
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.gwt.ui/pom.xml
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-02-25 00:27:15 +01:00
Armin Zamani
9d72f87f04
Implemented CourseArea as another field to be selected in the Admin
...
Console for Regattas and propagated it in the Regatta infrastructure
2013-02-24 23:17:21 +01:00
Lukas Niemeier
e3b44ebdf9
# use new Replicator interface in CourseChangeReplicator
2013-02-24 19:18:26 +01:00
Lukas Niemeier
d239dbd2d6
# register replicator only if FlexibleLeaderboard
2013-02-24 02:35:33 +01:00
Lukas Niemeier
1595409c90
# RacingEventService uses RaceLogReplicator to replicate all incoming RaceLogEvents on RaceLogs
...
# Currently only RaceLogs of RaceColumns in Leaderboards supported
# Added some tests
2013-02-24 02:31:23 +01:00
Armin Zamani
fe2ca8196d
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
2013-02-23 23:46:22 +01:00
Armin Zamani
2998aae3e5
Removed CourseArea from RegattaLeaderboard, the courseAreaId is now only
...
a property of flexible leaderboards, for edit flexible leaderboard
dialog the coursearea and event is correctly preselected
2013-02-23 23:37:18 +01:00
Lukas Niemeier
6868f3f6d4
# race logs are set after RaceColumn is bound to its container (FlexibleLeaderboard or Regatta)
2013-02-23 22:26:39 +01:00
Axel Uhl
2e5651b8bc
added more replication logging on the serializing end
2013-02-23 08:15:26 +01:00
Axel Uhl
6dac249478
added replication-related logging
2013-02-23 08:13:40 +01:00
Armin Zamani
f13a8fc469
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
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/adminconsole/LeaderboardDescriptor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-02-22 15:51:13 +01:00
Axel Uhl
720048059f
switched order of updating DynamicRaceDefinitionSet and adding tracked race to regatta; fixed deserialization issue with DelayedLeaderboardCorrectionsImpl
...
The deserialization issue led to NPEs; the listeners field was transient and not re-initialized after de-serialization.
This has led to the NPE in a replica.
2013-02-21 09:26:25 +01:00
Armin Zamani
8168a784a1
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatClassImpl.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/SailingServer (No Proxy).launch
2013-02-20 01:32:14 +01:00
Lukas Niemeier
0f688eb0e7
# added two separate operations for adding events to Leaderboards and Regattas
...
# made RaceLogIdentifier contain RaceLogIdentifierTemplate
2013-02-19 20:00:49 +01:00
Lukas Niemeier
3aaa464f1b
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-19 19:32:20 +01:00
Armin Zamani
ec9d5779a1
Changed RecordRaceLogEvent so that names are passed as strings
2013-02-19 19:17:28 +01:00
Lukas Niemeier
77b59cf6fa
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
2013-02-19 19:07:08 +01:00
Lukas Niemeier
bd017c2865
# some cleanup
2013-02-19 19:06:47 +01:00
Armin Zamani
730b431912
further implementation of racelogstore in the sailing suite
2013-02-19 19:05:28 +01:00
Jens Rommel
ce50ceee18
Added rome dependency to launch configs.
2013-02-19 15:32:11 +01:00
Lukas Niemeier
e29e4e7806
# Reworked placement of RaceLog to have it on RaceColumn again
...
# All code paths needing a real RaceLog are changed to use MongoRaceLogStoreFactory
# MISSING: REPLICATION ON RACECOLUMN!!!
2013-02-19 00:50:56 +01:00
Lukas Niemeier
5df89c7e7e
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.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/FieldNames.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/impl/MarkImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/MetaLeaderboardColumn.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/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java
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/adminconsole/LeaderboardDescriptor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/pom.xml
2013-02-18 16:53:55 +01:00
Lukas Niemeier
a229765845
# moved everything used by Android projects of com.sap.sailing.domain into new bundle com.sap.sailing.domain.shared.android
...
# updated com.sap.sailing.domain to Java 1.7 again
# split of Event (see EventData) and Course (see CourseData) to minimize shared code with android
# to avoid sharing RaceColumn and Leaderboard (and its dependencies) Android projects work with RaceGroups (consisting of SeriesWithRows -> consisting of RaceRows -> consisting of RaceCells -> consisting of RaceLogs). A RaceGroup is basically a data-only view on transposed RaceColumns. See RaceGroupFactory for conversion from Leaderboard to RaceGroup. Future work: use Regatta instead of Leaderboard to convert to RaceGroup
2013-02-18 13:26:32 +01:00
Simon Pamies
0d78d4e7bc
Added test for regatta race association, also removing association when
...
regatta gets removed
2013-02-18 12:35:36 +01:00
Armin Zamani
fmittag
Axel Uhl
Lukas Niemeier
Simon Pamies
Lukas Niemeier
Jens Rommel