Commit Graph
397 Commits
Author SHA1 Message Date
fmittag 5cf08e4d66 added replication test for flagImage attribute of competitor 2015-04-17 16:37:04 +02:00
fmittag 59248fcf49 added flagImageUrl as new attribute on competitor to enable custom flags (e.g. club flags) instead of the nation flags 2015-04-16 17:38:08 +02:00
Axel Uhl df81a3b83f reverted inadvertent typo from commit dcdc33a556 2015-04-07 12:18:41 +02:00
Axel Uhl 094234b654 moved all Position-related classes including Compact... representations to common bundle; provided CustomFieldSerializer for all Position subclasses that require it 2015-04-03 16:12:21 +02:00
Axel Uhl 58bd451481 moved other Position implementations to common packages to share them with GWT and make then GWT-serializable 2015-04-02 16:42:10 +02:00
Axel Uhl d89f461191 don't create mark passing calculator on replica; mark passings are replicated using UpdateMarkPassings operation 2015-03-31 19:56:35 +02:00
Axel Uhl 81fc752c06 Merge branch 'master' into mark-rounding-inference 2015-03-30 22:32:03 +02:00
Axel Uhl 824f975ba8 renamed isQueueEmpty to isQueueEmptyOrStopped; don't set thread context class loader in ReplicationReceiver: it's set in the replicable itself 2015-03-30 20:28:36 +02:00
Axel Uhl b8ef26800f improved replication test logging; improved Javadoc for RaceTracker.stop(...) 2015-03-30 10:44:08 +02:00
Axel Uhl 4f18c1c366 use any free server port for replication servlet in test mode 2015-03-30 02:09:38 +02:00
Axel Uhl 3f72d71201 Merge branch 'master' into mark-rounding-inference 2015-03-29 22:19:11 +02:00
Axel Uhl 7b3f8722be extended the wait time for replication test even more; locally it was green for 2s wait time... 2015-03-29 21:22:06 +02:00
Axel Uhl 06872cc3ec Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-03-29 20:11:01 +02:00
Axel Uhl 3e689182a6 increased timeouts for previously failing replication tests; green now locally 2015-03-29 19:50:31 +02:00
Axel Uhl e1e047bd75 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalyticsDataManager.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.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.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/raceboard/RaceBoardPanel.java
2015-03-26 14:51:48 +01:00
Fredrik Teschke 114bddfdde Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation 2015-02-14 06:54:36 +01:00
Fredrik Teschke aedbfbeac4 remove unused import 2015-02-14 06:54:15 +01:00
Fredrik Teschke f60733698e Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ConnectionResetAndReconnectTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java
	java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java
2015-02-14 06:53:07 +01:00
Fredrik Teschke 6b6c657452 fix test failures due to previous refactoring of abstract replication test classes 2015-02-14 06:51:39 +01:00
Fredrik Teschke de39d6a40a refactor AbstractServerReplicationTest to enable tests with multiple replicable services in future 2015-02-13 20:28:45 +01:00
Fredrik Teschke b4b646be1f refactor AbstractServerReplicationTest to enable tests with multiple replicable services in future 2015-02-13 20:27:23 +01:00
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
Axel Uhl 98d5235b47 upgraded all Mongo-using bundles to 2.13.0 driver 2015-02-12 16:00:15 +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 5471a6b8fc update manifests and pom to new mongodb driver version 2015-02-11 12:55:32 +01:00
Jan Broß 0e4775d51f Add email field to Competitor 2015-02-04 22:36:48 +01:00
Nicolas 71a0c68499 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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.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
2015-02-04 17:38:16 +01:00
Axel Uhl f19be50419 removed redundant version specifier in replication.test manifest 2015-02-02 16:48:35 +01:00
Fredrik Teschke 991aaf126b Revert "introduce new filestorage.common bundle, so that filestorage bundle can be upgraded to java 1.8"
This reverts commit 02972d1bea.

Conflicts:
	java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/ReplicableFileStorageManagementService.java
2015-01-29 17:00:02 +01:00
Fredrik Teschke 02972d1bea introduce new filestorage.common bundle, so that filestorage bundle can be upgraded to java 1.8 2015-01-29 16:50:40 +01:00
Fredrik Teschke daad4c8c73 Merge branch 'master' into ftes-file-storage
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-01-23 19:40:26 +01:00
Nicolas a6f0206f0d Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-01-23 16:12:17 +01:00
Fredrik Teschke 16f35c1b24 added implementation of file storage service 2015-01-23 11:15:28 +01:00
Fredrik Teschke 72a9d6890e add logic to update team image, both in MongoDB and also replicated 2015-01-23 11:14:15 +01:00
Axel Uhl f834e5637b avoid ClassNotFoundException by adding com.sap.sse.shared.android to dependency list of replication.test fragment 2015-01-22 12:42:57 +01:00
Axel Uhl 0c43f2b64b moved color stuff from com.sap.sailing.domain.common to com.sap.sse.common 2015-01-22 11:05:24 +01:00
Nicolas cd748fa12b Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracAdapter.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracAdapterImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	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.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/raceboard/RaceBoardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-01-08 05:27:20 +01:00
Axel Uhl fe5fbe5ca3 fixing NPEs during RegattaLogReplicationTest by setting a valid competitor in competitor registration event 2015-01-02 20:23:57 +01:00
Fredrik Teschke 2118c8230f Revert "remove unnecessary regatta param in WindStore methods"
This reverts commit ad65a5e54b.
2014-12-24 23:49:42 +01:00
Fredrik Teschke ad8c1cd036 Merge branch 'regatta-log' 2014-12-24 19:25:12 +01:00
Fredrik Teschke ad65a5e54b remove unnecessary regatta param in WindStore methods 2014-12-24 14:46:55 +01:00
Fredrik Teschke a6c17ad1ec Merge remote-tracking branch 'origin/master' into regatta-log
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingAdapter.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.java
	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
2014-12-19 14:31:41 +01:00
Nicolas 639a8926af Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.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
2014-12-14 17:01:29 +01:00
Axel Uhl 066b6daca4 added "boolean preemptive" parameter to Tracker.stop() method, passing it through for TracTracRaceTrackerImpl;
using it to stop trackers immediately when clearing RacingEventService for initial load, as well as when the
timeout expires or when the regatta is untracked.
2014-12-13 22:17:12 +01:00
Axel Uhl afd0818218 failing test case for bug 2506 2014-12-12 21:28:29 +01:00
Nicolas 9b0fe47ee3 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.java
	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.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/server/SailingServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2014-12-11 19:59:45 +01:00
Fredrik Teschke 6608da120f Merge remote-tracking branch 'origin/master' into regatta-log
Conflicts:
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	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
2014-12-11 11:19:39 +01:00
Fredrik Teschke 0a8af6fbb7 first testing of regattalog replication 2014-12-05 20:18:37 +01:00
Fredrik Teschke 2c986f7be9 Merge branch 'ftes-regatta-log' into regatta-log
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
	java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateDuringNonAtomicSerializationTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-12-04 10:32:18 +01:00
Axel Uhl 5cdc0011eb removed another specific version from a manifest where it's not desired 2014-12-03 13:45:46 +01:00