From: Andreas Müller <a.mueller@bgbm.org>
Date: Thu, 19 Mar 2015 21:36:38 +0000 (+0000)
Subject: merge taxeditor validation2 into trunk
X-Git-Tag: 3.6.0~169
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d8002f07b08f09ba89beee7256eb1b213570d3b7

merge taxeditor validation2 into trunk
---

diff --git a/eu.etaxonomy.taxeditor.navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml b/eu.etaxonomy.taxeditor.navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml
index 42d100a80..d699d09a6 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml
@@ -24,7 +24,10 @@
 
     
     <!-- enable the configuration of transactional behavior based on annotations -->
-    <tx:annotation-driven transaction-manager="transactionManager"/>      
+    <tx:annotation-driven transaction-manager="transactionManager"/>
+    
+<!-- <bean id="validationManager" class="eu.etaxonomy.cdm.api.validation.ValidationManager" scope="prototype"/> -->
+