Commit Graph
235 Commits
Author SHA1 Message Date
Axel Uhl fe368b66f3 use LeaderboardDTOCalculationReuseCache instead of NoCachingWindLegTypeAndLegBearingCache to really utilize the benefits of caching 2015-05-18 16:17:07 +02:00
Axel Uhl 0262ae2657 trying to fix sporadically failing testStoreAndUpdateCompetitor test by adding a WriteConcern.SAFE to the competitor collection drop() method 2015-05-18 00:19:32 +02:00
Axel Uhl 181e5ee5b9 Merge branch 'master' into ubilabs--tracking_app--develop 2015-05-04 23:14:52 +02:00
Axel Uhl 7747e8707d Merge branch 'ubilabs--tracking_app--develop' into ubilabs--buoy_positioning_app--develop
Conflicts:
	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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-04-22 14:56:03 +02:00
Axel Uhl 18997d1159 Merge branch 'master' into ubilabs--tracking_app--develop 2015-04-22 14:55:23 +02:00
Axel Uhl 7f67ac85fb Merge branch 'master' into ubilabs--buoy_positioning_app--develop 2015-04-22 14:54:28 +02:00
fmittag c65070c78f Merge remote-tracking branch 'origin/master' into design2015 2015-04-20 18:38:52 +02:00
Axel Uhl 1d198aa82c Merge remote-tracking branch 'server/master' 2015-04-17 09:12:05 +02:00
Axel Uhl 33692ffcf8 use simpler version of EntryPointHelper service registration method in EditProfileEntryPoint 2015-04-16 15:28:14 +02:00
Bennet Brunsen e28dec03fc Merge branch 'master' into ubilabs--tracking_app--develop 2015-04-16 11:02:40 +02:00
Axel Uhl c7aaaa6dd6 implemented StringMessages that moved to SSE's StringMessages in the various components 2015-04-14 17:51:08 +02:00
fmittag 64d968cc04 Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	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/SailingServiceAsync.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-04-13 17:04:01 +02:00
Axel Uhl 86449abf2f Merge branch 'master' into ubilabs--buoy_positioning_app--develop
Conflicts:
	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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BaseQRIdentifierWidget.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/DeviceConfigurationQRIdentifierDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-04-13 13:34:55 +02:00
Axel Uhl e3c0c02d0c Merge branch 'master' into bug489 2015-04-09 22:18:49 +02:00
fmittag c85d4e57f6 Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	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-04-09 14:28:00 +02:00
fmittag f40799811b fixed broken style in .css file 2015-04-09 14:23:23 +02:00
fmittag 75ad623f2b Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalytics.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalytics.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/RegattaActivity.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/RegattaAnalyticsView.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/TabletAndDesktopRegattaView.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/SeriesActivity.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/SeriesAnalyticsView.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/TabletAndDesktopSeriesView.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
2015-04-07 14:10:25 +02:00
Axel Uhl f4572256e2 added custom field serializer for UserManagementException whose message can now be final and which does no longer need a no-arg constructor 2015-04-04 01:34:31 +02:00
Axel Uhl 8d8ae6f16c fixed merge issues such as references to the security infrastructure that changed 2015-03-26 15:01:40 +01:00
Axel Uhl ab0db8057a slightly restructured tests that needed to see a method from the host bundle; made package protected 2015-03-23 23:01:13 +01:00
Axel Uhl 7a9498163a untested attempt to fix bug 2704, re-thinking SmartFutureCache 2015-03-16 18:30:29 +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
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 f29f4b434d fixed execution enviornment for two last 1.6 projects 2015-03-06 17:49:39 +01:00
Axel Uhl 59038d77d2 code formatting 2015-03-04 23:33:29 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Steffen Schaefer 1e811bdb3e Removed -XstartOnFirstThread 2015-03-04 09:17:19 +01:00
fmittag 95e6984e5c Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	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/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2015-03-03 20:33:46 +01:00
Simon Pamies 4e9fc0d8ce Making GWT server always selecting a random port to make sure that there are no clashes 2015-03-03 16:13:09 +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
Axel Uhl 9a2b4b1e65 quick fix for bug 2671; is a better solution needed for the case where the mark position is not (yet) known? 2015-03-02 21:22:17 +01:00
Axel Uhl 20c2d8acef harmonized the other shiro.ini files; requiring permission manage_users for UserManagement.html 2015-02-26 13:54:07 +01:00
Axel Uhl d053c394dd avoid NPE during logout 2015-02-25 18:25:19 +01:00
Axel Uhl 837fce4a6c re-use subject instead of acquiring it freshly where possible 2015-02-25 12:32:01 +01:00
Axel Uhl 6ad8d92981 don't save the username in the SOCIAL_USER field; it can always be obtained by Subject.getPrincipal() 2015-02-25 12:28:23 +01:00
Papick Garcia Taboada 39eea7d47c Merge branch 'design2015' of ssh://sapsailing.com/home/trac/git into design2015
# By Steffen Schaefer
# Via Steffen Schaefer
* 'design2015' of ssh://sapsailing.com/home/trac/git:
  Removed debug code
  First draft of a event model for the new design
  Implementation of event navigation for the tabbed interface

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/ApplicationHistoryMapper.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/EventActivityProxy.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/tabs/overview/EventRegattaOverviewPlace.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/tabs/overview/multiregatta/MultiRegattaOverviewWidgetAndActivity.java

# By Papick Taboada

+ Disabled RemoteLogging on gwt modules
2015-02-25 10:53:25 +01:00
Axel Uhl cf010e8c02 provide and use a BearerTokenAuthenticationFilter which defaults to HTTP basic authentication; renamed AccessTokenRealm to BearerTokenRealm 2015-02-24 21:58:02 +01:00
Axel Uhl e6dfe7ea2c fixed how permissions are checked for showing admin console widgets 2015-02-23 15:32:22 +01:00
Axel Uhl 87d11f969c added UserDTO.getAllPermissions(PermissionsForRoleProvider) which accepts the same provider as Shiro in the back-end 2015-02-18 22:22:22 +01:00
Axel Uhl 73f7ce197f whitespace changes only 2015-02-16 23:40:05 +01:00
Axel Uhl 559d2d25ed Merge branch 'master' into bug2589 2015-02-15 17:42:22 +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 3511857662 made compileable again by fixing AdminConsoleFeatures and Permissions; probably could eliminate AdminConsoleFeatures as it now matches up with Permissions 2015-02-13 16:54:50 +01:00
Axel Uhl b4c6dd1eff moved to the use of permissions instead of roles for the AdminConsole; however, this will currently disable the effects of role ADMIN 2015-02-13 16:44:51 +01:00
Axel Uhl d041cece0c implemented AccessTokenRealm and added a first simple test case 2015-02-13 14:22:33 +01:00
Axel Uhl eed757481c moved image resources so they come from GWT-compliant locations, avoiding warnings for GWT2.7, avoiding things to break after GWT2.7 2015-02-13 13:16:09 +01:00
Axel Uhl 0bfe295609 Merge remote-tracking branch 'server/master'
Conflicts:
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-13 12:46:04 +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 fa887140c8 Merge branch 'master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sse.security.ui/Security UI sdm.launch
	java/pom.xml
2015-02-12 18:14:21 +01:00
Axel Uhl 2269ea3096 starting to implement an access token generator 2015-02-12 17:23:08 +01:00