More classes to annotation.

wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java

@@ -29,7 +29,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@Repository
+@Repository("labelManager")
 public class LabelManagerImpl
         implements LabelManager {
     @Resource

wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java

@@ -34,7 +34,7 @@ import org.springframework.stereotype.Repository;
 import java.util.Calendar;
 import java.util.List;
 
-@Repository
+@Repository("mindmapManager")
 public class MindmapManagerImpl
         implements MindmapManager {
     @Resource

wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java

@@ -28,6 +28,7 @@ import org.hibernate.SessionFactory;
 import org.hibernate.query.SelectionQuery;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Repository;
 
@@ -38,9 +39,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
 @Repository
 public class UserManagerImpl
         implements UserManager {
-    @Resource
+    @Autowired
     private SessionFactory sessionFactory;
 
+    @Autowired
     private PasswordEncoder passwordEncoder;
 
     public void setEncoder(PasswordEncoder passwordEncoder) {

wise-webapp/src/main/webapp/WEB-INF/web.xml

@@ -27,7 +27,6 @@
             /WEB-INF/wisemapping-datasource.xml
             /WEB-INF/wisemapping-dao.xml
             /WEB-INF/wisemapping-service.xml
-            /WEB-INF/wisemapping-model.xml
             /WEB-INF/wisemapping-servlet.xml
         </param-value>
     </context-param>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-		http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <beans>
-        <bean id="userManager" class="com.wisemapping.dao.UserManagerImpl">
-            <property name="encoder" ref="passwordEncoder"/>
-        </bean>
-
-        <bean id="mindmapManager" class="com.wisemapping.dao.MindmapManagerImpl"/>
-
-        <bean id="labelManager" class="com.wisemapping.dao.LabelManagerImpl"/>
-
-    </beans>
-</beans>