Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl da608903b8 fixed launch configs; fixed mail service which needs to implement ClearStateTestSupport 2015-02-16 16:36:12 +01:00
Axel Uhl ef698c16a0 removed cherry-picked effects of permission management 2015-02-16 15:59:55 +01:00
Axel Uhl eaacd3f4c1 moved server-side QR code stuff from sse.common to sse because it's not GWT-compileable
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/security/SailingPermissionsForRoleProvider.java
	java/com.sap.sse.security.common/src/com/sap/sse/security/shared/PermissionsForRoleProvider.java
	java/com.sap.sse.security/src/com/sap/sse/security/AbstractUserStoreBasedRealm.java
2015-02-16 15:58:18 +01:00
Axel Uhl 60be227a06 after uploading the target platform, make sailing/ directory itself readable for all 2015-02-15 17:12:19 +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 b4d3157bf0 renamed target definition again to its original name 2015-02-14 23:35:18 +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 1242bdfd01 fixed missing @Ignore import 2015-02-14 17:21:21 +01:00
Axel Uhl 6bf7a35e55 ignore SecurityResourceTest.createAccessTokenAndAuthenticate for now on master 2015-02-14 08:00:41 +01:00
Axel Uhl 799dfe93da Merge remote-tracking branch 'server/master' 2015-02-13 23:23:44 +01:00
Axel Uhl f5d87fc908 set bundle context in com.sap.sse.security's Activator.start method right at the beginning 2015-02-13 23:21:20 +01:00
Axel Uhl 52dfc60163 moved RoIB dashboard images to correct folder, avoiding warnings in GWT 2.7 build and breaks in later releases 2015-02-13 23:15:20 +01:00
Axel Uhl 4607abfe3c moved VerticalTabLayoutPanel.css to its Java class, avoiding more of the
"Resource 'com/sap/sse/gwt/resources/VerticalTabLayoutPanel.css' was located via ClassLoader"
warnings
2015-02-13 15:05:42 +01:00
Axel Uhl 7bc5abcbf4 trying to avoid Android project warnings by adding a DOCTYPE 2015-02-13 15:00:20 +01:00
Axel Uhl 971b9e0d1e added tests for REST API permission checking 2015-02-13 14:40:50 +01:00
Axel Uhl d041cece0c implemented AccessTokenRealm and added a first simple test case 2015-02-13 14:22:33 +01:00
Axel Uhl dabd2d3a98 fixed initialization of SecurityResourceTest whose first test around access token retrieval is now green 2015-02-13 13:52:05 +01:00
Axel Uhl 412ee455ba un-ignore breaking test on branch 2589 again 2015-02-13 13:17:57 +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 f96f0b82de fixed bug 2063 2015-02-13 12:59:35 +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
Axel Uhl b07fd85182 upgraded TracAPI from 3.0.7 to 3.0.9, fixing a ConcurrentModificationException 2015-02-13 12:42:47 +01:00
Axel Uhl c55ae812fb ignore failing SecurityResourceTest for now on master 2015-02-13 12:41:25 +01:00
Axel Uhl 0800cab32a started with access token / REST security; test case read 2015-02-13 11:43: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
Axel Uhl ecc6ff8332 Merge branch 'master' into bug2589 2015-02-13 09:31:59 +01:00
Axel Uhl 89cf67a50a Merge branch 'master' into ftes-mongo-driver-2.13 2015-02-12 23:19:56 +01:00
Axel Uhl 2269ea3096 starting to implement an access token generator 2015-02-12 17:23:08 +01:00
Axel Uhl 6a989c62c0 Merge branch 'master' into ftes-mongo-driver-2.13 2015-02-12 16:09:31 +01:00
Axel Uhl c94580f2b4 added mongodb driver from target platform to bundle list in remote target definition 2015-02-12 16:08:52 +01:00
Axel Uhl 6ee562797e removed mongo driver from pom.xml as it doesn't need to be built 2015-02-12 16:07:05 +01:00
Axel Uhl ac12797daf Merge remote-tracking branch 'server/master' 2015-02-12 16:06:13 +01:00
Axel Uhl 98d5235b47 upgraded all Mongo-using bundles to 2.13.0 driver 2015-02-12 16:00:15 +01:00
Axel Uhl fcc8283813 Merge branch 'master' into ftes-mongo-driver-2.13 2015-02-12 15:31:50 +01:00
Axel Uhl e563327085 moving Mongo 2.13.0 driver to target platform 2015-02-12 15:31:05 +01:00
Axel Uhl 774211da05 fixed test verdict after changing rule for no score in LowPoint;
see also http://hudson.sapsailing.com/job/SAPSailingAnalytics-master/1321/testReport/junit/com.sap.sailing.selenium.test.leaderboard/TestLeaderboardConfiguration/testDynamicRaceLinking_FirefoxDriver/
2015-02-12 14:43:05 +01:00
Axel Uhl 92f4ba8941 Merge remote-tracking branch 'server/master' 2015-02-12 11:03:49 +01:00
Axel Uhl f29adc1aa8 removed method from SailingService that wasn't used through RPC 2015-02-12 10:49:18 +01:00
Axel Uhl 65a6ee7025 fixed sorting order in no-race low-point comparison 2015-02-12 10:49:00 +01:00
Axel Uhl 8841360f8d implementing a sorting rule that puts competitors with no races scored behind those that scored at least one race 2015-02-12 10:38:34 +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
Axel Uhl 495e1f1f96 minor string message fixes; added entry to admin console release notes about changes 2015-02-11 18:45:44 +01:00
Axel Uhl 7b8b01fd21 Merge branch 'master' into bug_2645 2015-02-11 18:27:56 +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 d96978ef92 fixed RegattaImpl.getAllCompetitors() such that it not only considers RaceDefinitions owned by the regatta but also all TrackedRaces linked to the regatta's columns 2015-02-11 17:34:51 +01:00
Axel Uhl 325d308482 simplified implementation of CompetitorImpl.hasEmail() 2015-02-11 16:26:07 +01:00
Axel Uhl fe75e7899d simplified CompetitorDTOImpl.hasEmail() 2015-02-11 15:54:26 +01:00
Axel Uhl 40f0ac5bbd RegattaLeaderboard.getAllCompetitors() now directly delegates to Regatta.getAllCompetitors() because it does the same thing 2015-02-11 15:47:22 +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
Axel Uhl 2beba1f5d1 Merge remote-tracking branch 'server/master' 2015-02-11 14:48:06 +01:00
Axel Uhl 79e27fad8a proposal for bug2515: chart width remains unchanged; height always consumes available vertical window space 2015-02-11 14:39:39 +01:00
Axel Uhl 143ae6aeee use the same setHeight() implementation for both types of competitor leaderboard charts (points / ranks) 2015-02-11 14:12:45 +01:00
Axel Uhl 66e4f29f66 Merge remote-tracking branch 'server/bug2515' into bug2515 2015-02-11 13:49:38 +01:00
Axel Uhl 0042eab482 Merge branch 'master' into bug2515 2015-02-11 13:38:05 +01:00
Axel Uhl 6e6a49467f added release notes entry for nnew "Start delay" leaderboard column 2015-02-11 12:04:49 +01:00
Axel Uhl bc3437892e added column to leaderboard showing the time since race start in seconds 2015-02-11 11:45:50 +01:00
Axel Uhl 5e4a77cf28 Merge branch 'master' into ribdashboard
Conflicts:
	java/com.sap.sailing.gwt.ui/pom.xml
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2015-02-11 11:06:51 +01:00
Axel Uhl eb3cf53352 made getReplicationService() protected again on SailingServiceImpl because it's overridden in SailingServiceImplMock 2015-02-11 10:28:03 +01:00
Axel Uhl 518b86651e made SailingServiceImpl.getFileStorageService() private again 2015-02-11 10:23:51 +01:00
Axel Uhl ea7d158b0b made SailingServiceImpl.getDeviceIdentifierStringSerializerHandlerFinder(...) private again 2015-02-11 10:22:43 +01:00
Axel Uhl b2cbc90102 made SailingServiceImpl.getReplicationService() private again 2015-02-11 10:20:50 +01:00
Axel Uhl d91257c8d6 Merge branch 'master' into ftes-mail-move-to-sse 2015-02-11 10:04:01 +01:00
Axel Uhl 120bef131e activated obfuscation again, hoping that the "wait for PENDING_AJAX_CALLS" cuts it 2015-02-11 08:52:33 +01:00
Axel Uhl f807849f2a wait for PENDING_AJAX_CALLS to appear, catching and logging exception when it's not yet there, then continue to wait 2015-02-11 08:51:43 +01:00
Axel Uhl 6c413b7afe generate PRETTY GWT output for gwt.ui for now; does this impact Selenium test cases and the availability of the PENDING_AJAX_CALLS variable? 2015-02-11 08:35:37 +01:00
Axel Uhl 1632e7d37c trying again with PRETTY GWT output; does this really affect the PENDING_AJAX_CALLS variable's availability? 2015-02-11 08:33:26 +01:00
Axel Uhl fffb06c7f2 re-enable obfuscation for gwt.ui GWT compile 2015-02-10 23:36:33 +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
Axel Uhl d66bbda63b export org.json from org.openqa.selenium.osgi bundle 2015-02-10 23:29:56 +01:00
Axel Uhl 8646840cec harmonized launch configurations 2015-02-10 23:17:35 +01:00
Axel Uhl b728d2f85a export org.json from org.openqa.selenium.osgi bundle 2015-02-10 22:34:08 +01:00
Axel Uhl b9e3daf224 fixed -x option for gwt worker number setting 2015-02-10 22:31:11 +01:00
Axel Uhl f3f1c90417 Merge branch 'master' into ribdashboard 2015-02-10 16:02:52 +01:00
Axel Uhl 69e29365f8 fixing bug 2643 by making result comparison more intelligent 2015-02-10 16:01:08 +01:00
Axel Uhl 7ac80d71e3 Merge branch 'master' into ribdashboard; introduced gwt.workers property in maven build
Conflicts:
	configuration/buildAndUpdateProduct.sh
2015-02-10 15:27:01 +01:00
Axel Uhl 6f1d2229a5 preparing for configurable number of GWT workers 2015-02-10 15:03:02 +01:00
Axel Uhl 4e55e61c51 fixed merge problems in launch configs, adding file storage bundle everywhere 2015-02-10 14:37:41 +01:00
Axel Uhl 66d8b8fc4d added gwtbootstrap Maven dependency to dashboards project 2015-02-10 14:28:00 +01:00
Axel Uhl bcac803264 re-add WEB-INF/classes to .gitignore so only .dummy file will be checked out 2015-02-10 14:19:04 +01:00
Axel Uhl cf58c8babf re-formatted dashboard pom.xml files; introduced .dummy file in WEB-INF/classes to ensure directory is there after check-out 2015-02-10 14:18:28 +01:00
Axel Uhl cc4d9e320e re-formatted java/pom.xml 2015-02-10 14:14:08 +01:00
Axel Uhl 012ed3b242 added filestorage bundle to feature.xml (probably resolving an ill-resolved merge conflict) 2015-02-10 13:50:45 +01:00
Axel Uhl 2af95c003c added inherits for AdminConsole.gwt.xml 2015-02-10 13:40:46 +01:00
Axel Uhl 96f27612aa Merge branch 'master' into ribdashboard 2015-02-10 13:22:06 +01:00
Axel Uhl 4694814938 avoid NPE after de-serializing a TrackedRaceImpl by moving shortTimeWindCache creation to the front of readObject(...) 2015-02-10 13:21:03 +01:00
Axel Uhl 1ed846859c Merge branch 'master' into ribdashboard
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-10 13:00:48 +01:00
Axel Uhl 34873bb0eb Merge remote-tracking branch 'server/master' 2015-02-10 12:40:17 +01:00
Axel Uhl 5ba401dbb1 exclude the currently defective com.sap.sse.gwt.test fragment from the build; we first need to fit it into the Maven environment properly 2015-02-10 12:38:40 +01:00
Axel Uhl fd56e1866b avoid build.properties warnings in new com.sap.sse.gwt.test project by adding resources/ 2015-02-09 17:41:56 +01:00
Axel Uhl f40b1d0d72 Merge remote-tracking branch 'server/master' 2015-02-09 17:19:39 +01:00
Axel Uhl accfa9851b minor patch to avoid ConcurrentModificationException during GWT DevMode where true concurrency can happen 2015-02-09 17:19:12 +01:00
Axel Uhl 40a9a2c3df adjusted test such that it runs again with fixed version 2015-02-07 09:55:35 +01:00
Axel Uhl 3a99b54b32 this state commited for documentary purposes only: it produces the expected deadlock because the failing test cannot
cut between computeMaxSpeed and cache anymore which it is trying to do.
2015-02-07 08:38:38 +01:00
Axel Uhl c5e23bce8d one more edition of the failing test case for bug2626 2015-02-07 08:31:34 +01:00
Axel Uhl bd8616aab8 refined the failing test 2015-02-07 08:17:44 +01:00
Axel Uhl 18d6f7ef38 added a failing test case for bug 2626 by forcing a race condition 2015-02-07 07:11:00 +01:00
Axel Uhl e93c8bf2b7 bug 2627: properly unsubscribe TracTracRaceTrackerImpl as connection status subscriber from the race subscriber 2015-02-07 03:20:03 +01:00
Axel Uhl 48bd64562b improved Javadoc 2015-02-06 18:56:19 +01:00
Axel Uhl 7d5378bb3e added test case for tricky interval border cases for MaxSpeedCache 2015-02-06 18:56:07 +01:00
Axel Uhl e476635cd1 fixed launch configs, removing Apple-specific stuff 2015-02-06 18:46:30 +01:00