mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-03 01:29:33 +00:00
renamed com.sap.sailing.mongodb to com.sap.sse.mongodb and removed unnecessary dependency to com.sap.sailing.domain.common; fixes bug 2435
This commit is contained in:
1 parent
742f552f46
commit
15f0ea0489
74 files changed
+93
-95
No files matched your search
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.sap.sailing.domain.igtimiadapter.persistence
|
||||
Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Vendor: SAP
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Require-Bundle: com.sap.sailing.mongodb,
|
||||
Require-Bundle: com.sap.sse.mongodb,
|
||||
com.mongodb.driver;bundle-version="2.6.2"
|
||||
Export-Package: com.sap.sailing.domain.igtimiadapter.persistence
|
||||
Import-Package: org.osgi.framework
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package com.sap.sailing.domain.igtimiadapter.persistence;
|
||||
|
||||
import com.sap.sailing.domain.igtimiadapter.persistence.impl.PersistenceFactoryImpl;
|
||||
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 interface PersistenceFactory {
|
||||
PersistenceFactory INSTANCE = new PersistenceFactoryImpl();
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.igtimiadapter.persistence.impl;
|
||||
import org.osgi.framework.BundleActivator;
|
||||
import org.osgi.framework.BundleContext;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class Activator implements BundleActivator {
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@ package com.sap.sailing.domain.igtimiadapter.persistence.impl;
|
||||
import com.sap.sailing.domain.igtimiadapter.persistence.DomainObjectFactory;
|
||||
import com.sap.sailing.domain.igtimiadapter.persistence.MongoObjectFactory;
|
||||
import com.sap.sailing.domain.igtimiadapter.persistence.PersistenceFactory;
|
||||
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 class PersistenceFactoryImpl implements PersistenceFactory {
|
||||
|
||||
|
||||
@@ -8,5 +8,5 @@ Bundle-Vendor: SAP
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Require-Bundle: org.junit4;bundle-version="4.8.2",
|
||||
com.sap.sailing.domain.common,
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.sap.sse.common
|
||||
+2
-2
@@ -13,9 +13,9 @@ import org.junit.Test;
|
||||
import org.junit.rules.Timeout;
|
||||
|
||||
import com.sap.sailing.domain.igtimiadapter.persistence.PersistenceFactory;
|
||||
import com.sap.sailing.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class WebSocketServerListTest {
|
||||
@Rule public Timeout AbstractTracTracLiveTestTimeout = new Timeout(2 * 60 * 1000);
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@ import com.sap.sailing.domain.igtimiadapter.impl.Activator;
|
||||
import com.sap.sailing.domain.igtimiadapter.impl.ClientImpl;
|
||||
import com.sap.sailing.domain.igtimiadapter.impl.IgtimiConnectionFactoryImpl;
|
||||
import com.sap.sailing.domain.igtimiadapter.persistence.PersistenceFactory;
|
||||
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 class SignInTest {
|
||||
private static final Logger logger = Logger.getLogger(SignInTest.class.getName());
|
||||
|
||||
+1
-1
@@ -6,8 +6,8 @@ import static org.junit.Assert.assertTrue;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.mongodb.MongoDBConfiguration;
|
||||
|
||||
public class IgtimiPersistenceTest {
|
||||
private MongoObjectFactory mongoObjectFactory;
|
||||
|
||||
+2
-2
@@ -40,9 +40,9 @@ import com.sap.sailing.domain.igtimiadapter.datatypes.Fix;
|
||||
import com.sap.sailing.domain.igtimiadapter.impl.ClientImpl;
|
||||
import com.sap.sailing.domain.igtimiadapter.impl.IgtimiConnectionFactoryImpl;
|
||||
import com.sap.sailing.domain.igtimiadapter.persistence.PersistenceFactory;
|
||||
import com.sap.sailing.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class WebSocketTest {
|
||||
private static final Logger logger = Logger.getLogger(WebSocketTest.class.getName());
|
||||
|
||||
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Vendor: SAP
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Bundle-Activator: com.sap.sailing.domain.persistence.impl.Activator
|
||||
Require-Bundle: com.sap.sailing.mongodb,
|
||||
Require-Bundle: com.sap.sse.mongodb,
|
||||
com.sap.sailing.domain,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.domain.common,
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import java.net.UnknownHostException;
|
||||
|
||||
import com.mongodb.MongoException;
|
||||
import com.sap.sailing.domain.persistence.impl.MongoWindStoreFactoryImpl;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public interface MongoWindStoreFactory {
|
||||
MongoWindStoreFactory INSTANCE = new MongoWindStoreFactoryImpl(MongoDBService.INSTANCE.getDB());
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.persistence;
|
||||
import com.sap.sailing.domain.base.DomainFactory;
|
||||
import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinderFactory;
|
||||
import com.sap.sailing.domain.persistence.impl.PersistenceFactoryImpl;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public interface PersistenceFactory {
|
||||
PersistenceFactory INSTANCE = new PersistenceFactoryImpl();
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.persistence.impl;
|
||||
import org.osgi.framework.BundleActivator;
|
||||
import org.osgi.framework.BundleContext;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class Activator implements BundleActivator {
|
||||
@Override
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import com.sap.sailing.domain.persistence.MongoWindStore;
|
||||
import com.sap.sailing.domain.tracking.TrackedRace;
|
||||
import com.sap.sailing.domain.tracking.WindTrack;
|
||||
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
/**
|
||||
* Stores wind tracks of sources that {@link WindSource#canBeStored() can be stored}. The {@link EmptyWindStore}'s
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinderFact
|
||||
import com.sap.sailing.domain.persistence.DomainObjectFactory;
|
||||
import com.sap.sailing.domain.persistence.MongoObjectFactory;
|
||||
import com.sap.sailing.domain.persistence.PersistenceFactory;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class PersistenceFactoryImpl implements PersistenceFactory {
|
||||
private final DomainObjectFactory defaultDomainObjectFactory;
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
package com.sap.sailing.domain.persistence.media;
|
||||
|
||||
import com.sap.sailing.domain.persistence.media.impl.MediaDBFactoryImpl;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public interface MediaDBFactory {
|
||||
MediaDBFactory INSTANCE = new MediaDBFactoryImpl();
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package com.sap.sailing.domain.persistence.media.impl;
|
||||
|
||||
import com.sap.sailing.domain.persistence.media.MediaDB;
|
||||
import com.sap.sailing.domain.persistence.media.MediaDBFactory;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class MediaDBFactoryImpl implements MediaDBFactory {
|
||||
private final MediaDB defaultMediaDB;
|
||||
|
||||
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: com.sap.sailing.domain.swisstimingadapter,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.sap.sailing.domain,
|
||||
com.sap.sailing.domain.common
|
||||
Export-Package: com.sap.sailing.domain.swisstimingadapter.persistence,
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import com.sap.sailing.domain.swisstimingadapter.SwissTimingArchiveConfiguration
|
||||
import com.sap.sailing.domain.swisstimingadapter.SwissTimingConfiguration;
|
||||
import com.sap.sailing.domain.swisstimingadapter.SwissTimingFactory;
|
||||
import com.sap.sailing.domain.swisstimingadapter.persistence.impl.SwissTimingAdapterPersistenceImpl;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public interface SwissTimingAdapterPersistence {
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.swisstimingadapter.persistence.impl;
|
||||
import org.osgi.framework.BundleActivator;
|
||||
import org.osgi.framework.BundleContext;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class Activator implements BundleActivator {
|
||||
@Override
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ import com.sap.sailing.domain.swisstimingadapter.SwissTimingArchiveConfiguration
|
||||
import com.sap.sailing.domain.swisstimingadapter.SwissTimingConfiguration;
|
||||
import com.sap.sailing.domain.swisstimingadapter.SwissTimingFactory;
|
||||
import com.sap.sailing.domain.swisstimingadapter.persistence.SwissTimingAdapterPersistence;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPersistence {
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Fragment-Host: com.sap.sailing.domain.swisstimingadapter
|
||||
Require-Bundle: com.sap.sailing.domain,
|
||||
com.sap.sailing.udpconnector,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.googlecode.java-diff-utils;bundle-version="1.3.0",
|
||||
com.sap.sailing.server,
|
||||
com.sap.sailing.domain.common,
|
||||
|
||||
@@ -7,7 +7,7 @@ Bundle-Vendor: SAP
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.sap.sailing.domain.tractracadapter,
|
||||
com.sap.sailing.domain,
|
||||
com.sap.sailing.domain.common,
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ package com.sap.sailing.domain.tractracadapter.persistence;
|
||||
import com.mongodb.DBObject;
|
||||
import com.sap.sailing.domain.tractracadapter.TracTracConfiguration;
|
||||
import com.sap.sailing.domain.tractracadapter.persistence.impl.MongoObjectFactoryImpl;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
/**
|
||||
* Offers methods to construct {@link DBObject MongoDB objects} from domain objects.
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.tractracadapter.persistence.impl;
|
||||
import org.osgi.framework.BundleActivator;
|
||||
import org.osgi.framework.BundleContext;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class Activator implements BundleActivator {
|
||||
@Override
|
||||
|
||||
@@ -9,7 +9,7 @@ Require-Bundle: com.sap.sailing.domain,
|
||||
com.sap.sailing.domain.shared.android;bundle-version="1.0.0",
|
||||
com.sap.sailing.server,
|
||||
com.sap.sailing.domain.tractracadapter,
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.domain.swisstimingadapter,
|
||||
com.sap.sailing.domain.persistence,
|
||||
|
||||
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Vendor: SAP
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
org.json.simple;bundle-version="1.1.0",
|
||||
org.hamcrest.core;bundle-version="1.1.0",
|
||||
org.junit4;bundle-version="4.8.2",
|
||||
|
||||
+2
-2
@@ -9,8 +9,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;
|
||||
|
||||
@@ -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,
|
||||
@@ -23,6 +23,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
|
||||
|
||||
+2
-2
@@ -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
-2
@@ -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 {
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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() {
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Require-Bundle: org.hamcrest;bundle-version="1.1.0",
|
||||
org.junit4;bundle-version="4.8.2",
|
||||
org.openqa.selenium.osgi;bundle-version="2.40.0",
|
||||
com.sap.sailing.mongodb;bundle-version="1.0.0",
|
||||
com.sap.sse.mongodb;bundle-version="1.0.0",
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.domain.common,
|
||||
com.sap.sse.common
|
||||
|
||||
@@ -12,7 +12,7 @@ Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: com.sap.sailing.domain,
|
||||
com.sap.sailing.domain.tractracadapter,
|
||||
com.sap.sailing.domain.persistence,
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
javax.servlet;bundle-version="2.6.0",
|
||||
com.sap.sailing.domain.common,
|
||||
|
||||
@@ -9,7 +9,7 @@ Require-Bundle: javax.servlet;bundle-version="2.6.0",
|
||||
com.sap.sailing.domain;bundle-version="1.0.0",
|
||||
com.sap.sailing.domain.common;bundle-version="1.0.0",
|
||||
com.sap.sailing.server;bundle-version="1.0.0",
|
||||
com.sap.sailing.mongodb;bundle-version="1.0.0",
|
||||
com.sap.sse.mongodb;bundle-version="1.0.0",
|
||||
com.sap.sse.common
|
||||
Bundle-ClassPath: .
|
||||
Web-ContextPath: /sailingserver/test-support
|
||||
|
||||
+2
-5
@@ -5,19 +5,16 @@ import java.io.IOException;
|
||||
import javax.servlet.ServletConfig;
|
||||
import javax.servlet.ServletContext;
|
||||
import javax.servlet.ServletException;
|
||||
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.osgi.framework.BundleContext;
|
||||
|
||||
import org.osgi.util.tracker.ServiceTracker;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
|
||||
import com.sap.sailing.server.test.support.RacingEventServiceWithTestSupport;
|
||||
import com.sap.sse.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class ClearStateServlet extends HttpServlet {
|
||||
private static final long serialVersionUID = -880795218153271730L;
|
||||
|
||||
+2
-2
@@ -30,11 +30,11 @@ import com.sap.sailing.domain.base.impl.TeamImpl;
|
||||
import com.sap.sailing.domain.common.Color;
|
||||
import com.sap.sailing.domain.common.TimePoint;
|
||||
import com.sap.sailing.domain.common.impl.MillisecondsTimePoint;
|
||||
import com.sap.sailing.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.server.RacingEventService;
|
||||
import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
|
||||
import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
import com.sap.sse.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public abstract class AbstractJsonExportTest {
|
||||
protected RacingEventService racingEventService;
|
||||
|
||||
+2
-2
@@ -24,11 +24,11 @@ import com.sap.sailing.domain.base.impl.TeamImpl;
|
||||
import com.sap.sailing.domain.common.Color;
|
||||
import com.sap.sailing.domain.common.TimePoint;
|
||||
import com.sap.sailing.domain.common.impl.MillisecondsTimePoint;
|
||||
import com.sap.sailing.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.server.RacingEventService;
|
||||
import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource;
|
||||
import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
import com.sap.sse.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public abstract class AbstractJaxRsApiTest {
|
||||
protected RacingEventService racingEventService;
|
||||
|
||||
@@ -21,7 +21,7 @@ Require-Bundle: com.sap.sailing.domain,
|
||||
com.sap.sailing.declination,
|
||||
com.sap.sailing.domain.tractracadapter,
|
||||
com.sap.sailing.domain.persistence,
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
javax.servlet;bundle-version="2.6.0",
|
||||
com.sap.sailing.domain.common,
|
||||
|
||||
@@ -11,7 +11,7 @@ Require-Bundle: com.sap.sailing.server,
|
||||
com.sap.sailing.domain.common,
|
||||
com.sap.sailing.domain,
|
||||
com.sap.sailing.domain.test,
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.domain.persistence,
|
||||
com.sap.sailing.domain.tractracadapter,
|
||||
|
||||
+1
-1
@@ -34,7 +34,6 @@ import com.sap.sailing.domain.persistence.PersistenceFactory;
|
||||
import com.sap.sailing.domain.persistence.media.MediaDBFactory;
|
||||
import com.sap.sailing.domain.racelog.tracking.EmptyGPSFixStore;
|
||||
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.replication.ReplicationMasterDescriptor;
|
||||
@@ -47,6 +46,7 @@ import com.sap.sailing.server.replication.impl.ReplicationMasterDescriptorImpl;
|
||||
import com.sap.sailing.server.replication.impl.ReplicationServiceImpl;
|
||||
import com.sap.sailing.server.replication.impl.Replicator;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public abstract class AbstractServerReplicationTest {
|
||||
protected static final int SERVLET_PORT = 9990;
|
||||
|
||||
+1
-1
@@ -35,7 +35,6 @@ import com.sap.sailing.domain.test.mock.MockedTrackedRaceWithFixedRank;
|
||||
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
|
||||
import com.sap.sailing.domain.tracking.TrackedRace;
|
||||
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
import com.sap.sailing.server.operationaltransformation.AddColumnToLeaderboard;
|
||||
import com.sap.sailing.server.operationaltransformation.ConnectTrackedRaceToLeaderboardColumn;
|
||||
@@ -44,6 +43,7 @@ import com.sap.sailing.server.operationaltransformation.UpdateLeaderboardMaxPoin
|
||||
import com.sap.sailing.server.replication.ReplicationMasterDescriptor;
|
||||
import com.sap.sailing.server.replication.ReplicationService;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class DelayedLeaderboardCorrectionsReplicationTest extends AbstractServerReplicationTest {
|
||||
private static final Logger logger = Logger.getLogger(DelayedLeaderboardCorrectionsReplicationTest.class.getName());
|
||||
|
||||
+1
-1
@@ -45,7 +45,6 @@ import com.sap.sailing.domain.persistence.media.MediaDBFactory;
|
||||
import com.sap.sailing.domain.racelog.tracking.EmptyGPSFixStore;
|
||||
import com.sap.sailing.domain.test.TrackBasedTest;
|
||||
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
import com.sap.sailing.server.operationaltransformation.AddDefaultRegatta;
|
||||
import com.sap.sailing.server.operationaltransformation.AddRaceDefinition;
|
||||
@@ -53,6 +52,7 @@ import com.sap.sailing.server.operationaltransformation.CreateFlexibleLeaderboar
|
||||
import com.sap.sailing.server.replication.ReplicationMasterDescriptor;
|
||||
import com.sap.sailing.server.replication.impl.Replicator;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class InitialLoadReplicationObjectIdentityTest extends AbstractServerReplicationTest {
|
||||
private Util.Pair<ReplicationServiceTestImpl, ReplicationMasterDescriptor> replicationDescriptorPair;
|
||||
|
||||
+1
-1
@@ -51,7 +51,6 @@ import com.sap.sailing.domain.racelog.RaceLogEventFactory;
|
||||
import com.sap.sailing.domain.racelog.RaceLogIdentifier;
|
||||
import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent;
|
||||
import com.sap.sailing.domain.racelog.impl.RaceLogEventAuthorImpl;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
import com.sap.sailing.server.operationaltransformation.AddColumnToLeaderboard;
|
||||
import com.sap.sailing.server.operationaltransformation.AddColumnToSeries;
|
||||
@@ -61,6 +60,7 @@ import com.sap.sailing.server.operationaltransformation.CreateRegattaLeaderboard
|
||||
import com.sap.sailing.server.operationaltransformation.RenameLeaderboard;
|
||||
import com.sap.sailing.server.replication.ReplicationMasterDescriptor;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class RaceLogReplicationTest extends AbstractServerReplicationTest {
|
||||
private static final String BOAT_CLASS_NAME_49er = "49er";
|
||||
|
||||
@@ -12,7 +12,7 @@ Require-Bundle: com.sap.sailing.domain,
|
||||
com.sap.sailing.domain.common,
|
||||
com.sap.sailing.expeditionconnector,
|
||||
com.sap.sailing.operationaltransformation,
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.tractrac.clientmodule;bundle-version="2.0.0",
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
org.hamcrest;bundle-version="1.1.0",
|
||||
|
||||
+1
-1
@@ -23,9 +23,9 @@ import com.sap.sailing.domain.base.impl.PersonImpl;
|
||||
import com.sap.sailing.domain.base.impl.TeamImpl;
|
||||
import com.sap.sailing.domain.leaderboard.Leaderboard;
|
||||
import com.sap.sailing.domain.leaderboard.impl.LowPoint;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.server.RacingEventService;
|
||||
import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class LeaderboardStorageTest extends TestCase {
|
||||
|
||||
|
||||
+2
-2
@@ -104,8 +104,6 @@ import com.sap.sailing.domain.tracking.Wind;
|
||||
import com.sap.sailing.domain.tracking.WindTrack;
|
||||
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
|
||||
import com.sap.sailing.domain.tracking.impl.WindImpl;
|
||||
import com.sap.sailing.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.server.RacingEventService;
|
||||
import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource;
|
||||
import com.sap.sailing.server.gateway.jaxrs.spi.MasterDataResource;
|
||||
@@ -113,6 +111,8 @@ import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
import com.sap.sailing.server.masterdata.DummyTrackedRace;
|
||||
import com.sap.sailing.server.masterdata.MasterDataImporter;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class MasterDataImportTest {
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,6 @@ import com.sap.sailing.domain.common.LeaderboardNameConstants;
|
||||
import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard;
|
||||
import com.sap.sailing.domain.leaderboard.Leaderboard;
|
||||
import com.sap.sailing.domain.leaderboard.impl.LowPoint;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.operationaltransformation.OperationalTransformer;
|
||||
import com.sap.sailing.operationaltransformation.Peer;
|
||||
import com.sap.sailing.operationaltransformation.Peer.Role;
|
||||
@@ -26,6 +25,7 @@ import com.sap.sailing.server.operationaltransformation.AddColumnToLeaderboard;
|
||||
import com.sap.sailing.server.operationaltransformation.CreateFlexibleLeaderboard;
|
||||
import com.sap.sailing.server.operationaltransformation.MoveLeaderboardColumnUp;
|
||||
import com.sap.sailing.server.operationaltransformation.RemoveLeaderboard;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class OperationalTransformationTest {
|
||||
private static final String LEADERBOARDNAME = "TESTBOARD";
|
||||
|
||||
+1
-1
@@ -18,7 +18,6 @@ import com.sap.sailing.domain.racelog.RaceLogEvent;
|
||||
import com.sap.sailing.domain.racelog.RaceLogEventAuthor;
|
||||
import com.sap.sailing.domain.racelog.RaceLogEventFactory;
|
||||
import com.sap.sailing.domain.racelog.impl.RaceLogEventAuthorImpl;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sailing.operationaltransformation.OperationalTransformer;
|
||||
import com.sap.sailing.operationaltransformation.Peer;
|
||||
import com.sap.sailing.operationaltransformation.Peer.Role;
|
||||
@@ -28,6 +27,7 @@ import com.sap.sailing.server.RacingEventServiceOperation;
|
||||
import com.sap.sailing.server.impl.RacingEventServiceImpl;
|
||||
import com.sap.sailing.server.operationaltransformation.AddColumnToLeaderboard;
|
||||
import com.sap.sailing.server.operationaltransformation.CreateFlexibleLeaderboard;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
|
||||
public class RaceLogInRaceColumnTest {
|
||||
|
||||
@@ -15,7 +15,7 @@ Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: com.sap.sailing.domain,
|
||||
com.sap.sailing.expeditionconnector,
|
||||
com.sap.sailing.declination,
|
||||
com.sap.sailing.mongodb,
|
||||
com.sap.sse.mongodb,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.domain.persistence,
|
||||
com.sap.sailing.domain.common,
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinderFact
|
||||
import com.sap.sailing.domain.persistence.DomainObjectFactory;
|
||||
import com.sap.sailing.domain.persistence.MongoObjectFactory;
|
||||
import com.sap.sailing.domain.persistence.PersistenceFactory;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
/**
|
||||
* Manages a persistent set of {@link Competitor}s using a {@link MongoObjectFactory} to update the persistent store,
|
||||
|
||||
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>com.sap.sailing.mongodb</name>
|
||||
<name>com.sap.sse.mongodb</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
+3
-4
@@ -1,15 +1,14 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Mongodb
|
||||
Bundle-SymbolicName: com.sap.sailing.mongodb
|
||||
Bundle-SymbolicName: com.sap.sse.mongodb
|
||||
Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Vendor: SAP
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.domain.common,
|
||||
com.sap.sse.common
|
||||
Export-Package: com.sap.sailing.mongodb
|
||||
Export-Package: com.sap.sse.mongodb
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Import-Package: com.sap.sailing.util,
|
||||
org.osgi.framework;version="1.6.0"
|
||||
Bundle-Activator: com.sap.sailing.mongodb.Activator
|
||||
Bundle-Activator: com.sap.sse.mongodb.Activator
|
||||
File renamed without changes.
File renamed without changes.
+2
-2
@@ -1,4 +1,4 @@
|
||||
package com.sap.sailing.mongodb;
|
||||
package com.sap.sse.mongodb;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
@@ -6,7 +6,7 @@ import java.util.logging.Logger;
|
||||
import org.osgi.framework.BundleActivator;
|
||||
import org.osgi.framework.BundleContext;
|
||||
|
||||
import com.sap.sailing.mongodb.internal.MongoDBServiceImpl;
|
||||
import com.sap.sse.mongodb.internal.MongoDBServiceImpl;
|
||||
|
||||
public class Activator implements BundleActivator {
|
||||
private static final Logger logger = Logger.getLogger(Activator.class.getName());
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.sap.sailing.mongodb;
|
||||
package com.sap.sse.mongodb;
|
||||
|
||||
public class AlreadyRegisteredException extends Exception {
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.sap.sailing.mongodb;
|
||||
package com.sap.sse.mongodb;
|
||||
|
||||
import com.sap.sailing.mongodb.internal.MongoDBServiceImpl;
|
||||
import com.sap.sse.mongodb.internal.MongoDBServiceImpl;
|
||||
|
||||
/**
|
||||
* A readonly Mongo Database connection configuration
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package com.sap.sailing.mongodb;
|
||||
package com.sap.sse.mongodb;
|
||||
|
||||
import com.mongodb.DB;
|
||||
import com.sap.sailing.mongodb.internal.MongoDBServiceImpl;
|
||||
import com.sap.sse.mongodb.internal.MongoDBServiceImpl;
|
||||
|
||||
public interface MongoDBService {
|
||||
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package com.sap.sailing.mongodb.internal;
|
||||
package com.sap.sse.mongodb.internal;
|
||||
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.HashMap;
|
||||
@@ -8,9 +8,9 @@ import java.util.logging.Logger;
|
||||
|
||||
import com.mongodb.DB;
|
||||
import com.mongodb.Mongo;
|
||||
import com.sap.sailing.mongodb.AlreadyRegisteredException;
|
||||
import com.sap.sailing.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.AlreadyRegisteredException;
|
||||
import com.sap.sse.mongodb.MongoDBConfiguration;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
|
||||
public class MongoDBServiceImpl implements MongoDBService {
|
||||
|
||||
@@ -9,4 +9,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Require-Bundle: org.junit4;bundle-version="4.8.2",
|
||||
com.sap.sse.security.userstore.mongodb,
|
||||
com.mongodb.driver,
|
||||
com.sap.sailing.mongodb
|
||||
com.sap.sse.mongodb
|
||||
@@ -13,8 +13,8 @@ import org.junit.Test;
|
||||
|
||||
import com.mongodb.DB;
|
||||
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;
|
||||
import com.sap.sse.security.SecurityServiceImpl;
|
||||
import com.sap.sse.security.UsernamePasswordRealm;
|
||||
import com.sap.sse.security.impl.Activator;
|
||||
|
||||
@@ -9,9 +9,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Import-Package: org.osgi.framework;version="1.3.0"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-ClassPath: .
|
||||
Require-Bundle: com.sap.sse.security;bundle-version="1.0.0",
|
||||
Require-Bundle: com.sap.sse.security,
|
||||
com.mongodb.driver;bundle-version="2.6.2",
|
||||
com.sap.sailing.mongodb,
|
||||
org.apache.shiro.core;bundle-version="1.2.2"
|
||||
org.apache.shiro.core;bundle-version="1.2.2",
|
||||
com.sap.sse.mongodb
|
||||
Export-Package: com.sap.sse.security.userstore.mongodb,
|
||||
com.sap.sse.security.userstore.mongodb.impl;x-friends:="com.sap.sse.security.test"
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package com.sap.sse.security.userstore.mongodb;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
import com.sap.sse.security.userstore.mongodb.impl.PersistenceFactoryImpl;
|
||||
|
||||
public interface PersistenceFactory {
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import org.osgi.framework.BundleActivator;
|
||||
import org.osgi.framework.BundleContext;
|
||||
import org.osgi.framework.ServiceRegistration;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
import com.sap.sse.security.UserStore;
|
||||
import com.sap.sse.security.userstore.mongodb.UserStoreImpl;
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package com.sap.sse.security.userstore.mongodb.impl;
|
||||
|
||||
import com.sap.sailing.mongodb.MongoDBService;
|
||||
import com.sap.sse.mongodb.MongoDBService;
|
||||
import com.sap.sse.security.userstore.mongodb.DomainObjectFactory;
|
||||
import com.sap.sse.security.userstore.mongodb.MongoObjectFactory;
|
||||
import com.sap.sse.security.userstore.mongodb.PersistenceFactory;
|
||||
|
||||
Reference in new issue
Block a user