Commit Graph
61 Commits
Author SHA1 Message Date
Simon Pamies 8a67aa5621 Reverted accidential port change 2013-02-04 15:12:09 +01:00
Jens Rommel 20423e39ff Merge remote-tracking branch 'external/master' into dev 2013-01-17 17:21:27 +01:00
Jens Rommel f9170db047 Merge remote-tracking branch 'origin/master' into media
Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	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 (Proxy).launch
2013-01-06 12:28:27 +01:00
Axel Uhl d8db4c66df Merge branch 'master' into dev 2012-12-20 10:41:17 +01:00
Axel Uhl ce6f9e277f adjusted monitoring properties to check for index.html for www bundle instead of / which always responds 2012-12-20 10:36:16 +01:00
Jens Rommel b0d518d11c Merge remote-tracking branch 'origin/master' into media
+ Further progress with media support:
  - added audio awareness, which works already
  - still under construction, e.g. whole live cycle/play/pause still not fully wired
2012-12-11 15:10:18 +01:00
Axel Uhl b4b6030783 Merge branch 'master' into dev 2012-11-30 17:28:26 +01:00
Axel Uhl 56f5810d30 added my mobile e-mail address to monitoring.properties 2012-11-30 17:19:52 +01:00
Axel Uhl a4d7917e75 Merge branch 'master' into dev 2012-11-30 17:12:05 +01:00
Axel Uhl c5a0ed6c59 fixed monitoring.properties; fixed monitoring bundle to handle wrong bundle names more robustly 2012-11-30 17:11:37 +01:00
Axel Uhl b5bdd764f9 Merge branch 'master' into dev 2012-11-30 15:40:50 +01:00
Axel Uhl d4071b8af2 fixed port in monitoring properties 2012-11-30 15:34:53 +01:00
Axel Uhl 0d2bf91d30 adjusted monitoring properties for other web bundles, adjusted ports to dev ports 2012-11-30 15:33:12 +01:00
Axel Uhl 0f0c5977d9 Merge branch 'master' into dev 2012-11-30 14:33:52 +01:00
Simon Pamies 64d4e061d0 Added check for URL endpoints 2012-11-30 09:47:12 +01:00
Axel Uhl 580d01af0f Merge branch 'master' into dev
Conflicts:
	java/com.sap.sailing.feature.p2build/raceanalysis.product
2012-11-29 18:11:37 +01:00
Axel Uhl 33c8d35ca1 prepared monitoring configuration for sapsailing.com; however, more work is necessary to allow monitoring individual URLs / WebBundle contexts 2012-11-29 13:36:37 +01:00
Axel Uhl 113b02ece6 Merge branch 'master' into dev
Conflicts:
	java/com.sap.sailing.feature.p2build/raceanalysis.product
2012-11-29 13:09:55 +01:00
Simon Pamies f318256146 Fixed some problems, added new endpoint definition 2012-11-28 13:12:48 +01:00
Simon Pamies 82ed5425f2 Revamped configuration to be read from file 2012-11-26 19:14:36 +01:00
Jens Rommel f4b72a4873 Merge remote-tracking branch 'origin/master' into media 2012-11-16 11:47:32 +01:00
Jens Rommel b4e5a33e98 Implemented database access of media management in Admin Console. Add/create, query and delete already work, update missing, yet. 2012-09-28 12:21:22 +02:00
Axel Uhl 36ce07a610 Merge branch 'master' into dev 2012-09-26 17:28:35 +02:00
Axel Uhl 36ac9e6892 turned off excessive TTCM logging again 2012-09-26 17:27:52 +02:00
Axel Uhl 826d40e600 Merge branch 'master' into dev 2012-09-26 17:27:16 +02:00
Axel Uhl 31e79556b2 fixed bug 968 by invalidating the DistanceCache for the interval between the last fix and the new fix 2012-09-26 17:22:44 +02:00
Axel Uhl d3ae3950e2 Merge branch 'master' into dev 2012-09-26 13:50:50 +02:00
Axel Uhl 8077638f61 turn off TTCM detail logging by default also for non-debug logging properties 2012-09-26 13:49:54 +02:00
Axel Uhl 3ed26c1256 added logging option for TTCM raw positions; see logging_debug.properties 2012-09-26 13:49:18 +02:00
Axel Uhl ab663db0b1 Merge branch 'master' into dev 2012-07-03 14:33:57 +02:00
fmittag 775b15b0d7 increased "max threads" in the jetty config from 1000 to 10000 2012-07-03 11:14:02 +02:00
Axel Uhl 250d1a5a16 Merge branch 'master' into dev 2012-06-20 17:39:57 +02:00
fmittag 4424c7eff7 change the maxThreads property of the Jetty configuration from 200 to 1000 2012-06-20 17:35:47 +02:00
Axel Uhl ae26f769a1 Merge branch 'master' into dev 2012-05-22 13:32:27 +02:00
fmittag 563a71f36b added better default log settings for org.eclipse.jetty and org.apache.activemq packages 2012-05-22 13:22:38 +02:00
Axel Uhl 32b11dc56c Merge branch 'master' into dev 2012-05-05 01:10:03 +02:00
fmittag ac700f2367 fixed typo in Riccardos name for user login 2012-05-04 17:38:29 +02:00
Axel Uhl 84887a0742 Merge branch 'master' into dev 2012-03-22 11:21:24 +01:00
fmittag 15a57ca459 added new users to the default jetty based user store: nils, christopher, ricardo, stefan, milan 2012-03-21 18:03:37 +01:00
Axel Uhl 6ae3b82c4b Merge branch 'master' into dev
Conflicts:
	java/target/configuration/config.ini
2012-02-08 11:36:10 +01:00
Axel Uhl 90eca6bbee configuration file now is generated based on raceanalysis.product 2012-02-08 11:35:34 +01:00
Axel Uhl 802586e449 re-established port settings for dev branch/server 2012-02-08 11:24:02 +01:00
Axel Uhl ffa9af0047 re-established dev branch diff 2012-02-08 11:23:05 +01:00
fmittag f7d35ffeff -Added simple usermanagement service to enable creation of user role specific settings for the raceboard
-Added simple security roles for the AdminConsole.html and LeaderboardEditing.html -> the users and roles are defined in the realm.properties in the jetty config directory
2012-02-07 13:59:17 +01:00
fmittag 6a7749a405 added default jetty configuration files 2011-12-08 11:55:51 +01:00
Axel Uhl 4dbdc901af Merge branch 'gwt' into gwt-mak
Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gdt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LeaderboardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
	java/pom.xml
2011-11-25 22:38:02 +01:00
Axel Uhl eac6d6d1ad use same message loader / persistence to avoid duplicate SailMasterConnector instances;
in the long run, supporting equals on SwissTimingPersistenceImpl and the corresponding
configurations may help controlling the connector cache.
2011-11-25 16:05:15 +01:00
Axel Uhl f0959ae347 increased sizes and file counts for logging properties 2011-11-23 09:27:59 +01:00
Marcus Kammer cbc2e3b701 Merge branch 'gwt' into mak
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LeaderboardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LogoAndTitlePanel.java
	java/com.sap.sailing.gwt.ui/war/AdminConsole.html
	java/com.sap.sailing.gwt.ui/war/images/magnifier.png
	java/com.sap.sailing.gwt.ui/war/images/magnifier_slashed.png
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2011-11-22 16:06:48 +01:00
fmittag bdd42780c4 added two logging property files to the general config folder (one of them is for debugging purposes) 2011-11-21 14:07:09 +01:00