Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop

* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Added unit test for findLatestReviewers
  Changes to build dependencies and config files to support automated builds

pom.xml

@@ -63,7 +63,6 @@
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>1.2.16</version>
-			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
@@ -77,7 +76,6 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.13</version>
-			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Spring Deps -->
@@ -85,7 +83,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>${org.springframework.version}</version>
-			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -112,7 +109,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
 			<version>${org.springframework.version}</version>
-			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
@@ -164,7 +160,6 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-ehcache</artifactId>
 			<version>${hibernate.version}</version>
-			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Jackrabbit dependencies -->
@@ -187,7 +182,6 @@
 			<groupId>eu.medsea.mimeutil</groupId>
 			<artifactId>mime-util</artifactId>
 			<version>2.1.3</version>
-			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Additional dependencies -->
@@ -195,7 +189,6 @@
 			<groupId>org.apache.wicket</groupId>
 			<artifactId>wicket-extensions</artifactId>
 			<version>${wicket.version}</version>
-			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.odlabs.wiquery</groupId>

src/main/java/se/su/dsv/scipro/peer/data/dao/interfaces/PeerReviewDao.java

@@ -49,6 +49,8 @@ public interface PeerReviewDao extends LazyDeleteDao<PeerReview> {
 	
 	public List<PeerReview> findReviewsSortedByDate(final int firstResult, final Integer limit);
 
+	public List<PeerReview> findReviewsSortedByDate();
+
 	/**
 	 * Find given peer reviews for a given project and student
 	 * 

src/main/java/se/su/dsv/scipro/peer/data/dao/jpa/PeerReviewDaoJPAImp.java

@@ -414,8 +414,13 @@ public class PeerReviewDaoJPAImp extends LazyDeleteAbstractDaoJPAImp<PeerReview>
 			}
 		});
 	}
+	
+	@Transactional
+	public List<PeerReview> findReviewsSortedByDate() {
+		return findReviewsSortedByDate(0, 3);
+	}
 
-	@Override
+	@Transactional
 	public int countSubmittedReviews() {
 		return getJpaTemplate().execute(new JpaCallback<Integer>() {
 			public Integer doInJpa(EntityManager em)

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

@@ -88,8 +88,8 @@
 			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" />
 			<property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"></property>			
 			<property name="hibernate.connection.url" value="jdbc:mysql://localhost/scipro"></property>
-			<property name="hibernate.connection.username" value="root"></property>
-			<property name="hibernate.connection.password" value="juju"></property>
+			<property name="hibernate.connection.username" value="scipro"></property>
+			<property name="hibernate.connection.password" value="pighleef"></property>
 			<property name="hibernate.connection.provider_class" value="org.hibernate.connection.C3P0ConnectionProvider"></property>
 			<property name="hibernate.c3p0.min_size" value="3"></property>
 			<property name="hibernate.c3p0.max_size" value="6"></property>

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

@@ -64,8 +64,8 @@
 		<!-- Use deployment for production, development for development -->
 	<context-param>
 		<param-name>configuration</param-name>
-			<param-value>development</param-value>
-			<!--<param-value>deployment</param-value>-->
+			<!--param-value>development</param-value-->
+			<param-value>deployment</param-value>
 	</context-param>
 	
 

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

@@ -491,5 +491,46 @@ public class TestPeerReviewDaoJPA {
 		list.add(review1);
 		Assert.assertEquals(list, peerReviewDao.findPeerReviewsByStudentAndProject(reviewerRole, reviewerProject));
 	}
+	
+	@Test
+	@Transactional
+	@Rollback
+	public void testFindLatestReviewers(){
+		PeerRequest request1 = new PeerRequest();
+		request1.setComment("plz b gentle!");
+		request1.setRequester(requesterRole);
+		request1.setProject(requesterProject);
+		request1 = peerRequestDao.save(request1);
+		
+		PeerReview review1 = new PeerReview();
+		review1.setReviewer(reviewerRole);
+		review1.setProject(reviewerProject);
+		review1.setComment("Overall ok!");
+		review1.setPeerRequest(request1);
+		request1.setStatus(RequestStatus.FINISHED);
+		request1 = peerRequestDao.save(request1);
+		review1.setSubmitted(true);
+		review1 = peerReviewDao.save(review1);
+		
+		PeerRequest request2 = new PeerRequest();
+		request2.setComment("plz b gentle!");
+		request2.setRequester(requesterRole);
+		request2.setProject(requesterProject);
+		request2 = peerRequestDao.save(request2);
+		
+		PeerReview review2 = new PeerReview();
+		review2.setReviewer(reviewerRole);
+		review2.setProject(reviewerProject);
+		review2.setComment("Overall ok!");
+		review2.setPeerRequest(request2);
+		request2.setStatus(RequestStatus.FINISHED);
+		request2 = peerRequestDao.save(request2);
+		review2.setSubmitted(true);
+		review2 = peerReviewDao.save(review2);
+		
+		List<PeerReview> sortedByDate = peerReviewDao.findReviewsSortedByDate();
+		Assert.assertEquals(review2, sortedByDate.get(0));
+		Assert.assertEquals(2, peerReviewDao.countSubmittedReviews());
+	}
 
 }