Commit Graph
569 Commits
Author SHA1 Message Date
Axel Uhl 6d88a75b87 in Igtimi WebSocketConnectionManager.reconnect() wait for the connection for 5s; if not connected, try again with failover URL
Change-Id: I52737084334cdf918fff78643447822de93c2bd6
2015-12-21 10:21:26 +01:00
Axel Uhl 9b4b1acfa5 well, let's use 64; this is about the largest CPU configuration we may be getting at Amazon these days 2015-12-03 15:52:20 +01:00
Axel Uhl faa848cb34 reduce number of Jetty threads from 3000 to 50 in jetty.xml 2015-12-03 15:50:47 +01:00
Axel Uhl 0aaf1f0bcf Fixing bug 3299 by making sure TrackedRaceImpl.attachRaceLog waits until the race log is really attached to the TrackedRace; 2015-10-21 13:48:20 +02:00
Axel Uhl 2ef0df330d added -Djava.awt.headless=true to the ADDITIONAL_JAVA_ARGS so that bar code creation also works with no X11 environment installed 2015-08-20 12:33:46 +02:00
Axel Uhl 15988ee84f bug 3181: improved stop script, using "shutdown" and wait for process to die; kill if it doesn't 2015-07-24 23:30:42 +02:00
Axel Uhl ca2d9e8da0 stop script now issues "shutdown" instead of "exit" to cleanly shut down all bundles 2015-07-24 18:40:16 +02:00
Frederik Petersen 6f21b640af Added polars replicable to env.sh comment 2015-07-20 22:07:05 +02:00
Axel Uhl bfc1f3f546 added monitor.retrycount to monitor.properties; increased monitoring timeout from 2 to 5 seconds 2015-07-20 20:10:15 +02:00
EC2 Server 995c0815dc append /internal-server-status macro at the end of 001-events.conf to ensure health check with /index.html hits event-based rewrite first 2015-07-06 13:13:37 +00:00
EC2 Server bf4cac1f1a add /internal-server-status to 001-events.conf; always launch httpd 2015-06-30 16:29:08 +00:00
Steffen Schaefer e07c585934 Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-28 09:55:11 +02:00
Axel Uhl 181e5ee5b9 Merge branch 'master' into ubilabs--tracking_app--develop 2015-05-04 23:14:52 +02:00
Axel Uhl de957816aa Merge remote-tracking branch 'server/master' 2015-05-01 13:25:08 +02:00
Simon Pamies 565d93972d Updated local install 2015-05-01 10:26:20 +08:00
Axel Uhl 2ea6b4ef7c fixed in-place sed replacements in compareServers 2015-04-30 23:01:56 +02:00
Simon Pamies 00a0a78b2a Added ability to use a local release file 2015-04-30 10:33:14 +08: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
Axel Uhl ee16bd559d fixed monitoring.properties, not using old moderator?action=listevents which is costly on big servers such as ARCHIVE 2015-03-10 02:21:11 +01:00
Axel Uhl 3d4aeb1904 fixed regular expressions in server comparison script 2015-03-10 01:48:35 +01:00
Axel Uhl 9eabc3bd5e further refined server comparison script 2015-03-10 01:07:47 +01:00
Axel Uhl 4fac31b8ab improved server comparison script 2015-03-10 00:32:43 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Axel Uhl aef326646a made server comparison based on leaderboard groups web service more lenient 2015-03-03 00:28:23 +01:00
Axel Uhl ff44bd90f3 tuning the compareServers script 2015-03-02 22:41:23 +01:00
Axel Uhl 825da81c93 ignore case-only changes when comparing leaderboard groups for their loaded-ness state 2015-03-02 21:06:49 +01:00
Axel Uhl 427adbb8be compare JSON in pretty-printed way, using Python's json.tool 2015-03-02 18:24:37 +01:00
Axel Uhl 7e56a63744 a script that may be used to compare the contents of different servers; not yet complete 2015-03-02 16:39:59 +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
Fredrik Teschke e004c433cc pull out mail functionality into own service and bundle
- needs to live outside com.sap.sse due to dependency on replication
- use mail.properties instead of security.properties
- introduced ServiceTrackerFactory, which led to refactorings in SailingServiceImpl and ~Mock
2015-02-09 21:03:50 +01:00
Fredrik Teschke 1a0b2ffa25 add replication to file storage service 2015-01-29 18:51:55 +01:00
Peter Siegmund c6e0d9b579 Merge branch 'master' into android_apps
Conflicts:
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.shared/res/values/strings.xml
	mobile/com.sap.sailing.android.tracking.app/pom.xml
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/sending/MessageSendingService.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	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/domain/racelog/impl/RaceLogEventsCallback.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventRestorer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SystemInformationActivityHelper.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ByMapCourseDesignDialog.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java
2015-01-13 15:04:22 +01:00
Axel Uhl 656118dae0 Merge branch 'master' into structureImport; pretty broken; in particular ListEditorComposite and SailingService will need close review for phony changes
Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	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/adminconsole/AdminConsoleFeatures.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FleetListEditorComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaManagementPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsListEditor.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/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_ru.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java
	java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/ScoreCorrectionProviderImpl.java
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.xrr.resultimport.test/src/com/sap/sailing/xrr/resultimport/test/ParserTest.java
	java/com.sap.sailing.xrr.resultimport/src/com/sap/sailing/xrr/resultimport/impl/ScoreCorrectionProviderImpl.java
	java/com.sap.sailing.xrr.resultimport/src/com/sap/sailing/xrr/resultimport/impl/XRRParserUtil.java
	java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/listedit/ListEditorComposite.java
	java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/listedit/StringListEditorComposite.java
2014-12-03 10:54:12 +01:00
Axel Uhl eb63284306 updated "REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl" in wiki description for replica start-up 2014-11-25 09:38:24 +01:00
Axel Uhl 6956567574 refactored AbstractRaceChangeListener so that subclasses can provide a defaultAction() implementation; in preparation of solving bug 2473. 2014-11-20 09:58:11 +01:00
Axel Uhl ffea760069 avoid premature replication listener registration when no replica is currently registered 2014-11-17 14:58:17 +01:00
Axel Uhl 771067ebd0 evaluate the combined env.sh in /etc/init.d/sailing before deciding and launching the httpd server 2014-11-16 10:52:49 +01:00
Peter Siegmund 3b4118710a Merge branch 'master' into android_tracking_app 2014-11-11 15:19:08 +01:00
Axel Uhl 762d765790 fixed security properties 2014-11-10 11:07:34 +01:00
Peter Siegmund d03337dabe Merge branch 'master' into feature/android_tracking_app 2014-11-07 15:42:45 +01:00
Axel Uhl fda15b0f30 set focus in username field in LoginView in attach handler; fixed advanced tab's title 2014-11-06 21:19:09 +01:00
Peter Siegmund 619e0bda0a Merge branch 'master' into feature/android_tracking_app 2014-11-06 09:11:51 +01:00
Axel Uhl b0fafcf723 store clearing of password reset secret once the user has changed the password 2014-11-05 18:05:02 +01:00
Axel Uhl 73ca656221 two-step password reset works, fixing bug 2442 2014-11-05 16:56:43 +01:00
Simon Pamies b86324625a Fixed bug 2319 2014-11-04 16:35:33 +01:00
Peter Siegmund e36fa5a448 Merge branch 'master' into feature/android_akkutest 2014-10-28 16:42:18 +01:00
Axel Uhl 3591cc3deb Merge branch 'master' into axel-usermanagement 2014-10-28 15:49:10 +01:00
Axel Uhl 86e005d32c solution for bug 2437: clear the replica's state before registering for operation updates which needs to happen before requesting the initial load 2014-10-28 15:47:51 +01:00
Peter Siegmund e973d349ed added myself into jetty realm 2014-10-24 09:16:54 +02:00
Axel Uhl e0fbe56abd replaced e-mail settings in security.property to use default sapsailing.com stuff 2014-10-21 17:40:49 +02:00