got all the tests going without xml beans i think

src/main/java/se/su/dsv/scipro/activityplan/facade/ProjectScheduleFacade.java

@@ -15,6 +15,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.joda.time.DateMidnight;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,25 +49,33 @@ import edu.emory.mathcs.backport.java.util.Collections;
  */
 @Service
 public class ProjectScheduleFacade {
-	@Autowired
+//    @Qualifier("projectDao")
+    @Autowired
 	private ProjectDao projectDao;
-	@Autowired
+//    @Qualifier("projectScheduleEventDao")
+    @Autowired
 	private ProjectScheduleEventDao projectScheduleEventDao;
-	@Autowired
+//    @Qualifier("projectScheduleDao")
+    @Autowired
 	private ProjectScheduleDao projectScheduleDao;
-	@Autowired
+//    @Qualifier("scheduleTemplateDao")
+    @Autowired
 	private ScheduleTemplateDao scheduleTemplateDao;
-	@Autowired
+//    @Qualifier("checkListDao")
+    @Autowired
 	private CheckListDao checkListDao;
 	@Autowired
 	private FileRepository fileRepository;
-	@Autowired
+//    @Qualifier("fileDescriptionDao")
+    @Autowired
 	private FileDescriptionDao fileDescriptionDao;
 	private final Logger logger = Logger.getLogger(ProjectScheduleFacade.class);
-	
-	@Autowired
+
+    @Qualifier("checkListQuestionDao")
+    @Autowired
 	private CheckListQuestionDao checklistQuestionDao;
-	@Autowired
+    @Qualifier("checkListTemplateDao")
+    @Autowired
 	private CheckListTemplateDao checklistTemplateDao;
 	
 	public static final String BASE_PATH = "schedule_events";
@@ -144,7 +153,7 @@ public class ProjectScheduleFacade {
 	 * @param file
 	 * @param user
 	 * @param event
-	 * @throws IOException
+	 * @throws java.io.IOException
 	 */
 	@Transactional
 	public void storeScheduleEventUpload(final FileUpload file, final User user, final ProjectScheduleEvent event)throws IOException{

src/main/java/se/su/dsv/scipro/match/Matcher.java

@@ -8,6 +8,7 @@ import org.apache.log4j.Logger;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import se.su.dsv.scipro.match.dao.interfaces.ProjectIdeaDao;
 import se.su.dsv.scipro.match.dao.interfaces.SupervisorDao;
 import se.su.dsv.scipro.match.dataobject.ApplicationPeriod;
@@ -28,7 +29,7 @@ public class Matcher implements Serializable {
     private ProjectIdeaDao projectIdeaDao;
 
     //@SpringBean(name="MatchAllDummyMatchingAlgorithm")
-    @SpringBean(name="GreedyMatchingAlgorithm")
+//    @SpringBean(name="GreedyMatchingAlgorithm")
     @Autowired
     private MatchingAlgorithm matchingAlgorithm;
 

src/main/resources/META-INF/repositoryContext.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/tx
+		http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
 		http://www.springframework.org/schema/context
 		http://www.springframework.org/schema/context/spring-context-3.0.xsd"
 	default-autowire="byType">

src/main/resources/applicationContext.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd

src/main/resources/test-applicationContext.xml

@@ -1,15 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+		http://www.springframework.org/schema/tx
+		http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
 		http://www.springframework.org/schema/data/jpa
         http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
        default-autowire="byName" default-lazy-init="true">
 
     <jpa:repositories base-package="se.su.dsv.scipro.springdata" />
 
+    <!-- Sets up spring autowire configuration based on annotations -->
+    <context:annotation-config/>
+    <context:component-scan base-package="se.su.dsv.scipro"/>
+
+
+    <!--<bean id="propertyPlaceholderConfigurer"-->
+          <!--class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">-->
+        <!--<property name="locations">-->
+            <!--<list>-->
+                <!--<value>classpath:application.properties</value>-->
+            <!--</list>-->
+        <!--</property>-->
+    <!--</bean>-->
+
+
     <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="dataSource"/>
         <property name="persistenceUnitName" value="testPersistenceUnit"/>
@@ -38,207 +57,247 @@
         <property name="entityManagerFactory" ref="entityManagerFactory"/>
     </bean>
 
-    <bean id="projectScheduleDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectScheduleDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
+    <!-- STORAGE REPOSITORY CONFIG -->
+    <bean id="contentProperties" class="se.su.dsv.scipro.repository.ContentProperties">
+        <property name="jcrRepository" value="/jackrabbit"/>
+        <property name="jcrUsername" value="username"/>
+        <property name="jcrPassword" value="password"/>
     </bean>
 
-    <bean id="applicationPeriodFacade" class="se.su.dsv.scipro.match.facade.ApplicationPeriodFacade">
+
+    <!--<bean id="matchingStrategy" class="se.su.dsv.scipro.match.MatchAllDummyMatchingAlgorithm">-->
+    <!--</bean>-->
+
+    <!--<bean id="fileRepository" class="se.su.dsv.scipro.repository.FileRepositoryImpl">-->
+    <!--</bean>-->
+
+    <!--<bean id="matchingStrategy" class="se.su.dsv.scipro.match.MatchAllDummyMatchingAlgorithm">-->
+    <!--</bean>-->
+
+    <bean id="matchingAlgorithm" class="se.su.dsv.scipro.match.MatchAllDummyMatchingAlgorithm">
     </bean>
 
-    <bean id="userDao" class="se.su.dsv.scipro.data.dao.jpa.UserDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--private MatchingAlgorithm matchingAlgorithm;-->
 
-    <bean id="userNameDao" class="se.su.dsv.scipro.data.dao.jpa.UserNameDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--@SpringBean(name="GreedyMatchingAlgorithm")-->
+    <!--@Autowired-->
+    <!--private MatchingAlgorithm matchingAlgorithm;-->
 
-    <bean id="projectScheduleEventDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectScheduleEventDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="notificationController" class="se.su.dsv.scipro.data.controllers.impl.NotificationControllerImpl">-->
+    <!--</bean>-->
 
-    <bean id="scheduleTemplateDao" class="se.su.dsv.scipro.data.dao.jpa.ScheduleTemplateDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
 
-    <bean id="checklistTemplateDao" class="se.su.dsv.scipro.data.dao.jpa.CheckListTemplateDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--&lt;!&ndash; Load data initializer for default table-data &ndash;&gt;-->
+    <!--<bean class="se.su.dsv.scipro.DataInitialiser" init-method="dataInit"/>-->
+    <!--&lt;!&ndash; Importer used for remote importing work, use "ExternalImporterDefaultImpl" if you have no remote-import implementation capable of satisfying "ExternalImporter" interface. &ndash;&gt;-->
+    <!--<bean id="externalImporter" class="se.su.dsv.scipro.io.impl.ExternalImporterDaisyImpl"/>-->
+    <!--&lt;!&ndash; Defines global settings for the application &ndash;&gt;-->
+    <!--<bean id="applicationSettings" class="se.su.dsv.scipro.ApplicationSettings">-->
+        <!--<property name="remoteLookupUrl" value="https://api.dsv.su.se/rest"/>-->
+        <!--<property name="remoteLookupUser" value="thesis"/>-->
+        <!--<property name="remoteLookupPassword" value="dqyhIM8LU5LQ53T3aJNz4SVXeTQ95dLGkN7JlLOv7X7jeTR2NR"/>-->
+        <!--&lt;!&ndash; This property points to the location of the remote system used for json requests &ndash;&gt;-->
+        <!--&lt;!&ndash;  External auth support (via J2EE standard mechanism REMOTE_USER), if true: other authentication mechanics will be bypassed.&ndash;&gt;-->
+        <!--<property name="acceptExternalAuthentication" value="true"/>-->
+    <!--</bean>-->
 
-    <bean id="projectDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
 
-    <bean id="roleDao" class="se.su.dsv.scipro.data.dao.jpa.RoleDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="projectScheduleDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectScheduleDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="projectClassDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectClassDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="applicationPeriodFacade" class="se.su.dsv.scipro.match.facade.ApplicationPeriodFacade">-->
+    <!--</bean>-->
 
-    <bean id="checkListDao" class="se.su.dsv.scipro.data.dao.jpa.CheckListDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="userDao" class="se.su.dsv.scipro.data.dao.jpa.UserDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="fileDescriptionDao" class="se.su.dsv.scipro.data.dao.jpa.FileDescriptionDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="userNameDao" class="se.su.dsv.scipro.data.dao.jpa.UserNameDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="fileRepository" class="se.su.dsv.scipro.repository.FileRepositoryImpl">
-    </bean>
+    <!--<bean id="projectScheduleEventDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectScheduleEventDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="projectScheduleFacade" class="se.su.dsv.scipro.activityplan.facade.ProjectScheduleFacade">
-    </bean>
+    <!--<bean id="scheduleTemplateDao" class="se.su.dsv.scipro.data.dao.jpa.ScheduleTemplateDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="projectIdeaDao" class="se.su.dsv.scipro.match.dao.jpa.ProjectIdeaDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="checklistTemplateDao" class="se.su.dsv.scipro.data.dao.jpa.CheckListTemplateDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="applicationPeriodDao" class="se.su.dsv.scipro.match.dao.jpa.ApplicationPeriodDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="projectDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="matchDao" class="se.su.dsv.scipro.match.dao.jpa.MatchDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="roleDao" class="se.su.dsv.scipro.data.dao.jpa.RoleDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="authorDao" class="se.su.dsv.scipro.match.dao.jpa.AuthorDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="projectClassDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectClassDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="supervisorDao" class="se.su.dsv.scipro.match.dao.jpa.SupervisorDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="checkListDao" class="se.su.dsv.scipro.data.dao.jpa.CheckListDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="keywordDao" class="se.su.dsv.scipro.match.dao.jpa.KeywordDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="fileDescriptionDao" class="se.su.dsv.scipro.data.dao.jpa.FileDescriptionDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="keywordTypeDao" class="se.su.dsv.scipro.match.dao.jpa.KeywordTypeDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
 
-    <bean id="languageDao" class="se.su.dsv.scipro.data.dao.jpa.LanguageDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
 
-    <bean id="checkListQuestionDao" class="se.su.dsv.scipro.data.dao.jpa.CheckListQuestionDaoJPAImp">
-    </bean>
+    <!--<bean id="projectScheduleFacade" class="se.su.dsv.scipro.activityplan.facade.ProjectScheduleFacade">-->
+    <!--</bean>-->
 
-    <bean id="matchingStrategy" class="se.su.dsv.scipro.match.MatchAllDummyMatchingAlgorithm">
-    </bean>
+    <!--<bean id="projectIdeaDao" class="se.su.dsv.scipro.match.dao.jpa.ProjectIdeaDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="notificationController" class="se.su.dsv.scipro.data.controllers.impl.NotificationControllerImpl">
-    </bean>
+    <!--<bean id="applicationPeriodDao" class="se.su.dsv.scipro.match.dao.jpa.ApplicationPeriodDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="webNotificationDao" class="se.su.dsv.scipro.data.dao.jpa.WebNotificationDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="matchDao" class="se.su.dsv.scipro.match.dao.jpa.MatchDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="generalSystemSettingsDao" class="se.su.dsv.scipro.data.dao.jpa.GeneralSystemSettingsDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="authorDao" class="se.su.dsv.scipro.match.dao.jpa.AuthorDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="mailEventDao" class="se.su.dsv.scipro.data.dao.jpa.MailEventDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="supervisorDao" class="se.su.dsv.scipro.match.dao.jpa.SupervisorDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="exemptionDao" class="se.su.dsv.scipro.match.dao.jpa.ExemptionDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="keywordDao" class="se.su.dsv.scipro.match.dao.jpa.KeywordDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="userSettingsDao" class="se.su.dsv.scipro.data.dao.jpa.UserSettingsDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="keywordTypeDao" class="se.su.dsv.scipro.match.dao.jpa.KeywordTypeDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="peerRequestDao" class="se.su.dsv.scipro.peer.data.dao.jpa.PeerRequestDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
-    <bean id="peerReviewDao" class="se.su.dsv.scipro.peer.data.dao.jpa.PeerReviewDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="languageDao" class="se.su.dsv.scipro.data.dao.jpa.LanguageDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="boardMessageDao" class="se.su.dsv.scipro.data.dao.jpa.BoardMessageDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="checkListQuestionDao" class="se.su.dsv.scipro.data.dao.jpa.CheckListQuestionDaoJPAImp">-->
+    <!--</bean>-->
 
-    <bean id="messageBoardDao" class="se.su.dsv.scipro.data.dao.jpa.MessageBoardDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
 
-    <bean id="categoryDao" class="se.su.dsv.scipro.data.dao.jpa.CategoryDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
 
-    <bean id="checkListCategoryDao" class="se.su.dsv.scipro.data.dao.jpa.ChecklistCategoryDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="webNotificationDao" class="se.su.dsv.scipro.data.dao.jpa.WebNotificationDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="seminarDao" class="se.su.dsv.scipro.data.dao.jpa.FinalSeminarDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="generalSystemSettingsDao" class="se.su.dsv.scipro.data.dao.jpa.GeneralSystemSettingsDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="finalSeminarOppositionDao" class="se.su.dsv.scipro.data.dao.jpa.FinalSeminarOppositionDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="mailEventDao" class="se.su.dsv.scipro.data.dao.jpa.MailEventDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="checkPlagiarismEventDao" class="se.su.dsv.scipro.data.dao.jpa.CheckPlagiarismEventDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
-    <bean id="projectEventTemplateDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectEventTemplateDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="exemptionDao" class="se.su.dsv.scipro.match.dao.jpa.ExemptionDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="commentDao" class="se.su.dsv.scipro.data.dao.jpa.CommentDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
-    <bean id="commentThreadDao" class="se.su.dsv.scipro.data.dao.jpa.CommentThreadDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="userSettingsDao" class="se.su.dsv.scipro.data.dao.jpa.UserSettingsDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="activeListenerDao" class="se.su.dsv.scipro.data.dao.jpa.FinalSeminarActiveParticipationDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="peerRequestDao" class="se.su.dsv.scipro.peer.data.dao.jpa.PeerRequestDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+    <!--<bean id="peerReviewDao" class="se.su.dsv.scipro.peer.data.dao.jpa.PeerReviewDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="reviewRatingDao" class="se.su.dsv.scipro.peer.data.dao.jpa.ReviewRatingDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="boardMessageDao" class="se.su.dsv.scipro.data.dao.jpa.BoardMessageDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="projectFollowerDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectFollowerDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="messageBoardDao" class="se.su.dsv.scipro.data.dao.jpa.MessageBoardDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="privateMessageDao" class="se.su.dsv.scipro.data.dao.jpa.PrivateMessageDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="categoryDao" class="se.su.dsv.scipro.data.dao.jpa.CategoryDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="projectPartnerDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectPartnerDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="checkListCategoryDao" class="se.su.dsv.scipro.data.dao.jpa.ChecklistCategoryDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="ratableDao" class="se.su.dsv.scipro.data.dao.jpa.RatableDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="seminarDao" class="se.su.dsv.scipro.data.dao.jpa.FinalSeminarDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="resourceDao" class="se.su.dsv.scipro.data.dao.jpa.ResourceDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="finalSeminarOppositionDao" class="se.su.dsv.scipro.data.dao.jpa.FinalSeminarOppositionDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="ratingDao" class="se.su.dsv.scipro.data.dao.jpa.RatingDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="checkPlagiarismEventDao" class="se.su.dsv.scipro.data.dao.jpa.CheckPlagiarismEventDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+    <!--<bean id="projectEventTemplateDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectEventTemplateDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="recipientDao" class="se.su.dsv.scipro.data.dao.jpa.RecipientDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="commentDao" class="se.su.dsv.scipro.data.dao.jpa.CommentDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+    <!--<bean id="commentThreadDao" class="se.su.dsv.scipro.data.dao.jpa.CommentThreadDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="tagDao" class="se.su.dsv.scipro.data.dao.jpa.TagDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="activeListenerDao" class="se.su.dsv.scipro.data.dao.jpa.FinalSeminarActiveParticipationDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
-    <bean id="stringResourceDao" class="se.su.dsv.scipro.data.dao.jpa.StringResourceDaoJPAImp">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
+    <!--<bean id="reviewRatingDao" class="se.su.dsv.scipro.peer.data.dao.jpa.ReviewRatingDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="projectFollowerDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectFollowerDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="privateMessageDao" class="se.su.dsv.scipro.data.dao.jpa.PrivateMessageDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="projectPartnerDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectPartnerDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="ratableDao" class="se.su.dsv.scipro.data.dao.jpa.RatableDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="resourceDao" class="se.su.dsv.scipro.data.dao.jpa.ResourceDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="ratingDao" class="se.su.dsv.scipro.data.dao.jpa.RatingDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="recipientDao" class="se.su.dsv.scipro.data.dao.jpa.RecipientDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="tagDao" class="se.su.dsv.scipro.data.dao.jpa.TagDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
+
+    <!--<bean id="stringResourceDao" class="se.su.dsv.scipro.data.dao.jpa.StringResourceDaoJPAImp">-->
+        <!--<property name="entityManagerFactory" ref="entityManagerFactory"/>-->
+    <!--</bean>-->
 
 </beans>

src/test/java/se/su/dsv/scipro/dao/jpa/TestActivityPlanDaoJPA.java

@@ -3,8 +3,6 @@
  */
 package se.su.dsv.scipro.dao.jpa;
 
-import java.util.Date;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,21 +12,11 @@ import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
-
 import se.su.dsv.scipro.activityplan.facade.ProjectScheduleFacade;
-import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
-import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
-import se.su.dsv.scipro.data.dao.interfaces.ProjectScheduleDao;
-import se.su.dsv.scipro.data.dao.interfaces.ProjectScheduleEventDao;
-import se.su.dsv.scipro.data.dao.interfaces.RoleDao;
-import se.su.dsv.scipro.data.dao.interfaces.UserDao;
-import se.su.dsv.scipro.data.dataobjects.Project;
-import se.su.dsv.scipro.data.dataobjects.ProjectClass;
-import se.su.dsv.scipro.data.dataobjects.ProjectSchedule;
-import se.su.dsv.scipro.data.dataobjects.ProjectScheduleEvent;
-import se.su.dsv.scipro.data.dataobjects.Role;
-import se.su.dsv.scipro.data.dataobjects.Student;
-import se.su.dsv.scipro.data.dataobjects.User;
+import se.su.dsv.scipro.data.dao.interfaces.*;
+import se.su.dsv.scipro.data.dataobjects.*;
+
+import java.util.Date;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(inheritLocations = false, locations = {
@@ -84,7 +72,7 @@ public class TestActivityPlanDaoJPA {
 	@Transactional
 	@Rollback
 	public void testBaseDaoAccess() {
-		Assert.assertEquals(userDao.countAll(),1);
+        Assert.assertEquals(userDao.countAll(),1);
 		Assert.assertEquals(projectDao.countAll(),1);
 		Assert.assertEquals(projectScheduleDao.countAll(),1);
 		Assert.assertEquals(roleDao.countAll(),1);