From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 12 Feb 2014 12:52:34 +0000 (+0000)
Subject: config.properties : config for target cdmserver in remoting
X-Git-Tag: 3.6.0~791
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7f34904a1981bc54bc25d6bbf348b47016c39719

config.properties : config for target cdmserver in remoting
editorApplicationContext.xml : added (currently commented) config for remoting
---

diff --git a/.gitattributes b/.gitattributes
index a057e3836..ab8a127d1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1629,6 +1629,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplemen
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/org/eclipse/wb/swt/ResourceManager.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/org/eclipse/wb/swt/SWTResourceManager.java -text
+eu.etaxonomy.taxeditor.store/src/main/resources/config.properties -text
 eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml -text
 eu.etaxonomy.taxeditor.store/src/main/resources/log4j.properties -text
 eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java -text
diff --git a/eu.etaxonomy.taxeditor.store/src/main/resources/config.properties b/eu.etaxonomy.taxeditor.store/src/main/resources/config.properties
new file mode 100644
index 000000000..85f6c1cca
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/resources/config.properties
@@ -0,0 +1,2 @@
+serverName=localhost:8080
+contextPath=
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 88fb565d8..14bb1278b 100644
--- 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">
 
-  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
-  <!-- <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
-  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
+  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/> 
+  <!--import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/>-->
+  
+   <!-- <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
     <property name="omit" value="false" />
-  </bean>
+  </bean> -->
+   
+  <!-- <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer">    
+  </bean> -->
   
+    
   <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>
   <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>