Merge branch 'master' into polar-api

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	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, 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
This commit is contained in:
Frederik Petersen committed 2014-11-07 19:16:13 +01:00
commit 58811787a2
328 files changed
+1950 -1418

No files matched your search

@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.sap.sailing.mongodb.test
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Fragment-Host: com.sap.sailing.mongodb
Fragment-Host: com.sap.sse.mongodb
Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.shared.android,
com.sap.sailing.domain.test,
@@ -24,6 +24,8 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.racelogtrackingadapter.testsupport,
com.sap.sailing.server.gateway;bundle-version="1.0.0",
com.sap.sse.common
Import-Package: com.sap.sailing.domain.common.impl,
Import-Package: com.sap.sailing.domain.common,
com.sap.sailing.domain.common.impl,
com.sap.sailing.domain.common.racelog,
com.sap.sailing.domain.common.racelog.tracking
@@ -10,8 +10,8 @@ import org.junit.Before;
import com.mongodb.DB;
import com.mongodb.Mongo;
import com.mongodb.MongoException;
import com.sap.sailing.mongodb.MongoDBConfiguration;
import com.sap.sailing.mongodb.MongoDBService;
import com.sap.sse.mongodb.MongoDBConfiguration;
import com.sap.sse.mongodb.MongoDBService;
public abstract class AbstractMongoDBTest {
protected Mongo mongo;
@@ -2,8 +2,8 @@ package com.sap.sailing.mongodb.test;
import org.junit.Test;
import com.sap.sailing.mongodb.AlreadyRegisteredException;
import com.sap.sailing.mongodb.MongoDBService;
import com.sap.sse.mongodb.AlreadyRegisteredException;
import com.sap.sse.mongodb.MongoDBService;
public class CollectionNameServiceTest {
@@ -8,7 +8,7 @@ import com.mongodb.MongoException;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.domain.persistence.impl.FieldNames;
import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl;
import com.sap.sailing.mongodb.MongoDBService;
import com.sap.sse.mongodb.MongoDBService;
/**
* Reverses the wind directions of <em>all</em> wind records stored in the MongoDB that is obtained using
@@ -18,7 +18,7 @@ import com.sap.sailing.domain.common.PassingInstruction;
import com.sap.sailing.domain.persistence.impl.DomainObjectFactoryImpl;
import com.sap.sailing.domain.persistence.impl.FieldNames;
import com.sap.sailing.domain.racelog.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.mongodb.MongoDBConfiguration;
import com.sap.sse.mongodb.MongoDBConfiguration;
public class TestParseAndMigratePassingSideAndControlPointTwoMarks {
public TestParseAndMigratePassingSideAndControlPointTwoMarks() {
@@ -52,11 +52,11 @@ import com.sap.sailing.domain.persistence.media.MediaDBFactory;
import com.sap.sailing.domain.racelog.tracking.EmptyGPSFixStore;
import com.sap.sailing.domain.test.mock.MockedTrackedRaceWithFixedRankAndManyCompetitors;
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
import com.sap.sailing.mongodb.MongoDBService;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.impl.RacingEventServiceImpl;
import com.sap.sailing.server.operationaltransformation.UpdateLeaderboardScoreCorrection;
import com.sap.sse.common.Util;
import com.sap.sse.mongodb.MongoDBService;
public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTest {
private MongoObjectFactory mongoObjectFactory = null;
@@ -42,9 +42,9 @@ import com.sap.sailing.domain.tracking.impl.WindImpl;
import com.sap.sailing.domain.tractracadapter.DomainFactory;
import com.sap.sailing.domain.tractracadapter.Receiver;
import com.sap.sailing.domain.tractracadapter.ReceiverType;
import com.sap.sailing.mongodb.MongoDBConfiguration;
import com.sap.sailing.server.impl.RacingEventServiceImpl;
import com.sap.sse.common.Util;
import com.sap.sse.mongodb.MongoDBConfiguration;
public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLiveTest {