Commit Graph
689 Commits
Author SHA1 Message Date
fmittag ac09fe757b first simple version of leaderboard export as HTML 2013-01-31 20:36:22 +01:00
Lukas Niemeier bac8bd2bcd # loading of events done 2013-01-30 19:09:28 +01:00
Lukas Niemeier 8d742e0bae # removed some unused old code 2013-01-30 15:41:46 +01:00
Lukas Niemeier 458c583d9c # some fixes for NPE 2013-01-29 20:29:16 +01:00
Lukas Niemeier ad9568b0d5 # moved de/serializer to impl package
# easier de/serialization of rcevents
2013-01-29 04:08:50 +01:00
Armin Zamani 29a669e296 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
2013-01-25 22:06:14 +01:00
Lennart Hensler 311576db6e Replaced the catches of Throwable with catches of Exception 2013-01-25 10:28:07 +01:00
Armin Zamani 48bd9d798d minor fixes after merge 2013-01-23 14:07:45 +01:00
Armin Zamani 33ce26f635 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
2013-01-23 13:55:48 +01:00
Fredrik Teschke 1488cfa547 Added JDOM lib from eclipse orbit, updated launch configs, removed gateway dependency from gwt.ui 2013-01-22 18:53:56 +01:00
Lukas Niemeier b2c86be849 # test for serialization (currently only events) 2013-01-21 19:42:22 +01:00
Armin Zamani 1e97dc8bc3 Fix for replication bug, which was a concurrency issue: The bug occurred
sometimes when the loading of the RC track was not finished in the
TrackedRace constructor and getOrCreateRaceCommitteeTrack was called
meanwhile. Since the global variable raceCommitteetrack was null at that
time the getOrCreateRaceCommitteeTrack method created a new
RacecommitteeTrack and the inserted data got lost when the loading in
the constructor thread finished
2013-01-17 22:45:44 +01:00
Lukas Niemeier d7bd59a61c # moved racecommittee specific export servlets to own package 2013-01-16 17:26:06 +01:00
Armin Zamani b08effa2de removed some imports 2013-01-16 14:48:58 +01:00
Lukas Niemeier bfb062128c Serialization code for basic events
Integration in servlets
2013-01-14 01:12:38 +01:00
Armin Zamani 7deda8b123 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
	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/CollectionNames.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.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	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.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/.classpath
	java/com.sap.sailing.domain/.settings/org.eclipse.jdt.core.prefs
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/CourseArea.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Series.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseAreaImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.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/meta/AbstractMetaLeaderboard.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.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/TrackedRegatta.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.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/DynamicTrackedRegattaImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MaxSpeedCache.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/LockUtil.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/RaceColumnListeners.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/build.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.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/server/LeaderboardDTOCache.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateTrackedRace.java
2013-01-10 18:28:46 +01:00
Axel Uhl 6a30a93e0d Merge branch 'master' into gwt25 2013-01-08 15:18:41 +01:00
Lukas Niemeier 2c841ccd5a # added serialization of base domain objects to shared (server + apps) bundle 2013-01-02 19:55:45 +01:00
Armin Zamani 6fd712e9de Extended the TrackedRace Constructor by the RaceCommitteeStore, so that
a RC store has to be given at TrackedRace creation, necessary for
replication. All following TrackedRace constructor calls and calling
methods are adapted accordingly.
2012-12-28 15:50:36 +01:00
nils Schröder c717ab36d0 fixed bug in rank determination for rss feed 2012-12-08 13:48:19 -02:00
nils Schröder 3d2b538d37 Improved RSS feed for live race ranking for ESS40 2012-12-08 12:51:51 -02:00
Axel Uhl 5c9f6a9181 added an HTML page to configure two iframes with different URLs, may be used to display act and series leaderboard on a single page 2012-12-04 22:35:02 +01:00
D049941 c393031c41 Merge branch 'master' into 'gwt25'
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortedCellTableWithStylableHeaders.java
2012-11-22 15:43:03 +01:00
fmittag 1c8cd80be3 changed naming of attribute in json export for showwaypoints from 'buoys' to 'marks' 2012-11-16 10:59:18 +01:00
fmittag b75759ff34 Renaming of SingleMark and SingleMarkImpl to Mark and MarkImpl part II 2012-11-16 10:57:35 +01:00
fmittag f238b63ef0 Merge remote-tracking branch 'origin/master' into MarkWithRoundingDirection
Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.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
2012-11-15 18:51:37 +01:00
fmittag 8b0a0b4c7c little refactoring of JsonExport servlets - part II 2012-11-14 17:40:12 +01:00
fmittag c2df2b7e9f little refactoring of JsonExport servlets 2012-11-14 17:40:00 +01:00
fmittag 448023ad96 Refactoring of Buoy and BuoyImpl to SingleMark and SingleMarkImpl 2012-11-14 12:06:26 +01:00
Axel Uhl a7ddc432c2 added carriedPoints to the JSON leaderboard output 2012-11-05 18:00:22 +01:00
fmittag 94150d3b77 Changed rss feed content type from 'html' to plain text 2012-11-04 09:20:31 +01:00
fmittag 84cbdd0ef0 first version of a RSS feed for the race ranking of a live race 2012-11-03 15:45:24 +01:00
fmittag b71fcf0de6 added a generic html to display the content defined by an url in an iframe with a defined position and size 2012-10-21 10:00:01 +02:00
fmittag 7dcb381e28 Moved all servlet- and import/export specific functions in com.sap.sailing.server to com.sap.sailing.server.gateway to create a clear separation between the sailing server and it's remote access functions / part II 2012-10-08 18:43:02 +02:00
fmittag af63356e52 Moved all servlet- and import/export specific functions in com.sap.sailing.server to com.sap.sailing.server.gateway to create a clear separation between the sailing server and it's remote access functions 2012-10-08 18:42:51 +02:00
fmittag 4e0806d13a removed nonexisting folders from build.properties 2012-10-04 15:48:45 +02:00
fmittag 8edf929663 implemented a simple example jsp page accessing the racingEventService 2012-10-04 15:46:31 +02:00
fmittag 8c4bff53da first version of simple jsp support 2012-09-26 17:34:03 +02:00
fmittag 5017243d63 build new target definition for jsp support 2012-09-26 15:06:09 +02:00