Refactor for server/client/shared package structure.

SVN: 24023

common/source/java/ch/systemsx/cisd/common/serviceconversation/IServiceMessenger.java

@@ -27,12 +27,12 @@ import java.io.Serializable;
 public interface IServiceMessenger
 {
     /**
-     * Send a message to the client.
+     * Send a message to the counter part.
      */
     public void send(Serializable message);
     
     /**
-     * Receive a message from the client.
+     * Receive a message from the counter part.
      */
     public <T extends Serializable> T receive(Class<T> messageClass);
 }

common/source/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationDTO.java

@@ -31,7 +31,7 @@ public class ServiceConversationDTO implements Serializable
     
     private int clientTimeoutInMillis;
 
-    ServiceConversationDTO(String serviceConversationId, int clientTimeout)
+    public ServiceConversationDTO(String serviceConversationId, int clientTimeout)
     {
         this.serviceConversationId = serviceConversationId;
         this.clientTimeoutInMillis = clientTimeout;

common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ClientMessenger.java

@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.client;
 
 import java.io.Serializable;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.base.exceptions.TimeoutExceptionUnchecked;
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
+import ch.systemsx.cisd.common.serviceconversation.ServiceConversationDTO;
+import ch.systemsx.cisd.common.serviceconversation.ServiceMessage;
+import ch.systemsx.cisd.common.serviceconversation.UnexpectedMessagePayloadException;
 
 /**
  * A class that a client can use to receive messages from a service.

common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientResponseMessageMultiplexer.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ClientResponseMessageMultiplexer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.client;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -23,6 +23,9 @@ import org.apache.log4j.Logger;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
+import ch.systemsx.cisd.common.serviceconversation.ServiceMessage;
+import ch.systemsx.cisd.common.serviceconversation.UnknownServiceConversationException;
 
 /**
  * A client-side multiplexer for incoming messages from the server.

common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientResponseMessageQueue.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ClientResponseMessageQueue.java

@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.client;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
+import ch.systemsx.cisd.common.serviceconversation.ServiceMessage;
+
 /**
  * A class that holds a queue for response messages to a client. 
  *

common/source/java/ch/systemsx/cisd/common/serviceconversation/IRemoteServiceConversationServer.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/client/IRemoteServiceConversationServer.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.client;
+
+import ch.systemsx.cisd.common.serviceconversation.ServiceConversationDTO;
 
 /**
  * A remote role for starting a service conversation.

common/source/java/ch/systemsx/cisd/common/serviceconversation/IServiceConversation.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/client/IServiceConversation.java

@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.client;
 
 import java.io.Closeable;
 import java.io.Serializable;
 
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessenger;
+
 /**
  * The service conversation.
  * 
  * @author Bernd Rinn
  */
-public interface IServiceConversation extends Closeable
+public interface IServiceConversation extends IServiceMessenger, Closeable
 {
     /**
      * Returns the service conversation id.

common/source/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationClient.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ServiceConversationClient.java

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.client;
+
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
+import ch.systemsx.cisd.common.serviceconversation.ServiceConversationDTO;
 
 /**
  * The client for the service conversations.

common/source/java/ch/systemsx/cisd/common/serviceconversation/ServiceExecutionException.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ServiceExecutionException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.client;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;

common/source/java/ch/systemsx/cisd/common/serviceconversation/BidirectionalServiceMessenger.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/server/BidirectionalServiceMessenger.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.server;
 
 import java.io.Serializable;
 import java.util.concurrent.BlockingQueue;
@@ -25,6 +25,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
 import ch.systemsx.cisd.base.exceptions.TimeoutExceptionUnchecked;
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessenger;
+import ch.systemsx.cisd.common.serviceconversation.ServiceMessage;
+import ch.systemsx.cisd.common.serviceconversation.UnexpectedMessagePayloadException;
 
 /**
  * A bidirectional messenger on the server side.

common/source/java/ch/systemsx/cisd/common/serviceconversation/IService.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/server/IService.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.server;
+
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessenger;
 
 /**
  * The interface for a service that can participate in a service conversation.

common/source/java/ch/systemsx/cisd/common/serviceconversation/IServiceFactory.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/server/IServiceFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.server;
 
 /**
  * A factory for services.

common/source/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationRecord.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/server/ServiceConversationRecord.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.server;
 
 import ch.systemsx.cisd.common.concurrent.ITerminableFuture;
 

common/source/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationServer.java → common/source/java/ch/systemsx/cisd/common/serviceconversation/server/ServiceConversationServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.serviceconversation;
+package ch.systemsx.cisd.common.serviceconversation.server;
 
 import java.util.Map;
 import java.util.Random;
@@ -33,6 +33,12 @@ import ch.systemsx.cisd.common.concurrent.TerminableCallable.ICallable;
 import ch.systemsx.cisd.common.concurrent.TerminableCallable.IStoppableExecutor;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
+import ch.systemsx.cisd.common.serviceconversation.ServiceConversationDTO;
+import ch.systemsx.cisd.common.serviceconversation.ServiceMessage;
+import ch.systemsx.cisd.common.serviceconversation.UnknownClientException;
+import ch.systemsx.cisd.common.serviceconversation.UnknownServiceTypeException;
+import ch.systemsx.cisd.common.serviceconversation.client.ServiceExecutionException;
 
 /**
  * A collection of service conversations.
@@ -169,7 +175,9 @@ public class ServiceConversationServer
         final IServiceMessageTransport responseMessenger = responseMessageMap.get(clientId);
         if (responseMessenger == null)
         {
-            throw new UnknownClientException(clientId);
+            final UnknownClientException ex = new UnknownClientException(clientId); 
+            operationLog.error(ex.getMessage());
+            throw ex;
         }
         final IService serviceInstance = serviceFactory.create();
         final String serviceConversationId =

common/sourceTest/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationTest.java

@@ -32,6 +32,13 @@ import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
 import ch.systemsx.cisd.base.exceptions.TimeoutExceptionUnchecked;
 import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
 import ch.systemsx.cisd.common.logging.LogInitializer;
+import ch.systemsx.cisd.common.serviceconversation.client.IRemoteServiceConversationServer;
+import ch.systemsx.cisd.common.serviceconversation.client.IServiceConversation;
+import ch.systemsx.cisd.common.serviceconversation.client.ServiceConversationClient;
+import ch.systemsx.cisd.common.serviceconversation.client.ServiceExecutionException;
+import ch.systemsx.cisd.common.serviceconversation.server.IService;
+import ch.systemsx.cisd.common.serviceconversation.server.IServiceFactory;
+import ch.systemsx.cisd.common.serviceconversation.server.ServiceConversationServer;
 
 /**
  * Test cases for the {@Link ServiceConversationCollection} class.