reverting back config file to make local invocation work

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 1344e38b5d355b7ddaf20a126ae08d06b3669aa1..2a879672fd11d97b76afc4ff25b2566dfedd147c 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,10 +7,29 @@
     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
-  <!-- Local application context and term initializer -->\r
-  <import resource="classpath:/eu/etaxonomy/cdm/localApplicationContext.xml"/>
+  <!-- Default application context and term initializer -->\r
+  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
+  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
+    <property name="omit" value="false" />
+  </bean>
   \r
   <!-- Remote application context and term initializer -->\r
-<!--  <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
+  <!-- <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
+<!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->
+  \r
+    \r
+  <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>\r
+  <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>\r
+  \r
+  <context:component-scan base-package="eu/etaxonomy/cdm/ext"/>\r
+  \r
+  <context:component-scan base-package="eu/etaxonomy/cdm/remote">\r
+    <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
 </beans>\r