Merge branch 'release/4.6.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / resources / eu / etaxonomy / cdm / remotingApplicationContext.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
index 47f6b6e3be7373f9404e82b981916ccdfd6de8a3..7dc046a2e40c02011b2ae00794b1ba4ec4ac8a33 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
@@ -2,39 +2,32 @@
 <beans xmlns="http://www.springframework.org/schema/beans"\r
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"\r
   xmlns:tx="http://www.springframework.org/schema/tx"\r
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-    http://www.springframework.org/schema/context  http://www.springframework.org/schema/context/spring-context-2.5.xsd">\r
-\r
-\r
-  <!-- <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/> -->\r
-\r
-  <context:annotation-config />\r
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
+    http://www.springframework.org/schema/context  http://www.springframework.org/schema/context/spring-context-3.1.xsd">\r
 \r
   <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServiceClients.xml" />\r
 \r
-\r
-\r
-  <!-- <context:component-scan base-package="eu/etaxonomy/taxeditor/session" \r
-    /> -->\r
-  <bean id="cdmEntitySessionManager"  class="eu.etaxonomy.taxeditor.session.CdmEntitySessionManager" />\r
+  <bean id="cdmEntitySessionManager"  \r
+    class="eu.etaxonomy.taxeditor.session.CdmEntitySessionManager" />\r
 \r
   <bean id="cdmApplicationRemoteConfiguration" \r
     class="eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration" />\r
 \r
-  <!-- <import resource="classpath:/eu/etaxonomy/cdm/remoting_services_security.xml" \r
-    /> -->\r
-\r
-<!--   <context:component-scan base-package="eu.etaxonomy.taxeditor.service" /> -->\r
-  \r
-  <bean id="cdmServiceRequestExecutor"\r
+  <bean id="cdmServiceRequestExecutor" \r
     class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />\r
     \r
   <bean id="cachedCommonService" \r
-    class="eu.etaxonomy.taxeditor.service.CachedCommonServiceImpl" />\r
+    class="eu.etaxonomy.taxeditor.service.CachedCommonServiceImpl" />    \r
   \r
+  <bean id="defaultExport"\r
+    class="eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultExport" />\r
+    \r
+  <bean id="jaxbExport"\r
+    class="eu.etaxonomy.cdm.io.jaxb.JaxbExport" />\r
+    \r
   <bean id="accessDecisionManager" \r
-    class="eu.etaxonomy.cdm.persistence.hibernate.permission.UnanimousBasedUnrevokable">\r
+    class="eu.etaxonomy.cdm.persistence.hibernate.permission.UnanimousBasedUnrevokable" >\r
     \r
     <property name="decisionVoters">\r
       <list>\r
@@ -54,51 +47,33 @@
 \r
   <!-- CdmPermissionEvaluator.hasPermissions() evaluates the CdmPermissions \r
     like TAXONNODE.UPDATE{20c8f083-5870-4cbd-bf56-c5b2b98ab6a7} -->\r
-  <bean id="cdmPermissionEvaluator"\r
+  <bean id="cdmPermissionEvaluator" \r
     class="eu.etaxonomy.cdm.persistence.hibernate.permission.CdmPermissionEvaluator">\r
     <property name="accessDecisionManager" ref="accessDecisionManager" />\r
   </bean>\r
 \r
-  <!-- The CdmSecurityHibernateInterceptor checks onSave() and on flushDirty() \r
-    if the currently authenticated principal or token has sufficient permissions \r
-    on the entity to be persisted -->\r
-  <bean id="securityHibernateInterceptor"\r
-    class="eu.etaxonomy.cdm.persistence.hibernate.CdmSecurityHibernateInterceptor">\r
-    <property name="permissionEvaluator" ref="cdmPermissionEvaluator" />\r
+  <bean id="authenticationManager"\r
+    class="org.springframework.security.authentication.ProviderManager">\r
+    <property name="providers">\r
+      <list>\r
+        <ref local="daoAuthenticationProvider" />\r
+      </list>\r
+    </property>\r
   </bean>\r
 \r
-<!--   <bean id="authenticationManager" -->\r
-<!--     class="org.springframework.security.authentication.ProviderManager"> -->\r
-<!--     <property name="providers"> -->\r
-<!--       <list> -->\r
-<!--         <ref local="daoAuthenticationProvider" /> -->\r
-<!--       </list> -->\r
-<!--     </property> -->\r
-<!--   </bean> -->\r
-\r
-<!--   <bean id="daoAuthenticationProvider" -->\r
-<!--     class="org.springframework.security.authentication.dao.DaoAuthenticationProvider"> -->\r
-<!--     <property name="userDetailsService" ref="userService" /> -->\r
-<!--     <property name="saltSource" ref="saltSource" /> -->\r
-<!--     <property name="passwordEncoder" ref="passwordEncoder" /> -->\r
-<!--   </bean> -->\r
-\r
-<!--   <bean id="passwordEncoder" -->\r
-<!--     class="org.springframework.security.authentication.encoding.Md5PasswordEncoder" /> -->\r
-\r
-<!--   <bean id="saltSource" -->\r
-<!--     class="org.springframework.security.authentication.dao.ReflectionSaltSource"> -->\r
-<!--     <property name="userPropertyToUse" value="getUsername" /> -->\r
-<!--   </bean> -->\r
-\r
-\r
-  <context:component-scan base-package="eu.etaxonomy.cdm.api.cache">\r
-    <!-- FIXME:Remoting Temp workaround to make remoting work -->\r
-    <context:exclude-filter type="regex"\r
-      expression="eu\.etaxonomy\.cdm\.api\.cache\.CdmTermCacher" />\r
-  </context:component-scan>\r
-\r
+  <bean id="daoAuthenticationProvider" \r
+    class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">\r
+    <property name="userDetailsService" ref="userService" />\r
+    <property name="saltSource" ref="saltSource" />\r
+    <property name="passwordEncoder" ref="passwordEncoder" />\r
+  </bean>\r
 \r
+  <bean id="passwordEncoder" \r
+    class="org.springframework.security.authentication.encoding.Md5PasswordEncoder" />\r
 \r
+  <bean id="saltSource" \r
+    class="org.springframework.security.authentication.dao.ReflectionSaltSource">\r
+    <property name="userPropertyToUse" value="getUsername" />\r
+  </bean>\r
 \r
 </beans>\r