SP-544 BIS-356 add authorization and log interceptors to screening dss

json rpc. fix

SVN: 28593

screening/source/java/screening-dssApplicationContext.xml

@@ -21,10 +21,25 @@
     <!-- 
         // Screening specific configuration
     -->
-    
-    <bean id="data-store-rpc-service-screening-logic" class="ch.systemsx.cisd.openbis.dss.screening.server.DssServiceRpcScreening">
-      <constructor-arg value="${storeroot-dir}" />
-    </bean>
+
+  <bean id="data-store-rpc-service-screening-logic" class="org.springframework.aop.framework.ProxyFactoryBean">
+      <property name="proxyInterfaces">
+          <list>
+              <value>ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening</value>
+          </list>
+       </property>
+      <property name="interceptorNames">
+          <list>
+              <value>screening-rpc-authorization-advisor</value>
+              <value>screening-rpc-log-advisor</value>
+          </list>
+      </property>
+      <property name="target">
+        <bean class="ch.systemsx.cisd.openbis.dss.screening.server.DssServiceRpcScreening">
+          <constructor-arg value="${storeroot-dir}" />
+        </bean>
+      </property>
+   </bean>
 
     <bean id="data-store-rpc-service-screening-json-logic" class="ch.systemsx.cisd.openbis.dss.screening.server.DssServiceRpcScreeningJson">
         <constructor-arg>
@@ -32,42 +47,18 @@
         </constructor-arg>
     </bean>
     
-    <bean id="data-store-rpc-service-screening"
-        class="com.marathon.util.spring.StreamSupportingHttpInvokerServiceExporter">
+    <bean id="data-store-rpc-service-screening" class="com.marathon.util.spring.StreamSupportingHttpInvokerServiceExporter">
         <property name="service">
-            <bean class="org.springframework.aop.framework.ProxyFactoryBean">
-                <property name="proxyInterfaces">
-                    <list>
-                        <value>ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening</value>
-                    </list>
-                 </property>
-                <property name="interceptorNames">
-                    <list>
-                        <value>screening-rpc-authorization-advisor</value>
-                        <value>screening-rpc-log-advisor</value>
-                    </list>
-                </property>
-                <property name="target">
-                  <ref bean="data-store-rpc-service-screening-logic" />
-                </property>
-             </bean>
+          <ref bean="data-store-rpc-service-screening-logic" />
         </property>
         <property name="serviceInterface" value="ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening" />
     </bean>
 
     <bean id="data-store-rpc-service-screening-json" class="com.googlecode.jsonrpc4j.spring.JsonServiceExporter">
         <property name="service">
-            <ref bean="data-store-rpc-service-screening-json-logic" />
-            <property name="interceptorNames">
-                <list>
-                    <value>screening-rpc-authorization-advisor</value>
-                    <value>screening-rpc-log-advisor</value>
-                </list>
-            </property>
-        </property>
-        <property name="serviceInterface" >
-            <value>ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening</value>
+          <ref bean="data-store-rpc-service-screening-json-logic" />
         </property>
+        <property name="serviceInterface" value="ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening" />
     </bean>
 
     <bean id="objectMapper" class="ch.systemsx.cisd.openbis.plugin.screening.shared.api.json.ScreeningObjectMapper">
@@ -84,4 +75,4 @@
     -->
 
     <bean id="screening-rpc-log-advisor" class="ch.systemsx.cisd.openbis.common.spring.LogAdvisor" />
-</beans>
+</beans>
\ No newline at end of file