From a568e315f2875041a8569c3e2242908f377a5027 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Wed, 19 Jun 2013 12:23:29 +0200 Subject: [PATCH] Moved ReplicaDescriptor as it is an implementation and belongs in the impl package --- .../java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java | 2 +- .../server/replication/test/AbstractServerReplicationTest.java | 2 +- .../com/sap/sailing/server/replication/ReplicationService.java | 1 + .../server/replication/{ => impl}/ReplicaDescriptor.java | 2 +- .../server/replication/impl/ReplicationInstancesManager.java | 1 - .../sailing/server/replication/impl/ReplicationServiceImpl.java | 1 - .../sap/sailing/server/replication/impl/ReplicationServlet.java | 1 - 7 files changed, 4 insertions(+), 6 deletions(-) rename java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/{ => impl}/ReplicaDescriptor.java (93%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index d3172c9f920..82e1ef0d474 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -268,10 +268,10 @@ import com.sap.sailing.server.operationaltransformation.UpdateLeaderboardScoreCo import com.sap.sailing.server.operationaltransformation.UpdateRaceDelayToLive; import com.sap.sailing.server.operationaltransformation.UpdateSeries; import com.sap.sailing.server.operationaltransformation.UpdateSpecificRegatta; -import com.sap.sailing.server.replication.ReplicaDescriptor; import com.sap.sailing.server.replication.ReplicationFactory; import com.sap.sailing.server.replication.ReplicationMasterDescriptor; import com.sap.sailing.server.replication.ReplicationService; +import com.sap.sailing.server.replication.impl.ReplicaDescriptor; /** * The server side implementation of the RPC service. diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java index 547271b82f3..157214f61a4 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java @@ -25,9 +25,9 @@ import com.sap.sailing.domain.common.impl.Util.Pair; 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.ReplicaDescriptor; import com.sap.sailing.server.replication.ReplicationMasterDescriptor; import com.sap.sailing.server.replication.ReplicationService; +import com.sap.sailing.server.replication.impl.ReplicaDescriptor; import com.sap.sailing.server.replication.impl.ReplicationInstancesManager; import com.sap.sailing.server.replication.impl.ReplicationMasterDescriptorImpl; import com.sap.sailing.server.replication.impl.ReplicationServiceImpl; diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ReplicationService.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ReplicationService.java index 25ee72a9d98..f34d4344e05 100644 --- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ReplicationService.java +++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ReplicationService.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.Map; import com.sap.sailing.server.RacingEventServiceOperation; +import com.sap.sailing.server.replication.impl.ReplicaDescriptor; import com.sap.sailing.server.replication.impl.ReplicationServlet; public interface ReplicationService { diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ReplicaDescriptor.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicaDescriptor.java similarity index 93% rename from java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ReplicaDescriptor.java rename to java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicaDescriptor.java index fee20e629dd..34c8923673c 100644 --- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ReplicaDescriptor.java +++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicaDescriptor.java @@ -1,4 +1,4 @@ -package com.sap.sailing.server.replication; +package com.sap.sailing.server.replication.impl; import java.io.Serializable; import java.net.InetAddress; diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationInstancesManager.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationInstancesManager.java index 213081d7a45..3d8bcd57248 100644 --- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationInstancesManager.java +++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationInstancesManager.java @@ -7,7 +7,6 @@ import java.util.Map; import java.util.Set; import com.sap.sailing.server.RacingEventServiceOperation; -import com.sap.sailing.server.replication.ReplicaDescriptor; import com.sap.sailing.server.replication.ReplicationMasterDescriptor; public class ReplicationInstancesManager { diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java index d587b3040a1..8ebb2337599 100644 --- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java +++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java @@ -20,7 +20,6 @@ import com.rabbitmq.client.QueueingConsumer; import com.sap.sailing.server.OperationExecutionListener; import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.RacingEventServiceOperation; -import com.sap.sailing.server.replication.ReplicaDescriptor; import com.sap.sailing.server.replication.ReplicationMasterDescriptor; import com.sap.sailing.server.replication.ReplicationService; diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServlet.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServlet.java index f33fe9b1bed..1959b24adbc 100755 --- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServlet.java +++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServlet.java @@ -17,7 +17,6 @@ import org.osgi.util.tracker.ServiceTracker; import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.gateway.SailingServerHttpServlet; -import com.sap.sailing.server.replication.ReplicaDescriptor; import com.sap.sailing.server.replication.ReplicationService; /**