SP-481, BIS-317: Remove OptimisticLockingRetryAdvisor in published servers in...

SP-481, BIS-317: Remove OptimisticLockingRetryAdvisor in published servers in order to have two OptimisticLockingRetryAdvisor in the caller chain.

SVN: 28594

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java

@@ -41,8 +41,6 @@ public class CommonServiceServer extends HttpInvokerServiceExporter
     {
         setServiceInterface(ICommonServer.class);
         setService(common);
-        setInterceptors(new Object[]
-            { new OptimisticLockingRetryAdvisor() });
         super.afterPropertiesSet();
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java

@@ -47,7 +47,7 @@ public class ETLServiceServer extends HttpInvokerServiceExporter
         setServiceInterface(IServiceForDataStoreServer.class);
         setService(etlService);
         setInterceptors(new Object[]
-            { createExceptionTranslator(), new OptimisticLockingRetryAdvisor() });
+            { createExceptionTranslator() });
         super.afterPropertiesSet();
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java

@@ -74,7 +74,6 @@ public class ServiceConversationServerManager extends BaseServiceConversationSer
     public void setEtlService(IServiceForDataStoreServer etlService)
     {
         ProxyFactory factory = new ProxyFactory(etlService);
-        factory.addAdvisor(new OptimisticLockingRetryAdvisor());
         this.etlService = (IServiceForDataStoreServer) factory.getProxy();
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java

@@ -22,7 +22,6 @@ import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import ch.systemsx.cisd.openbis.generic.server.OptimisticLockingRetryAdvisor;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
@@ -42,8 +41,6 @@ public class GenericServiceServer extends HttpInvokerServiceExporter
     {
         setServiceInterface(IGenericServer.class);
         setService(server);
-        setInterceptors(new Object[]
-            { new OptimisticLockingRetryAdvisor() });
         super.afterPropertiesSet();
     }