Commit Graph
1633 Commits
Author SHA1 Message Date
fmittag 2f08fb7a4e added a new method getLastLegStarted(timepoint) on trackedRace to improve leg progress calculation 2015-04-02 16:32:50 +02:00
Alexander Ries 50a32e3558 fixed conflicts in Dummy and Moqued TrackedRaces 2015-04-01 10:31:21 +02:00
Alexander Ries a46f2a6b80 Merge remote-tracking branch 'origin/ribdashboard' into ribdashboard 2015-04-01 10:25:52 +02:00
Alexander Ries 8d3cb289d5 added getGateStartGolfDownTime() method to TrackedRace 2015-04-01 10:23:41 +02:00
Axel Uhl d89f461191 don't create mark passing calculator on replica; mark passings are replicated using UpdateMarkPassings operation 2015-03-31 19:56:35 +02:00
Axel Uhl 81fc752c06 Merge branch 'master' into mark-rounding-inference 2015-03-30 22:32:03 +02:00
Axel Uhl e75b2e1985 it's important to always return the same classloader; otherwise, the classes and hence the objects won't be compatible / equal 2015-03-30 20:56:11 +02:00
Axel Uhl 9001649b99 fixed waiting on Replicator's queue to become empty; this avoids the AlreadyClosedExceptions, it seems, but the testWindSourcesToExcludeReplication test still fails locally 2015-03-30 11:50:48 +02:00
Axel Uhl aa0ed9e815 partly reverting commit 21d5d33f78 to see what is causing the issue in Hudson 2015-03-30 10:10:07 +02:00
Axel Uhl 06872cc3ec Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-03-29 20:11:01 +02:00
Axel Uhl 21d5d33f78 fixing re-opened bug 2707, now also for replication-related de-serialization in RacingEventServiceImpl, using the same class loader 2015-03-29 18:00:07 +02:00
Axel Uhl ba47883a59 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-03-27 15:39:19 +01:00
Axel Uhl e1e047bd75 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.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/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.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.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalyticsDataManager.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.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/client/StringMessages_ru.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2015-03-26 14:51:48 +01:00
Frederik Petersen c283d9276a Introduces oldStatus parameter for state change listener
polar service can now listen for state changes (loading -> x)
2015-03-25 10:51:47 +01:00
Axel Uhl c9d9a59ea1 implementing solution for bug 2728: adding last known position to marks list 2015-03-24 17:10:44 +01:00
Axel Uhl 9a81fe3e70 Merge branch 'jbross-buoy-tender'
Conflicts:
	java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
2015-03-24 11:16:47 +01:00
Alexander Ries c51ba95293 Merge remote-tracking branch 'origin/master' into ribdashboard 2015-03-24 00:05:59 +01:00
Axel Uhl 8267c32263 improved Javadoc for new TrackedRace.getTrack(Mark) and old TrackedRace.getOrCreateTrack(Mark); use new getTrack(Mark) in RacingEventServiceImpl 2015-03-23 22:30:30 +01:00
Axel Uhl 29284adfa4 consolidated acquisition of mark position from tracked races, regatta log and race logs 2015-03-23 22:25:40 +01:00
Axel Uhl 911cdeb86b Merge branch 'master' into jbross-buoy-tender
Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2015-03-23 20:52:00 +01:00
Axel Uhl f8c16d1049 Merge branch 'jbross-buoy-tender' into bug2724
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.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/client/StringMessages_ru.properties
2015-03-23 16:18:37 +01:00
Axel Uhl 641b02357f Merge branch 'master' into bug2715
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/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/client/StringMessages_ru.properties
2015-03-20 17:44:35 +01:00
Axel Uhl 89a4ead050 added a little Javadoc 2015-03-20 17:28:35 +01:00
Axel Uhl 495cd85bd0 added distance-considering-gate-start metric also at race level 2015-03-20 14:18:59 +01:00
Axel Uhl 5fd384af5c added metric for distance including gate start consideration to leaderboard and REST API 2015-03-20 13:34:44 +01:00
Alexander Ries a1ad8df545 added dashboard and mgwt bundle to server launch configs 2015-03-20 10:14:48 +01:00
Axel Uhl 3566447976 added mgwt and dashboard to launch config 2015-03-20 08:46:53 +01:00
Axel Uhl d19af01a76 added settings dialog component entry for start to next mark lines; added mgwt and ribdashboard to bundle list 2015-03-19 18:03:08 +01:00
Axel Uhl acf0b77da5 fixed selection style 2015-03-19 17:37:47 +01:00
Frederik Petersen 09b8c02316 MasterDataImport can now access class loaders to which there is no dep
The bundles need to implement a MasterDataImportClassLoaderService in
their Activator on start and unregister it on stop. You can see an example
in the racelogtracking bundle.
fixes 2707
2015-03-18 16:21:57 +01:00
Jan Broß 9ce2c15d60 Merge branch 'jbross-buoy-tender' of ssh://sapsailing.com/home/trac/git into jbross-buoy-tender 2015-03-18 16:10:51 +01:00
Jan Broß ec20a6042f Return latest known position if existent when pinging mark 2015-03-18 16:05:23 +01:00
Frederik Petersen 212f30446b PolarDataMiner now waits for replay races to finish tracking 2015-03-17 14:37:45 +01:00
Axel Uhl 02e70fc1d9 preparing for rank-over-wind data analysis 2015-03-10 15:42:36 +01:00
Simon Pamies 4b79441c19 Working version where leaderboard columns sailid and competitor name can be toggled 2015-03-03 12:51:47 +01:00
Frederik Petersen 5206c79548 Fixed some stuff after new datamining -> polar mining merge 2015-03-02 16:18:44 +01:00
Frederik Petersen c0f6f39e1e Merge branch 'master' into polars
Conflicts:
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2015-03-02 16:13:26 +01:00
Axel Uhl ae9ca81f45 fixed launch configs regarding zxing bundle; added Javadoc 2015-02-25 09:37:41 +01:00
Frederik Petersen ff36a8c758 Added commons math to launch configs 2015-02-18 10:52:01 +01:00
fmittag 2c7f3c4174 added gwt.theme project to all launch configs 2015-02-17 17:13:12 +01:00
Axel Uhl da608903b8 fixed launch configs; fixed mail service which needs to implement ClearStateTestSupport 2015-02-16 16:36:12 +01:00
Axel Uhl b037a465a9 Merge branch 'master' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-02-15 09:03:34 +01:00
Axel Uhl 39b1c55a88 made compileable after master mergeMerge branch 'master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
	java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2015-02-14 21:23:24 +01:00
Axel Uhl f96f0b82de fixed bug 2063 2015-02-13 12:59:35 +01:00
Axel Uhl a1a8166b08 fixed MongoDB bundle reference in launch configurations after target platform upgrade 2015-02-13 10:18:32 +01:00
Fredrik Teschke 4cb7b535c8 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
2015-02-13 08:29:41 +01:00
Fredrik Teschke df3b798bda Merge remote-tracking branch 'origin/master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
2015-02-13 08:26:24 +01:00
Axel Uhl 89cf67a50a Merge branch 'master' into ftes-mongo-driver-2.13 2015-02-12 23:19:56 +01:00
Fredrik Teschke 3b97cb9fed re-add mail bundle to launch configs after merge 2015-02-12 18:31:26 +01:00
Axel Uhl 98d5235b47 upgraded all Mongo-using bundles to 2.13.0 driver 2015-02-12 16:00:15 +01:00