diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationClientManagerLocal.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationClientManagerLocal.java
index f3dd6b9986ef88a249ea8bb857b74e84c4d9663f..5ec099ea3000ccc18759acbdde5442ef10f33c80 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationClientManagerLocal.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationClientManagerLocal.java
@@ -19,6 +19,8 @@ package ch.systemsx.cisd.openbis.dss.generic.server;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
/**
+ * A local interface of the service conversation client manager used by DSS.
+ *
* @author pkupczyk
*/
public interface IServiceConversationClientManagerLocal
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationServerManagerLocal.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationServerManagerLocal.java
index 5d8a91b618058487a972e525a8cb560ba64cae7d..00d00717f13f678fa516a33d46d07b12b70e5d3d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationServerManagerLocal.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationServerManagerLocal.java
@@ -17,6 +17,8 @@
package ch.systemsx.cisd.openbis.dss.generic.server;
/**
+ * A local interface of the service conversation server manager used by DSS.
+ *
* @author pkupczyk
*/
public interface IServiceConversationServerManagerLocal
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationClientManager.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationClientManager.java
index bbc9ae20aa06e2e59eb3b6f2365588519e63540f..c2d8b6fa91551325334b784b12ab8edd8665a5de 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationClientManager.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationClientManager.java
@@ -23,6 +23,8 @@ import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationA
import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationDataStoreClientId;
/**
+ * The service conversation client manager used by DSS.
+ *
* @author pkupczyk
*/
public class ServiceConversationClientManager extends BaseServiceConversationClientManager
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationServerManager.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationServerManager.java
index e2a0389b6ae9667a8970c45aa05aba019c64df1a..95b9e407d5a924aac2ba8e1b2c329181848bd355 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationServerManager.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationServerManager.java
@@ -26,6 +26,8 @@ import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationA
import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationApplicationServerUrl;
/**
+ * The service conversation server manager used by DSS.
+ *
* @author pkupczyk
*/
public class ServiceConversationServerManager extends BaseServiceConversationServerManager
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/annotation/Conversational.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/annotation/Conversational.java
index 5827130c464067d3dbc3e48a19c75b96ffa431a8..87a8c07e2c0ea5ddb916bab4b4767c698a205e0a 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/annotation/Conversational.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/annotation/Conversational.java
@@ -22,6 +22,10 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
+ * All methods that support service conversations communication should be marked with this
+ * annotation. If a method without this annotation is called via service conversations then
+ * {@link java.lang.NoSuchMethodException NoSuchMethodException} is thrown.
+ *
* @author pkupczyk
*/
@@ -31,6 +35,9 @@ import java.lang.annotation.Target;
public @interface Conversational
{
+ /**
+ * Type of the progress reporting that should be used for the annotated method.
+ */
Progress progress();
}
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/annotation/Progress.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/annotation/Progress.java
index d6ac5358ad75194ad10dd4e40c1ab367ad0b73ec..d1b4f77fb4ffcfab10294d632c61f083df366e5e 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/annotation/Progress.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/annotation/Progress.java
@@ -17,11 +17,31 @@
package ch.systemsx.cisd.common.conversation.annotation;
/**
+ * Type of the progress reporting that is used for service conversation methods.
+ *
* @author pkupczyk
*/
public enum Progress
{
- MANUAL, AUTOMATIC
+ /**
+ * Progress has to be reported by calling
+ * {@link ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener#update
+ * IServiceConversationProgressListener.update} method. This option should be used when we know
+ * how much progress has been made, e.g. we processed 12 out of 100 data sets. If the method
+ * execution hangs the progress won't be reported and the conversation will time out.
+ */
+ MANUAL,
+
+ /**
+ * A separate thread regularly sends progress information without a need of calling
+ * {@link ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener#update
+ * IServiceConversationProgressListener.update} method. This option is useful for methods where
+ * we don't have any information about the current progress (e.g. user defined Python script
+ * execution) but we still want to notify the client that the processing is in progress and the
+ * conversation should not time out. Be aware that the progress will be sent forever if the
+ * method execution hangs.
+ */
+ AUTOMATIC
}
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/client/ServiceConversationClientDetails.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/client/ServiceConversationClientDetails.java
index 83cff101b6f5116e993fcbcb20dcc9a938bdd20e..12331b83d9650acc897a25448455cb7f98a718d6 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/client/ServiceConversationClientDetails.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/client/ServiceConversationClientDetails.java
@@ -20,13 +20,21 @@ import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
/**
+ * Stores information about a service conversation client manager.
+ *
* @author pkupczyk
*/
public class ServiceConversationClientDetails
{
+ /**
+ * URL that should be used for communication with the client manager.
+ */
private String url;
+ /**
+ * Timeout to be used for communication with the client manager.
+ */
private int timeout;
public ServiceConversationClientDetails(String url, int timeout)
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/client/ServiceConversationClientWithConversationTracking.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/client/ServiceConversationClientWithConversationTracking.java
index 86a808212531c86494c737ba70cfef09c2959319..b594d524bee6d249a6241ccfcfd24e0bbc0e4471 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/client/ServiceConversationClientWithConversationTracking.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/client/ServiceConversationClientWithConversationTracking.java
@@ -25,6 +25,11 @@ import ch.systemsx.cisd.common.serviceconversation.client.ServiceConversationCli
import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
/**
+ * Service conversation client that keeps track of the started conversations and provides
+ * {@link #onConversationStart(IServiceConversation)} and
+ * {@link #onConversationClose(IServiceConversation)} methods that can be overwritten to perform
+ * some additional actions on these events.
+ *
* @author pkupczyk
*/
public class ServiceConversationClientWithConversationTracking
@@ -51,6 +56,9 @@ public class ServiceConversationClientWithConversationTracking
return conversation;
}
+ /**
+ * Method that is called whenever a new conversation is started.
+ */
public void onConversationStart(IServiceConversation conversation)
{
// does nothing by default
@@ -67,6 +75,9 @@ public class ServiceConversationClientWithConversationTracking
onConversationClose(conversation);
}
+ /**
+ * Method that is called whenever a new conversation is closed.
+ */
public void onConversationClose(IServiceConversation conversation)
{
// does nothing by default
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/context/ServiceConversationsThreadContext.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/context/ServiceConversationsThreadContext.java
index e8966dcd8afd635d2c6d1aecdd53de5d26a049f1..a6d529d45b01a1d8909dbe54118bbdce04b04ce4 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/context/ServiceConversationsThreadContext.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/context/ServiceConversationsThreadContext.java
@@ -20,12 +20,8 @@ import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgres
import ch.systemsx.cisd.common.conversation.progress.ServiceConversationNullProgressListener;
/**
- * The class contains the logic for communication beetween Hibernate interceptors, which should send
- * service conversation updates, and parts of applications that use service conversations, but don't
- * have acces to the Hibernate objects.
- * <p>
- * It lets the owner of service conversation store the information about it in the thread local
- * variable, from which the interceptor can later read it.
+ * This class provides methods for accessing information about the current service conversation. All
+ * the information is stored in thread local variables.
*
* @author Jakub Straszewski
*/
@@ -39,7 +35,7 @@ public class ServiceConversationsThreadContext
}
/**
- * Store progress listener in a thread local context
+ * Sets the current service conversation progress listener.
*/
public static void setProgressListener(IServiceConversationProgressListener listener)
{
@@ -47,7 +43,7 @@ public class ServiceConversationsThreadContext
}
/**
- * Remove information about progress listener from the thread local context.
+ * Removes the current service conversation progress listener.
*/
public static void unsetProgressListener()
{
@@ -55,7 +51,10 @@ public class ServiceConversationsThreadContext
}
/**
- * Read the progress listener from the thread local context
+ * Get the current service conversation progress listener. If there is no service conversation
+ * available then a dummy progress listener is returned. The dummy listener is returned just for
+ * a convenience to eliminate all the not null checks. Calling methods on the dummy listener
+ * doesn't have any effect.
*/
public static IServiceConversationProgressListener getProgressListener()
{
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/BaseServiceConversationClientManager.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/BaseServiceConversationClientManager.java
index 603f13fb084b9cb96eb7000a252a479c46a6cc27..6806fa0a190f01ae75a2a12a7bdb3d9a933c439e 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/BaseServiceConversationClientManager.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/BaseServiceConversationClientManager.java
@@ -27,6 +27,14 @@ import ch.systemsx.cisd.common.serviceconversation.ServiceMessage;
import ch.systemsx.cisd.common.serviceconversation.client.IServiceConversation;
/**
+ * Service conversation client manager that dispatches calls to remote service conversation servers
+ * managers. One instance of client manager can handle communication with multiple server managers
+ * located on different machines. To make a conversational call to a remote service you must first
+ * obtain a reference to a service that supports service conversation communication using
+ * {@link #getService(String, Class, String, Object, int)} method. All the method calls on that
+ * service will be automatically translated into appropriate service conversation messages behind
+ * the scenes.
+ *
* @author pkupczyk
*/
public class BaseServiceConversationClientManager implements
@@ -56,6 +64,20 @@ public class BaseServiceConversationClientManager implements
{
}
+ /**
+ * Method that returns a reference to a service that supports service conversation
+ * communication.
+ *
+ * @param serverUrl The URL of the service conversation server manager where the given service
+ * has been registered.
+ * @param serviceInterface The interface of the service to be returned.
+ * @param sessionToken The session token that will be used to uniquely identify the
+ * conversations.
+ * @param clientId The id of the client manager that has to be recognized by the server. Basing
+ * on this id the server will decide where to send the responses to and what timeout
+ * to use.
+ * @param clientTimeout The timeout of the client manager.
+ */
public <T> T getService(String serverUrl, Class<T> serviceInterface, String sessionToken,
Object clientId, int clientTimeout)
{
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/BaseServiceConversationServerManager.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/BaseServiceConversationServerManager.java
index 324029db26a0f2e4ee2458e2f5d9867849c0aec5..e288398532d92d8a3e0788796fba2e2fe0d9757e 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/BaseServiceConversationServerManager.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/BaseServiceConversationServerManager.java
@@ -27,6 +27,15 @@ import ch.systemsx.cisd.common.serviceconversation.server.ServiceConversationSer
import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
/**
+ * Service conversation server manager that dispatches calls coming from remote service conversation
+ * client managers to appropriate local services. One instance of server manager can handle
+ * communication with multiple client managers located on different machines. To expose a local
+ * service for remote conversational calls you must add the service to the manager using
+ * {@link #addService(Class, Object)} method. Moreover the
+ * {@link #getClientDetailsForClientId(Object)} method must be implemented to return information
+ * which clients are recognized, what URLs should be used for communicating them back and what
+ * timeouts should be used for their conversations.
+ *
* @author pkupczyk
*/
public abstract class BaseServiceConversationServerManager implements
@@ -46,6 +55,10 @@ public abstract class BaseServiceConversationServerManager implements
server = new ServiceConversationServer();
}
+ /**
+ * Method that can be used for registering local services that should be exposed for remote
+ * service conversation calls.
+ */
protected void addService(Class<?> serviceInterface, Object service)
{
ServiceConversationServiceFactory serviceFactory =
@@ -124,6 +137,10 @@ public abstract class BaseServiceConversationServerManager implements
return clientDetailsToClientMap.size();
}
+ /**
+ * Returns detailed information about a client basing on a client id. If it returns null then
+ * the client is treated as unknown.
+ */
protected abstract ServiceConversationClientDetails getClientDetailsForClientId(Object clientId);
private synchronized IServiceConversationClientManagerRemote getClientForClientDetails(
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/IServiceConversationClientManagerRemote.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/IServiceConversationClientManagerRemote.java
index 8ba47f6aeac2dac88d20fec593b6e37dc43d074e..394a8f3c706b36a75eb3571b5ffe76a487a9807f 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/IServiceConversationClientManagerRemote.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/IServiceConversationClientManagerRemote.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.common.conversation.manager;
import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
/**
- * All clients of conversational RMI services must implement this interface
+ * A remote interface for service conversation client manager.
*
* @author anttil
*/
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/ServiceConversationServiceFactory.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/ServiceConversationServiceFactory.java
index b7e8ea1ea27d34f5657d9fe7a2d3ec2113714184..563e8afc274e6b786b669b656929fb6c06118556 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/ServiceConversationServiceFactory.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/ServiceConversationServiceFactory.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.common.serviceconversation.server.IServiceFactory;
import ch.systemsx.cisd.common.serviceconversation.server.ServiceConversationServer;
/**
- * A factory for RMI services. Runs incoming MethodInvocations within transactions.
+ * A factory for service conversation services. Runs incoming MethodInvocations.
*
* @author anttil
*/
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/ServiceConversationServiceProxy.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/ServiceConversationServiceProxy.java
index 6e1a30ab2969add2e9dcad055d10551fcc67319e..fedff7256bdbe91c22aea042f0db46e699908c1f 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/ServiceConversationServiceProxy.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/manager/ServiceConversationServiceProxy.java
@@ -26,8 +26,8 @@ import ch.systemsx.cisd.common.conversation.message.ServiceConversationMethodInv
import ch.systemsx.cisd.common.serviceconversation.client.IServiceConversation;
/**
- * Dynamic proxy that passes RPC calls to a ConversationalServer through service conversation
- * framework.
+ * Dynamic proxy that converts a given service method calls into appropriate service conversation
+ * messages.
*
* @author anttil
*/
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/message/ServiceConversationMethodInvocation.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/message/ServiceConversationMethodInvocation.java
index 47a293bb4d9984409f1999978fbf8492b6a2c0f4..025926e15a07416b0494aedf4b4169b4fc1a1464 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/message/ServiceConversationMethodInvocation.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/message/ServiceConversationMethodInvocation.java
@@ -32,9 +32,9 @@ import ch.systemsx.cisd.common.conversation.progress.ServiceConversationRateLimi
import ch.systemsx.cisd.common.serviceconversation.server.ServiceConversationServer;
/**
- * MethodInvocation represents a remote method invocation. It contains the name and the arguments of
- * a method to be executed on a remote server. It is Serializable to be transferable through the
- * service conversation framework.
+ * MethodInvocation represents a remote method invocation. It contains the name, the parameter types
+ * and the arguments of a method to be executed on a remote server. It is Serializable to be
+ * transferable through the service conversation framework.
*
* @author anttil
*/
@@ -51,15 +51,17 @@ public class ServiceConversationMethodInvocation implements Serializable
}
/**
- * Executes the method on given target object. Adds a ProgressListener instance as a last
- * argument of the call.
+ * Executes the method on given target object. Basing on the progress type of the target method
+ * (see {@link Conversational#progress()}) it creates and attaches to a current thread an
+ * instance of {@link IServiceConversationProgressListener}. The progress listener can be
+ * accessed within the target method via
+ * {@link ServiceConversationsThreadContext#getProgressListener()}.
*
* @param target The target object on which the method call will be executed
* @param server ServiceConversationServer that will receive the progress reports
* @param conversationId Id of the conversation
- * @param clientTimeOut The remote client making this method call will abort if it has not
- * received any messages from the server within the timeout (represented in
- * milliseconds)
+ * @param progressInterval Interval that should be used for reporting a progress of the method
+ * execution (represented in milliseconds)
* @returns The return value of the method call
*/
public Serializable executeOn(Object target, ServiceConversationServer server,
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/progress/ServiceConversationAutomaticProgressListener.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/progress/ServiceConversationAutomaticProgressListener.java
index 8caf0ceead2b75a47b95c4487f30a992dea5d2dd..352789250ae4c0ca672c079a36ded84d2bdd08c3 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/progress/ServiceConversationAutomaticProgressListener.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/progress/ServiceConversationAutomaticProgressListener.java
@@ -26,6 +26,9 @@ import ch.systemsx.cisd.common.serviceconversation.server.ProgressInfo;
import ch.systemsx.cisd.common.serviceconversation.server.ServiceConversationServer;
/**
+ * Creates a separate thread that regularly sends a progress information without a need of calling
+ * IServiceConversationProgressListener.update() method.
+ *
* @author pkupczyk
*/
public class ServiceConversationAutomaticProgressListener implements
diff --git a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/progress/ServiceConversationNullProgressListener.java b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/progress/ServiceConversationNullProgressListener.java
index 19aa98f85cf909dce5a5b0be5cdfaba9892b6ca9..0f1b72e2536a9253f675055579424eae502905a2 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/common/conversation/progress/ServiceConversationNullProgressListener.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/common/conversation/progress/ServiceConversationNullProgressListener.java
@@ -17,6 +17,8 @@
package ch.systemsx.cisd.common.conversation.progress;
/**
+ * Dummy progress listener that doesn't do anything when its methods are called.
+ *
* @author pkupczyk
*/
public class ServiceConversationNullProgressListener implements
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java
index 154632f24fd6e7f8205a05eb30145702e0a3ae69..6835b8ac928a30b857ce3f7a95bf77f01dba7ea7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java
@@ -26,6 +26,8 @@ import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationA
import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationDataStoreUrl;
/**
+ * The service conversation client manager used by AS.
+ *
* @author pkupczyk
*/
public class ServiceConversationClientManager extends BaseServiceConversationClientManager
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
index a3e51731a4870dc2038281caaab79f674a66ffec..24355316b187938e031cd5babcee6a647c0081d5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
@@ -29,9 +29,10 @@ import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationD
import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationDataStoreUrl;
/**
+ * The service conversation server manager used by AS.
+ *
* @author pkupczyk
*/
-
public class ServiceConversationServerManager extends BaseServiceConversationServerManager
implements IServiceConversationServerManagerLocal, InitializingBean
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationClientManagerLocal.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationClientManagerLocal.java
index f1b592701710439e9688dcbe0e1c475a45ff7335..50470a60ed922a53af81a2c492ced96eef4f3d62 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationClientManagerLocal.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationClientManagerLocal.java
@@ -19,6 +19,8 @@ package ch.systemsx.cisd.openbis.generic.server.business;
import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;
/**
+ * A local interface of the service conversation client manager used by AS.
+ *
* @author pkupczyk
*/
public interface IServiceConversationClientManagerLocal
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationServerManagerLocal.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationServerManagerLocal.java
index 005e02773c2e2d1397c1c6bdee1d4f761803f959..b466623d709adb0d1a2de42ed92435d5f8b94650 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationServerManagerLocal.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationServerManagerLocal.java
@@ -17,6 +17,8 @@
package ch.systemsx.cisd.openbis.generic.server.business;
/**
+ * A local interface of the service conversation server manager used by AS.
+ *
* @author pkupczyk
*/
public interface IServiceConversationServerManagerLocal