Commit Graph
17395 Commits
Author SHA1 Message Date
Fredrik Teschke 4cb7b535c8 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
2015-02-13 08:29:41 +01:00
Fredrik Teschke df3b798bda Merge remote-tracking branch 'origin/master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
2015-02-13 08:26:24 +01:00
Axel Uhl 89cf67a50a Merge branch 'master' into ftes-mongo-driver-2.13 2015-02-12 23:19:56 +01:00
Fredrik Teschke 3b97cb9fed re-add mail bundle to launch configs after merge 2015-02-12 18:31:26 +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
Fredrik Teschke 5619438b22 Merge branch 'ftes-fix-noclassdeffounderrors' 2015-02-12 18:00:21 +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
Fredrik Teschke acfbe4de49 update launch configs to include jackson bundles to avoid NoClassDefFoundErrors 2015-02-12 13:15:27 +01:00
Fredrik Teschke f637d50c41 add old jackson bundle as dependency to MANIFESTS to avoid NoClassDefFoundErrors 2015-02-12 13:14:47 +01:00
Fredrik Teschke 7bf597f4a4 add transitive dependencies for old jackson bundles to avoid NoClassDefFoundErrors 2015-02-12 13:13:50 +01:00
fmittag ebf6ad882b Merge remote-tracking branch 'origin/master' 2015-02-12 12:51:10 +01:00
Fredrik Teschke cf91286842 add old jackson-jaxrs and jettison bundle to target platform (fix NoClassDefFoundErrors) 2015-02-12 12:50:31 +01:00
fmittag b69b31120d Merge remote-tracking branch 'origin/master' into gwt27_allinone
Conflicts:
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-12 12:36:43 +01:00
Fredrik Teschke 0c8879b643 use lazy autostart for mail bundle in selenium test config and raceanalysis.product 2015-02-12 12:35:44 +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
fmittag 4a5620ca64 back to the future... changed date from 2054 -> 2015 for a news headline :-) 2015-02-12 10:42:50 +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
Alexander Ries 1348cf5236 Added Link to Event Overview to EventDetailsComposite 2015-02-11 15:24:45 +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
Alexander Ries f4e43d9674 Event in AdminConsole => Events links now to Event View in Home.html 2015-02-11 14:43:27 +01:00
Fredrik Teschke b9c6fea20e adapt selenium test to match new behaviour of RegattaLeaderboard#getAllCompetitors()
- test expected leaderboard to contain no competitors before linking tracked races
- however, the Regatta underlying the leaderboard already new the competitors
- with the new implementation, a RegattaLeaderboard also uses the competitors known to the regatta
2015-02-11 14:31:54 +01:00
Fredrik Teschke 3875409363 remove unused class that was added for email invites 2015-02-11 13:44:42 +01:00
Fredrik Teschke 8bfc064c5d Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation 2015-02-11 13:17:51 +01:00
Fredrik Teschke a5507a16b3 remove unnecessary mockito dependency that let build fail 2015-02-11 13:16:47 +01:00
Fredrik Teschke c8d28b9cf0 remove calls to deprecated mongodb threading/concurrency methods
- excerpt from the API doc: "The main use case for this method is to ensure that applications can read their own unacknowledged writes, but this is no longer so prevalent since the driver started defaulting to acknowledged writes. The other main use case is to ensure that related read operations are all routed to the same server when using a non-primary read preference. But this is dangerous because mongos does not provide this guarantee. For these reasons, this method is now deprecated and will be removed in the next major release."
2015-02-11 13:05:41 +01:00
Fredrik Teschke af0856653e removed calls to deprecated mongo-API methods (result of mongo-api upgrade) 2015-02-11 12:58:48 +01:00
Fredrik Teschke 9f13d9e56e fixed deprecation warnings resulting from MongoDB driver upgrade
Conflicts:
	java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java

Conflicts:
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java
2015-02-11 12:57:11 +01:00
Fredrik Teschke 5471a6b8fc update manifests and pom to new mongodb driver version 2015-02-11 12:55:32 +01:00
Axel Uhl 6e6a49467f added release notes entry for nnew "Start delay" leaderboard column 2015-02-11 12:04:49 +01:00
Fredrik Teschke 0c284eed0b Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms' 2015-02-11 11:55:39 +01:00
Fredrik Teschke 9bc83057c6 update to mongo driver 2.13 2015-02-11 11:52:05 +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