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 88fb565d81c8ed059a37cb928d7d6097844cc769..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,12 +7,17 @@
     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
-  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">\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
-  </bean>\r
+  </bean> -->\r
+   \r
+  <!-- <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer">    \r
+  </bean> -->\r
   \r
+    \r
   <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>\r
   <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>\r
   \r