merge from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / resources / eu / etaxonomy / cdm / editorApplicationContext.xml

diff --git a/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml b/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
index eda9d21c496236d29992ff369c57c0fbdc0dd2ca..14bb1278b644118a6d9fa29c704717b440bcc467 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
@@ -7,8 +7,8 @@
     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
-  <!-- <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/> -->\r
-  <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/>\r
+  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/> \r
+  <!--import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/>-->\r
   \r
    <!-- <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">\r
     <property name="omit" value="false" />\r
@@ -17,8 +17,6 @@
   <!-- <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer">    \r
   </bean> -->\r
   \r
- \r
-\r
     \r
   <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>\r
   <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>\r
@@ -29,6 +27,8 @@
     <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.DataSourceConfigurer" />\r
     <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.LoggingConfigurer" />\r
     <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.view\.PatternViewResolver" />\r
+    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.vaadin\..*" />\r
+    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.controller\..*Portal.*" /> \r
   </context:component-scan>\r
   \r
   \r