Fix slide download

Author: ghillert

pom.xml

@@ -21,7 +21,7 @@
 	<properties>
 		<java-version>1.7</java-version>
 		<org.cloudfoundry-version>0.8.6</org.cloudfoundry-version>
-		<org.springframework-version>4.1.4.RELEASE</org.springframework-version>
+		<org.springframework-version>4.1.6.RELEASE</org.springframework-version>
 		<org.aspectj-version>1.6.9</org.aspectj-version>
 		<org.slf4j-version>1.7.10</org.slf4j-version>
 		<jawr.debug.on>true</jawr.debug.on>

src/main/java/com/devnexus/ting/core/service/impl/BusinessServiceImpl.java

@@ -424,10 +424,13 @@ public ApplicationCache getApplicationCacheManifest() {
 	}
 
 	@Override
-	@Transactional
-	public FileData getPresentationFileData(Long presentationId) {
+	public FileData getPresentationFileData(final Long presentationId) {
 
-		final Presentation presentation = this.getPresentation(presentationId);
+		final Presentation presentation = transactionTemplate.execute(new TransactionCallback<Presentation>() {
+			public Presentation doInTransaction(TransactionStatus status) {
+				return presentationDao.getOneWithSlide(presentationId);
+			}
+		});
 
 		if (presentation == null) {
 			return null;

src/main/java/com/devnexus/ting/repository/PresentationRepositoryCustom.java

@@ -33,4 +33,5 @@ List<Presentation> findPresentations(
 
 	List<Presentation> getPresentationsForEventOrderedByTrack(Long eventId);
 
+	Presentation getOneWithSlide(Long presentationId);
 }

src/main/java/com/devnexus/ting/repository/jpa/CfpSubmissionRepositoryImpl.java

@@ -33,11 +33,6 @@ public class CfpSubmissionRepositoryImpl implements CfpSubmissionRepositoryCusto
 	@PersistenceContext
 	private EntityManager entityManager;
 
-	public CfpSubmissionRepositoryImpl() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
 	@Override
 	public List<CfpSubmission> getCfpSubmissions(Long eventId) {
 

src/main/java/com/devnexus/ting/repository/jpa/PresentationRepositoryImpl.java

@@ -116,4 +116,14 @@ else if (presentationSearchQuery.getTrack().getName() != null) {
 		return rootCriteria.list();
 	}
 
+	@Override
+	public Presentation getOneWithSlide(Long presentationId) {
+		return this.entityManager
+		.createQuery("select p from Presentation p "
+				   + "join fetch p.presentationFile e "
+				   + "where p.id = :presentationId ", Presentation.class)
+		.setParameter("presentationId", presentationId)
+		.getSingleResult();
+	}
+
 }

src/main/java/com/devnexus/ting/web/controller/admin/PresentationController.java

@@ -167,7 +167,7 @@ public String prepareEditPresentation(@PathVariable("presentationId") Long prese
 		model.addAttribute("presentation", presentation);
 
 		final List<Speaker> speakers = businessService.getSpeakersForEvent(presentation.getEvent().getId());
-		model.addAttribute("speakers", speakers);
+		model.addAttribute("sp2", speakers);
 
 		this.prepareReferenceData(model, presentation.getEvent());
 

src/main/resources/ehcache.xml

@@ -44,7 +44,7 @@
     <defaultCache
         maxElementsInMemory="10000"
         eternal="false"
-        overflowToDisk="true"
+        overflowToDisk="false"
         timeToIdleSeconds="500"
         timeToLiveSeconds="500"
         diskPersistent="false"
@@ -55,8 +55,8 @@
 	    maxElementsInMemory="500"
 	    eternal="false"
 	    timeToLiveSeconds="220"
-	    overflowToDisk="true"
+	    overflowToDisk="false"
 	    diskPersistent="false"/>
 
     <!-- See http://ehcache.sourceforge.net/documentation/#mozTocId258426 for how to configure caching for your objects -->
-</ehcache>
+</ehcache>