Commit Graph
1828 Commits
Author SHA1 Message Date
Axel Uhl 1f543fdf3f Merge branch 'master' into raceboard-simulation 2015-03-18 13:54:50 +01:00
Christopher Ronnewinkel (D036654) 1fe0e4f205 cleanup logging: put simulation-details to FINE and simulation-service to INFO; 2015-03-17 15:52:38 +01:00
Frederik Petersen 212f30446b PolarDataMiner now waits for replay races to finish tracking 2015-03-17 14:37:45 +01:00
Christopher Ronnewinkel (D036654) 7e25e61456 ensure unique assignment of race-change-listener to tracked-race per key; 2015-03-17 09:26:46 +01:00
Christopher Ronnewinkel (D036654) f5dc91187c support fail-over when server is shutdown & restarted (so that without touching the client/browser simulation-results will reappear like the boats do; 2015-03-16 17:11:52 +01:00
Christopher Ronnewinkel (D036654) 08e3018c05 control cache-update-frequency by scheduling summarizing trigger-update to the future (instead of Thread.sleep()); 2015-03-16 15:47:45 +01:00
Christopher Ronnewinkel (D036654) 0304605b20 alternative implementation of cache-updates for simulation; requires small change/fix in smart-future-cache; 2015-03-14 21:35:36 +01:00
Christopher Ronnewinkel (D036654) 98e63492d5 reduce simulation-thread-pool-size to 1/3 of available processors; add some comments; fix race color for internet explorer; 2015-03-14 21:33:24 +01:00
Peter Siegmund f169fc8b4f Merge branch 'master' into ubilabs--tracking_app--develop
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-03-12 10:06:04 +01:00
Christopher Ronnewinkel (D036654) a2d684d7be Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
	java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-03-11 13:39:18 +01:00
Christopher Ronnewinkel (D036654) 7f0c0a458a add waiting duration before triggering next simulation-cache-update to race-change-listener; 2015-03-11 13:32:37 +01:00
Christopher Ronnewinkel (D036654) c9f24d3e78 add ui-update of race-map simulation-overlay after an update of simulation-cache using the cached simulation-result hashCode() as version-identifier (identifying the class-instance); 2015-03-11 09:42:39 +01:00
Axel Uhl 02e70fc1d9 preparing for rank-over-wind data analysis 2015-03-10 15:42:36 +01:00
Christopher Ronnewinkel (D036654) fdc503d53b Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java
2015-03-06 15:19:49 +01:00
Christopher Ronnewinkel (D036654) 189b3be8ff cleanup of simulator implementation; 2015-03-05 15:35:19 +01:00
Christopher Ronnewinkel (D036654) c2ea7e3965 parallelisation of standalone simulation; pass leg-type from tracked-race to raceboard simulation; 2015-03-05 14:27:26 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Christopher Ronnewinkel (D036654) 08164805a2 fix raceboard simulation in live mode; 2015-03-03 13:14:04 +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
Christopher Ronnewinkel (D036654) 90b99a2277 fix missing simulation of leg 1 for times before start; add sparse-polar-data-exception for cases where less than two supporting values for beat/jibe angles/speeds are available; fix thread unsafety of simulator leading to concurrent-modification-exceptions (polar-diagram-base has state); 2015-03-02 15:16:17 +01:00
Christopher Ronnewinkel (D036654) 0ba2232865 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation-threaded
Conflicts:
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
2015-02-25 19:03:54 +01:00
Christopher Ronnewinkel (D036654) d268bfc658 fix sorting of courses; fix numbering of legs; fix waiting for cache-update; fix concurrent path-computation; 2015-02-25 16:24:00 +01:00
Christopher Ronnewinkel (D036654) 58e61bab70 move leg-identifier to domain.common, as it is required in gwt, as well as, server-backend; 2015-02-25 09:46:31 +01:00
Axel Uhl ae9ca81f45 fixed launch configs regarding zxing bundle; added Javadoc 2015-02-25 09:37:41 +01:00
Christopher Ronnewinkel (D036654) 32ae97ec48 add smart-future-cache and move simulation-service to server-plugin; 2015-02-24 15:25:47 +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
Christopher Ronnewinkel (D036654) 4dc35e059a skeleton for multi-threaded and cached implementation of simulation; 2015-02-13 19:58:27 +01:00
Axel Uhl f96f0b82de fixed bug 2063 2015-02-13 12:59:35 +01:00
Fredrik Teschke 9c375a3ae4 Merge remote-tracking branch 'origin/master' into android_apps_no_rcapp_changes
Conflicts:
	.gitignore
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
2015-02-13 11:16:50 +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
Fredrik Teschke acfbe4de49 update launch configs to include jackson bundles to avoid NoClassDefFoundErrors 2015-02-12 13:15:27 +01:00
Axel Uhl 39c3c789b5 Merge remote-tracking branch 'origin/master' into ftes-mongo-driver-2.13 2015-02-12 00:05:07 +01:00
Nicolas 7e3aab3a33 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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
2015-02-11 17:58:59 +01:00
Axel Uhl a211e5427a proposal for no e-mail validation but a placeholder attribute on the text box explaining what/why to enter 2015-02-11 17:49:45 +01:00
Axel Uhl 67d1444466 Merge branch 'master' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	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.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/pom.xml
2015-02-11 14:55:30 +01:00
Fredrik Teschke 8bfc064c5d Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation 2015-02-11 13:17:51 +01:00
Fredrik Teschke 5471a6b8fc update manifests and pom to new mongodb driver version 2015-02-11 12:55:32 +01:00
Axel Uhl d91257c8d6 Merge branch 'master' into ftes-mail-move-to-sse 2015-02-11 10:04:01 +01:00
Axel Uhl 6cd449928b fixed winddbTest launch configs, re-enabling the accidentally disabled gateway.testsupport bundle as auto-start 2015-02-10 23:32:32 +01:00