Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl 18b6908515 made mark definition events revokable to support the "Remove" button in course designer
Change-Id: Ifdc31f2fb5d99d21ae071faab4f39c6ea370eed1
2016-03-14 15:08:41 +01:00
Axel Uhl 463cddb921 also add marks to the REST response of MarksJsonExportServlet that don't use a UUID as their ID
Change-Id: I40ea434ab678bb78cfdbf1520a3640dd128471a2
2016-03-14 14:43:14 +01:00
Axel Uhl 05d5eebc66 Bug 3521: implement cleaner separation between RaceColumn.getAvailableMarks() and .getCourseMarks()
Change-Id: Ie6e2453388c625ee68a8c1591fef6dd2f76d1d64
2016-03-14 14:22:10 +01:00
Axel Uhl 73c61b423a Merge remote-tracking branch 'server/master' 2016-03-11 18:13:17 +01:00
Axel Uhl c702099cd0 Merge branch 'master' into ubilabs--rcapp--master 2016-03-11 17:54:53 +01:00
Axel Uhl 1b32447b5d Merge branch 'bug3493' into ubilabs--rcapp--develop 2016-03-11 17:52:13 +01:00
Axel Uhl cc27a3e3f5 fixed StringMessages.java regarding raceManagerDeviceName constant
Change-Id: I5bc0740c94f5178b015e24e21ed9fd9f3c2f5196
2016-03-11 16:42:43 +01:00
Axel Uhl 6708b79e3e changed "Identifier" to "Device Name" for race manager configurations
Change-Id: I0cdc9ea3ce97df43e7a80639ff4232499c353001
2016-03-11 16:06:00 +01:00
Axel Uhl d030407db9 removed unused imports to avoid warnings
Change-Id: Ia62deefc66a6f6af420185ec8e17b8122ad64557
2016-03-11 10:03:28 +01:00
Axel Uhl df5c695c35 exclude windSourcesToExclude in addition to TRACK_BASED_ESTIMATION when computing wind on leg (TrackedLegImpl.getWindOnLeg);
while on the COMBINED wind excluding a wind source had the effect desired, it wasn't possible to affect the leg type by
excluding a wind source.

Change-Id: I236aec9a9d740e153288dc3f80bd0a50302ff627
2016-03-09 14:57:00 +01:00
Axel Uhl 48df8bba5e (re-)add maneuver loss to maneuver info window content
Change-Id: Iddf11cd4166036a1f2b3099c691cd49b6bb39422
2016-03-09 14:27:20 +01:00
Axel Uhl 7996d373c0 using tgz as packaging type of android-sdk-linux instead of zip
Change-Id: If0ea27b1756b5203582a404ed1f0531eacef6aae
2016-03-09 13:14:17 +01:00
Axel Uhl 3421519e31 replaced windows by linux in install-android-sdk's pom.xml
Change-Id: Ief60f4836edea64f3c1b01cd271c5f199eef750c
2016-03-09 13:13:45 +01:00
Axel Uhl 44061bbaef changed Android SDK location to Linux path
Change-Id: I4194c034c974664c64c960334fe95d4c5b1d16a6
2016-03-09 13:13:29 +01:00
Axel Uhl 5e92ad226e Updated the Android release description to the xMake environment 2016-03-09 12:12:24 +00:00
Axel Uhl d9285b011d adjusted the realm's application name so it always contains "SAP Sailing Analytics"
Change-Id: I1721d1f0a8ecefb2c7337b7419c46a477631343f
2016-03-09 10:33:41 +01:00
Axel Uhl a3c9a66ad2 changed authentication filter for sailing domain;
by default, it uses "SAP Sailing Analytics" as the application name; if the system property
com.sap.sailing.server.name is set, its value will be used instead

Change-Id: Iae57b193cfca613dd1aab8df20466ff42472c97e
2016-03-08 22:15:49 +01:00
Axel Uhl 3d25d4537d use a dedicated authentication filter that provides an application name so the HTTP response's WWW-Authentication header shows it
Change-Id: I81f43969acb0aeada3bdb5b6f066c62aa00d0de6
2016-03-08 21:47:53 +01:00
Axel Uhl f83a1663d3 Updated amazon ec2 (markdown) 2016-03-06 15:25:57 +00:00
Axel Uhl 3a2ef75717 Updated ssl support (markdown) 2016-03-06 12:05:06 +00:00
EC2 Server 2a3de7cfac Merge remote-tracking branch 'origin/master' 2016-03-06 12:00:34 +00:00
EC2 Server 2b07fea977 added INSTANCE_INTERNAL_IP4 and use it for a default Plain-SSL mapping during instance start 2016-03-06 11:58:46 +00:00
Axel Uhl adc99598ec Updated ssl support (markdown) 2016-03-06 11:49:09 +00:00
EC2 Server fa4df27ac2 use Event-SSL macro in /etc/init.d/sailing start-up script 2016-03-06 10:58:44 +00:00
Axel Uhl 286a50035f Updated ssl support (markdown) 2016-03-06 10:42:51 +00:00
Axel Uhl c72a10ea0d offer to create default regatta only after default leaderboard group creation is done; refresh events after linking default regatta
Change-Id: Ibd9779e3e55750b5733ab21e3cc3e75fcc7f9177
2016-03-04 16:13:48 +01:00
Axel Uhl 01a6bfe931 using ScheduleFinally consistently for focus in DataEntryDialog
Change-Id: I2fb1eca588a0245088c4917f3271bf537865fad0
2016-03-04 15:49:07 +01:00
Axel Uhl b3756ff430 added some comment about the selection of -1 as race column insert index
Change-Id: I2327fb5be5e6f933ade9d16fd08409a5d7ce43ec
2016-03-04 15:16:11 +01:00
Axel Uhl 0e53de740c Merge remote-tracking branch 'server/jbross-poor-mans-wizard' into jbross-poor-mans-wizard
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CreateRegattaCallback.java

Change-Id: I777eeb86995fe5e75eb31b0c85eee8ab69ad9c8d
2016-03-04 15:14:53 +01:00
Axel Uhl 5d5e1fe132 moved call to createDefaultRacesIfDefaultSeriesIsPresent into onSuccess to synchronize with regatta creation, avoiding IndexOutOfBoundsException
Change-Id: I9ed576986813c613338f5775f2551f989d09105b
2016-03-04 15:14:13 +01:00
Axel Uhl 6027129bf7 removed TODO related to bug 1447 which was fixed
Change-Id: Ie9935a197345f9090acab93dff900da93038cada
2016-03-04 14:09:18 +01:00
Axel Uhl 33ad9068c0 whitespace / formatting change only
Change-Id: I7065fac6d33f58b05868b660b8cb4a5033cc95b2
2016-03-04 13:59:01 +01:00
Axel Uhl 9e1f5f6559 Merge branch 'master' into jbross-poor-mans-wizard
Conflicts:
	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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties

Change-Id: I12a22229ea35c7ffc976c23e7244f64c14cb959c
2016-03-04 13:40:12 +01:00
Axel Uhl 1d63fb4462 fixing the bug3510 issue (port 80 for all schemes if no port explicitly specified) also in buoy pinger's CheckinManager
Change-Id: I51af384ae5547a96afaf7cd699b30e831e3f8351
2016-03-04 12:46:17 +01:00
Axel Uhl cdb9af79c3 whitespace/formatting changes only
Change-Id: Ia7eddd3f3285dc12b519c947ab6250d0a6ed0a19
2016-03-04 12:39:06 +01:00
Axel Uhl e44be25c03 also skip the ":" if no port present
Change-Id: I121152ba16111b957c8662e3f7436680f8e8eaa5
2016-03-04 12:36:07 +01:00
Axel Uhl 52b9b25c5a Fix for bug3510: don't use a port specification in derived URLs if original URL had none
Change-Id: I7e9e757d44394510d3c8bd2cd21e580c037b9da3
2016-03-04 12:34:41 +01:00
Axel Uhl 5de6070adf removed obsolete TODO
Change-Id: Iac417346f877bf27fc12b1b2f1c52580c6c6a291
2016-03-04 11:35:49 +01:00
Axel Uhl e82c490531 fixed typo in "Getting event information" string of tracking app
Change-Id: I6b7fe56cb8d880a0aa158f49650134a30020af74
2016-03-04 11:21:49 +01:00
Axel Uhl a6aba8e0b7 Merge branch 'master' into bug3509 2016-03-04 11:12:08 +01:00
Axel Uhl 96c7be65df Merge branch 'ubilabs--tracking_app--master' 2016-03-04 11:11:32 +01:00
Axel Uhl 2559074d6e trying to replace manual event deserialization by use of EventBaseJsonDeserializer
Change-Id: I7df94d2a1cb9100ded62b29e79f2f4041f15089a
2016-03-04 11:10:45 +01:00
Axel Uhl 2bae2dc265 fixed token generation for QR code; required getOrCreateAccessToken instead of only getAccessToken
Change-Id: Id7817e8f2c7939b088689acb3ac9b9ae42638643
2016-03-03 15:15:04 +01:00
Axel Uhl 5570f4f349 Merge branch 'bug3493' into bug2589 2016-03-02 19:04:49 +01:00
Axel Uhl d8186a9985 Merge branch 'design2015' into bug2589
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java

Change-Id: I9daa6eff11d272940f087d3704a6f34ae527bb5e
2016-03-02 18:52:22 +01:00
Axel Uhl 711db6ba9e re-enable permission-less read access to events
Change-Id: Id8c3b2a78c148edb4f7a9e205fe6ade1f3d09dfe
2016-03-02 18:37:43 +01:00
Axel Uhl e847162312 Merge branch 'master' into bug2589 2016-03-02 17:56:23 +01:00
Axel Uhl f92eed6007 using PingResource in monitoring.properties to avoid requiring authentication for a gateway monitoring endpoint
Change-Id: Ic03fe48c3507ea53c49e576491b83ecb87d02f0f
2016-03-02 16:11:06 +01:00
Axel Uhl b8bfcbe80e Merge branch 'master' into bug2589 2016-03-02 16:10:31 +01:00
Axel Uhl 4206961087 added PingResource to allow monitoring bundle to access a service that does not require authorization
Change-Id: I8dcbba9d3d3169914826caf0a184fe9a864393b7
2016-03-02 16:09:58 +01:00
Axel Uhl 4ce58d7a90 fixed monitoring.properties: also had to remove monitor.endpoints entry for events bundle
Change-Id: I6c6fab6fe8673498826b623cd7d17b4e578e2831
2016-03-02 16:04:52 +01:00
Axel Uhl 97f0213635 Merge branch 'master' into bug2589 2016-03-02 16:04:23 +01:00
Axel Uhl 57330bbf16 added event and rc/rclog to shiro.ini
Change-Id: If3df396316da7086541029af75423f1ccca68b89
2016-03-02 15:45:04 +01:00
Axel Uhl e618ac0cff use & to separate fragment parameters
Change-Id: Idaeac854591c00c8df624d116b14393512ef0858
2016-03-02 15:00:57 +01:00
Axel Uhl 2b392c81fd fixing check for device identifier; it doesn't have to be the first fragment parameter
Change-Id: Id4ad166d2359e551b94cc69bf08ba6cbc0aefa28
2016-03-02 14:59:32 +01:00
Axel Uhl 5f6c3775e8 whitespace change only
Change-Id: I90c2f7f4d32afe1fb762f6a5f54618d9474affc3
2016-03-02 14:56:59 +01:00
Axel Uhl a0a8c7f4d1 Merge remote-tracking branch 'server/bug3493' into bug3493
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DeviceConfigurationQRCodeUtils.java

Change-Id: Iea8dc1ba061467840ea3ae0662438cd609b68a56
2016-03-02 14:56:39 +01:00
Axel Uhl 6aec12d192 fixing how the token is parsed, limiting "=" split to two elements, accepting token to contain "="
Change-Id: I6b5c5210e9eca4639d175a5f13efad5a9f4e6ed0
2016-03-02 14:53:56 +01:00
Axel Uhl 2f487f6dc2 shows the token as additional parameter in the device configuration QR code in AdminConsole
Change-Id: I6c25a776c6eb5344a18ac5948b5cff5a35986b9a
2016-03-02 14:47:05 +01:00
Axel Uhl be0a483a7e don't use URLDecoder from java.net package; it's not in the GWT JRE emulation
Change-Id: I9877c3d0a71874aad7568d559f2c4a59556246d2
2016-03-02 14:32:02 +01:00
Axel Uhl 13b37b204d fixed HashMap import
Change-Id: Ibf448c5b575a47844eb674d82e4f92c73d1a22ba
2016-03-02 14:28:01 +01:00
Axel Uhl e552105bbd made compilable, using DeviceConfigurationDetails
Change-Id: Ia85d641e9a94aeab20cacb390ed2004a625117d7
2016-03-02 12:53:26 +01:00
Axel Uhl dfb4b9b5b5 Merge remote-tracking branch 'server/bug3493' into bug3493 2016-03-02 12:51:50 +01:00
Axel Uhl 9fd924ddfc fixed imports
Change-Id: I0db8e5580a0181d3ab102f0a8a060c9d90ef53df
2016-03-02 12:51:31 +01:00
Axel Uhl 1bc8300210 added access token to QR code
Change-Id: I9fb1f44c8e21da4a30df9ce78dd75519c49a5476
2016-03-02 12:49:51 +01:00
Axel Uhl 4e72f2ff99 updated notification e-mail text for password change according to Stefan Lacher's suggestion
Change-Id: I4e7e27bc04623c02aeedbd3401ca363a8f769fb6
2016-03-02 11:16:52 +01:00
Axel Uhl 620456b0eb Merge branch 'bug2589' into bug3493 2016-03-02 11:08:38 +01:00
Axel Uhl 089bcf997b added test for access token removal
Change-Id: I392b435e81e920818a0f3615ec289050e663abc6
2016-03-02 11:01:51 +01:00
Axel Uhl 44c37b4c32 fixed SecurityResourceTest, now removing existing token when requiring creation of new one
Change-Id: I1e8a5be5f7659ba0bff2841bed02033139de1b8a
2016-03-02 10:59:54 +01:00
Axel Uhl 49b708ad42 Merge remote-tracking branch 'origin/bug3441' 2016-03-02 02:31:47 +01:00
Axel Uhl 524abc1124 secure the RaceLog POST servlet, requiring LEADERBOARD.UPDATE; fixed auth token loading in UserStore;
added removeAccessToken with remove_access_token end point on SecurityResource, available for ADMIN role
and owner
2016-03-02 00:09:54 +01:00
Axel Uhl 70a121a1d6 Merge remote-tracking branch 'origin/master' into bug2589 2016-03-01 21:24:13 +01:00
Axel Uhl 8ed91f4096 fixed post-merge issues with missing , or extra ; characters in merged lists of permissions
Change-Id: I0635a8e4a09d73f5807c90f182030a485be9928d
2016-03-01 16:54:34 +01:00
Axel Uhl c356c2f97c Merge branch 'master' into bug2589
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/Permission.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java

Change-Id: I3aaf2651c01460dd2fb0caf95735b9919586a2c9
2016-03-01 16:47:00 +01:00
Axel Uhl 31987ad6fc consolidated imports to avoid warnings
Change-Id: I2d50fa10bda95d6313f36c095242c7731fa6d8a1
2016-03-01 11:43:32 +01:00
Axel Uhl 57b1a9624f Updated ssl support (markdown) 2016-02-29 20:27:46 +00:00
Axel Uhl 4c0ea01e11 Updated home (markdown) 2016-02-29 20:08:50 +00:00
Axel Uhl c61a38cdc4 more formatting changes
Change-Id: I77395e834600c312a55203d637abe6eea958d637
2016-02-29 14:59:16 +01:00
Axel Uhl d3f34bdcd1 adjusted parameter name for SailingService.createEvent and .updateEvent to reflect that the keys are the locale names
Change-Id: Ia5faa73592822341d381cfa4ce6bb4add1bdabd4
2016-02-29 14:51:13 +01:00
Axel Uhl b735d6372b more code formatting
Change-Id: I15792a15508a16bcfa91b9344b0a441e8707457d
2016-02-29 14:49:16 +01:00
Axel Uhl ae874e4f30 more code formatting
Change-Id: If1172f62325235ae06b23a66e2a9c8886f4de114
2016-02-29 14:47:09 +01:00
Axel Uhl 0c7a80c10f more code formatting
Change-Id: Ifacb1013ca9a2046aa91fe86ab599117155cee8a
2016-02-29 14:39:00 +01:00
Axel Uhl d255692c8c indicating to the user that the first sailors info website URL is the default
Change-Id: Iadc07779621be9a3cc5dcff0667d7c038b9ef785
2016-02-29 14:32:52 +01:00
Axel Uhl 16fdbdb658 more code formatting
Change-Id: I5a67cda91b67381e7cd6fb0b81bdb558eb48f947
2016-02-29 14:32:46 +01:00
Axel Uhl e7ae066d61 some code formatting and typos
Change-Id: Ieaba33f407f5070d10fad9b2499c2c284edd72d3
2016-02-29 14:04:17 +01:00
Axel Uhl 63e6374aa8 enhanced Javadoc for CopyOnWriteHashMap
Change-Id: I8a075c58ce580712e50e675685b7bc292d51021e
2016-02-29 14:03:53 +01:00
Axel Uhl eac2569c84 Merge branch 'master' into bug3441 2016-02-29 10:02:03 +01:00
Axel Uhl 4f5ca6ceec Merge remote-tracking branch 'server/master' 2016-02-29 10:00:54 +01:00
Axel Uhl efd849ae4c Merge branch 'archive-hotfix'
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java
2016-02-27 21:44:53 +01:00
Axel Uhl c197ed177e fixing bug 3482: Time Slider extends until "now" for SwissTiming Olympics 2012 Replay Races;
the fix now considers the newest tracking event and/or endOfRace in case startOfTracking
and endOfTracking are both null
2016-02-27 21:41:31 +01:00
Axel Uhl 40e4be2fc8 fixing SwissTiming test about start line distance of SAW005906 which has broken mark data; using SAW005905 instead 2016-02-27 13:24:41 +01:00
Axel Uhl fb73c1536c fixed testInvalidateByNewMarkPositionWithMultipleMarkPositionsInCache by adjusting the verdict to non-interpolating mark track
Change-Id: I6191600cbe2af1aacbfdf2c6143bd7239c2de5d0
2016-02-27 11:03:49 +01:00
Axel Uhl 95516655a4 bug3421: fixing access to GPSFixTrack.add method in tests
Change-Id: I621e200bce294f34bc23b1215675baf37467d8df
2016-02-27 10:55:59 +01:00
Axel Uhl cc918e68c9 Merge branch 'master' into bug3441 2016-02-27 01:22:41 +01:00
Axel Uhl 116ae712f8 removed the whitespace in home.md again
Change-Id: If46109c6b10b511d6106d1a115323dd39869bd91
2016-02-27 01:14:17 +01:00
Axel Uhl 895024bcb2 whitespace change in Wiki page only
Change-Id: I2fb0efad2c505d06b9347c9bc820ab8047a97f6c
2016-02-27 01:10:16 +01:00
Axel Uhl 0da5d023b1 fixed type for non-interpolation test: have to use DynamicGPSFixTrackImpl to have an accessible add method
Change-Id: Ic426c9921f29a95081a07902154d4ca8f2a4e305
2016-02-27 00:53:59 +01:00
Axel Uhl ff35316a1d Merge branch 'master' into bug3441 2016-02-26 22:00:49 +01:00
Axel Uhl 13a7b22ee0 Merge branch 'master' into bug3421 2016-02-26 21:59:07 +01:00
Axel Uhl e75039b807 Merge remote-tracking branch 'server/master' 2016-02-26 21:58:17 +01:00