fix project for version 4.0

diff --git a/pom.xml b/pom.xml
index 5ff87f45a46a737607ed75b106c76678786699e6..d62ba36a5d3d2ffee1f87da269c1927adeba1dac 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -72,298 +72,7 @@
       <layout>default</layout>
     </repository>
   </distributionManagement>
-  <dependencies>
-    <dependency>
-      <groupId>com.vaadin</groupId>
-      <artifactId>vaadin-server</artifactId>
-      <version>${vaadin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.vaadin</groupId>
-      <artifactId>vaadin-client-compiled</artifactId>
-      <version>${vaadin.version}</version>
-    </dependency>
-    <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory). 
-      For widgetset compilation, vaadin-client-compiler is automatically added 
-      on the compilation classpath by vaadin-maven-plugin so normally there is 
-      no need for an explicit dependency. -->
-    <!-- <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client-compiler</artifactId> 
-      <version>${vaadin.version}</version> <scope>provided</scope> </dependency> -->
-    <dependency>
-      <groupId>com.vaadin</groupId>
-      <artifactId>vaadin-client</artifactId>
-      <version>${vaadin.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- disabling push for the moment because it does not work with run-jetty-run 
-      due to the fact that the latest (even nightly) version of run-jetty-run uses 
-      9.0.0 M3 which is incompatible with atmoshpere. this does work with the jetty 
-      included in this pom which is 9.2.5.xx, implying that enabling the dependency 
-      and running the web app via 'mvn jetty:run' works fine. -->
-    <!-- <dependency> -->
-    <!-- <groupId>com.vaadin</groupId> -->
-    <!-- <artifactId>vaadin-push</artifactId> -->
-    <!-- <version>${vaadin.version}</version> -->
-    <!-- </dependency> -->
-    <dependency>
-      <groupId>com.vaadin</groupId>
-      <artifactId>vaadin-themes</artifactId>
-      <version>${vaadin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.vaadin</groupId>
-      <artifactId>vaadin-testbench-api</artifactId>
-      <version>RELEASE</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-services</artifactId>
-      <version>${cdmlib.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-model</artifactId>
-      <version>${cdmlib.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-persistence</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-      <version>${cdmlib.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springmodules</groupId>
-      <artifactId>spring-modules-cache</artifactId>
-      <version>0.7</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-mock</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.4.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <version>2.0.8</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>${spring.version}</version>
-      <scope>provided</scope>
-    </dependency>
-     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-   <dependency>
-       <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- vaadin addons / extensions -->
-    <dependency>
-      <groupId>org.vaadin.addons</groupId>
-      <artifactId>contextmenu</artifactId>
-      <version>4.5</version>
-    </dependency>
-    <!-- unitils dependencies - start -->
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-core</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-database</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-jdbc</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-dbmaintainer</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hibernate</groupId>
-          <artifactId>hibernate</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-dbunit</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-jdbc</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-beans</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-easymock</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-mock</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-inject</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-orm</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-orm</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.persistence</groupId>
-          <artifactId>persistence-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-spring</artifactId>
-      <version>${unitils.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-beans</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-test</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-tx</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.dbunit</groupId>
-      <artifactId>dbunit</artifactId>
-      <version>2.4.9</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- unitils dependencies - end -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>p6spy</groupId>
-      <artifactId>p6spy</artifactId>
-      <version>2.1.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-               <groupId>org.json</groupId>
-               <artifactId>json</artifactId>
-               <version>20151123</version>
-       </dependency>
-    
-  </dependencies>
+
   <profiles>
     <profile>
       <activation>
@@ -608,4 +317,294 @@
       </plugins>
     </pluginManagement>
   </build>
+    <dependencies>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-server</artifactId>
+      <version>${vaadin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-client-compiled</artifactId>
+      <version>${vaadin.version}</version>
+    </dependency>
+    <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory). 
+      For widgetset compilation, vaadin-client-compiler is automatically added 
+      on the compilation classpath by vaadin-maven-plugin so normally there is 
+      no need for an explicit dependency. -->
+    <!-- <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client-compiler</artifactId> 
+      <version>${vaadin.version}</version> <scope>provided</scope> </dependency> -->
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-client</artifactId>
+      <version>${vaadin.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- disabling push for the moment because it does not work with run-jetty-run 
+      due to the fact that the latest (even nightly) version of run-jetty-run uses 
+      9.0.0 M3 which is incompatible with atmoshpere. this does work with the jetty 
+      included in this pom which is 9.2.5.xx, implying that enabling the dependency 
+      and running the web app via 'mvn jetty:run' works fine. -->
+    <!-- <dependency> -->
+    <!-- <groupId>com.vaadin</groupId> -->
+    <!-- <artifactId>vaadin-push</artifactId> -->
+    <!-- <version>${vaadin.version}</version> -->
+    <!-- </dependency> -->
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-themes</artifactId>
+      <version>${vaadin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-testbench-api</artifactId>
+      <version>RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-services</artifactId>
+      <version>${cdmlib.version}</version>
+<!--       <scope>provided</scope> -->
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-test</artifactId>
+      <version>${cdmlib.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- to override version number coming with vaadin client -->
+    <dependency>
+       <groupId>javax.validation</groupId>
+       <artifactId>validation-api</artifactId>
+       <version>1.1.0.Final</version>
+     </dependency>
+      
+      
+    
+    <dependency>
+      <groupId>org.springmodules</groupId>
+      <artifactId>spring-modules-cache</artifactId>
+      <version>0.7</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-mock</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>1.4.7</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-mock</artifactId>
+      <version>2.0.8</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>${spring.version}</version>
+      <scope>provided</scope>
+    </dependency>
+     <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+   <dependency>
+       <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+
+    <!-- vaadin addons / extensions -->
+    <dependency>
+      <groupId>org.vaadin.addons</groupId>
+      <artifactId>contextmenu</artifactId>
+      <version>4.5</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- unitils dependencies - start -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-core</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-database</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--       <scope>test</scope> -->
+<!--       <exclusions> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-jdbc</artifactId> -->
+<!--         </exclusion> -->
+<!--       </exclusions> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-dbmaintainer</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--       <scope>test</scope> -->
+<!--       <exclusions> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.hibernate</groupId> -->
+<!--           <artifactId>hibernate</artifactId> -->
+<!--         </exclusion> -->
+<!--       </exclusions> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-dbunit</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--       <scope>test</scope> -->
+<!--       <exclusions> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-core</artifactId> -->
+<!--         </exclusion> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-jdbc</artifactId> -->
+<!--         </exclusion> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-beans</artifactId> -->
+<!--         </exclusion> -->
+<!--       </exclusions> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-easymock</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-mock</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-inject</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-orm</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--        <scope>test</scope> -->
+<!--       <exclusions> -->
+<!--      <exclusion> -->
+<!--        <artifactId>*</artifactId> -->
+<!--        <groupId>org.springframework</groupId> -->
+<!--      </exclusion> -->
+<!--      <exclusion> -->
+<!--        <artifactId>persistence-api</artifactId> -->
+<!--        <groupId>javax.persistence</groupId> -->
+<!--      </exclusion> -->
+<!--      <exclusion> -->
+<!--        <artifactId>hibernate</artifactId> -->
+<!--        <groupId>org.hibernate</groupId> -->
+<!--      </exclusion> -->
+<!--    </exclusions> -->
+<!--     </dependency>  -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-spring</artifactId> -->
+<!--       <version>${unitils.version}</version> -->
+<!--       <scope>test</scope> -->
+<!--       <exclusions> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-core</artifactId> -->
+<!--         </exclusion> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-context</artifactId> -->
+<!--         </exclusion> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-beans</artifactId> -->
+<!--         </exclusion> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-test</artifactId> -->
+<!--         </exclusion> -->
+<!--         <exclusion> -->
+<!--           <groupId>org.springframework</groupId> -->
+<!--           <artifactId>spring-tx</artifactId> -->
+<!--         </exclusion> -->
+<!--       </exclusions> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.easymock</groupId> -->
+<!--       <artifactId>easymock</artifactId> -->
+<!--       <version>3.1</version> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>xmlunit</groupId> -->
+<!--       <artifactId>xmlunit</artifactId> -->
+<!--       <version>1.4</version> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.dbunit</groupId> -->
+<!--       <artifactId>dbunit</artifactId> -->
+<!--       <version>2.4.9</version> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>commons-dbcp</groupId> -->
+<!--       <artifactId>commons-dbcp</artifactId> -->
+<!--       <version>1.4</version> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+    <!-- unitils dependencies - end -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+               <groupId>org.json</groupId>
+               <artifactId>json</artifactId>
+               <version>20151123</version>
+       </dependency>
+    
+  </dependencies>
 </project>

diff --git a/src/test/resources/unitils.properties b/src/test/resources/unitils.properties
index 61ecb7e02c6ceb25a15bd984c8948a47f678a562..bf10786ec3b0d3120bf7053cc596c7fa73d99d44 100755 (executable)
--- a/src/test/resources/unitils.properties
+++ b/src/test/resources/unitils.properties
@@ -39,7 +39,11 @@ database.schemaNames=PUBLIC
 org.dbunit.dataset.datatype.IDataTypeFactory.implClassName.h2=org.dbunit.ext.h2.H2DataTypeFactory\r
 org.unitils.core.dbsupport.DbSupport.implClassName.h2=eu.etaxonomy.cdm.database.H2DbSupport\r
 database.storedIndentifierCase.h2=auto\r
-database.identifierQuoteString.h2=auto\r
+\r
+#Since Hibernate 5 (or earlier > 4.1.10) using the Proxy does not correctly release \r
+#the connections to the pool after transaction finishes.\r
+dataSource.wrapInTransactionalProxy=false\r
+\r
 \r
 \r
 \r

diff --git a/src/test/resources/webapp/WEB-INF/applicationContext.xml b/src/test/resources/webapp/WEB-INF/applicationContext.xml
index 0c7b70184cb58ab28fae5f570f3ae23ed7b88a65..1573bfced16665fb96b2baa0ffe3a42a2c1d8b82 100755 (executable)
--- a/src/test/resources/webapp/WEB-INF/applicationContext.xml
+++ b/src/test/resources/webapp/WEB-INF/applicationContext.xml
@@ -88,12 +88,17 @@
         <property name="passwordEncoder" ref="passwordEncoder"/>\r
     </bean>\r
     <bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">\r
-        <property name="providers">\r
-            <list>\r
-                <bean class="org.springframework.security.authentication.TestingAuthenticationProvider"/>\r
-                <ref local="daoAuthenticationProvider"/>\r
-            </list>\r
-        </property>\r
+            <constructor-arg>\r
+                   <list>\r
+                       <ref local="daoAuthenticationProvider"/>\r
+                   </list>\r
+               </constructor-arg>\r
+<!--         <property name="providers"> -->\r
+<!--             <list> -->\r
+<!--                 <bean class="org.springframework.security.authentication.TestingAuthenticationProvider"/> -->\r
+<!--                 <ref local="daoAuthenticationProvider"/> -->\r
+<!--             </list> -->\r
+<!--         </property> -->\r
     </bean>
 
 </beans>