Travis only needs to build for JDK 8

ghillert · ghillert · commit 412ace84bf0d · 2015-04-26T23:01:53.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,3 @@
 language: java
 jdk:
-  - oraclejdk7
-  - openjdk6
+  - oraclejdk8
diff --git a/src/main/java/com/devnexus/ting/core/service/SystemSetupService.java b/src/main/java/com/devnexus/ting/core/service/SystemSetupService.java
@@ -38,15 +38,9 @@ public interface SystemSetupService {
 	 */
 	void restore(InputStream inputStream);
 
-	/** Create the database using Hibernate's SchemaExport functionality */
-	void createDatabase();
-
 	/** Update the database using Hibernate's SchemaUpdate functionality */
 	void updateDatabase();
 
-	/** */
-	void loadAndRestoreSeedData();
-
 	/** */
 	boolean isDatabaseSetup();
 
diff --git a/src/main/java/com/devnexus/ting/core/service/impl/BusinessServiceImpl.java b/src/main/java/com/devnexus/ting/core/service/impl/BusinessServiceImpl.java
@@ -54,18 +54,6 @@
 
 import com.devnexus.ting.common.CalendarUtils;
 import com.devnexus.ting.common.SystemInformationUtils;
-import com.devnexus.ting.repository.ApplicationCacheRepository;
-import com.devnexus.ting.repository.CfpSubmissionRepository;
-import com.devnexus.ting.repository.EvaluationRepository;
-import com.devnexus.ting.repository.EventRepository;
-import com.devnexus.ting.repository.OrganizerRepository;
-import com.devnexus.ting.repository.PresentationRepository;
-import com.devnexus.ting.repository.PresentationTagRepository;
-import com.devnexus.ting.repository.RoomRepository;
-import com.devnexus.ting.repository.ScheduleItemRepository;
-import com.devnexus.ting.repository.SpeakerRepository;
-import com.devnexus.ting.repository.SponsorRepository;
-import com.devnexus.ting.repository.TrackRepository;
 import com.devnexus.ting.core.service.BusinessService;
 import com.devnexus.ting.model.ApplicationCache;
 import com.devnexus.ting.model.CfpSubmission;
@@ -85,6 +73,18 @@
 import com.devnexus.ting.model.SponsorList;
 import com.devnexus.ting.model.Track;
 import com.devnexus.ting.model.support.PresentationSearchQuery;
+import com.devnexus.ting.repository.ApplicationCacheRepository;
+import com.devnexus.ting.repository.CfpSubmissionRepository;
+import com.devnexus.ting.repository.EvaluationRepository;
+import com.devnexus.ting.repository.EventRepository;
+import com.devnexus.ting.repository.OrganizerRepository;
+import com.devnexus.ting.repository.PresentationRepository;
+import com.devnexus.ting.repository.PresentationTagRepository;
+import com.devnexus.ting.repository.RoomRepository;
+import com.devnexus.ting.repository.ScheduleItemRepository;
+import com.devnexus.ting.repository.SpeakerRepository;
+import com.devnexus.ting.repository.SponsorRepository;
+import com.devnexus.ting.repository.TrackRepository;
 
 /**
  *
diff --git a/src/main/java/com/devnexus/ting/core/service/impl/CalendarServicesImpl.java b/src/main/java/com/devnexus/ting/core/service/impl/CalendarServicesImpl.java
@@ -13,11 +13,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.devnexus.ting.repository.ScheduleItemRepository;
-import com.devnexus.ting.repository.UserCalendarRepository;
 import com.devnexus.ting.core.service.CalendarServices;
 import com.devnexus.ting.model.User;
 import com.devnexus.ting.model.UserCalendar;
+import com.devnexus.ting.repository.ScheduleItemRepository;
+import com.devnexus.ting.repository.UserCalendarRepository;
 
 @Service
 public class CalendarServicesImpl implements CalendarServices{
diff --git a/src/main/java/com/devnexus/ting/core/service/impl/SystemSetupServiceImpl.java b/src/main/java/com/devnexus/ting/core/service/impl/SystemSetupServiceImpl.java
diff --git a/src/main/java/com/devnexus/ting/core/service/impl/UserServiceImpl.java b/src/main/java/com/devnexus/ting/core/service/impl/UserServiceImpl.java
@@ -41,12 +41,12 @@
 import org.springframework.util.Assert;
 import org.springframework.web.context.request.NativeWebRequest;
 
-import com.devnexus.ting.repository.UserRepository;
 import com.devnexus.ting.core.service.UserService;
 import com.devnexus.ting.core.service.exception.DuplicateUserException;
 import com.devnexus.ting.model.AuthorityType;
 import com.devnexus.ting.model.User;
 import com.devnexus.ting.model.UserAuthority;
+import com.devnexus.ting.repository.UserRepository;
 
 /**
  * Provides user specific services.
diff --git a/src/main/java/com/devnexus/ting/model/CfpSubmissionSpeaker.java b/src/main/java/com/devnexus/ting/model/CfpSubmissionSpeaker.java
@@ -15,7 +15,6 @@
  */
 package com.devnexus.ting.model;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
@@ -26,8 +25,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.FilterDefs;
 import org.hibernate.annotations.ParamDef;
diff --git a/src/main/java/com/devnexus/ting/model/Evaluation.java b/src/main/java/com/devnexus/ting/model/Evaluation.java
@@ -15,7 +15,6 @@
  */
 package com.devnexus.ting.model;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
@@ -25,8 +24,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.validator.constraints.Range;
 
 import com.devnexus.ting.common.TingUtil;
diff --git a/src/main/java/com/devnexus/ting/model/Event.java b/src/main/java/com/devnexus/ting/model/Event.java
@@ -18,7 +18,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -29,8 +28,6 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/com/devnexus/ting/model/FileData.java b/src/main/java/com/devnexus/ting/model/FileData.java
@@ -17,7 +17,6 @@
 
 import java.util.Date;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -34,8 +33,6 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.validator.constraints.NotEmpty;
 
 @Entity
diff --git a/src/main/java/com/devnexus/ting/model/Presentation.java b/src/main/java/com/devnexus/ting/model/Presentation.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -36,8 +35,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Index;
diff --git a/src/main/java/com/devnexus/ting/model/PresentationTag.java b/src/main/java/com/devnexus/ting/model/PresentationTag.java
@@ -18,7 +18,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.ManyToMany;
@@ -28,8 +27,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.validator.constraints.NotEmpty;
 
 /**
diff --git a/src/main/java/com/devnexus/ting/model/Room.java b/src/main/java/com/devnexus/ting/model/Room.java
@@ -18,7 +18,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -31,8 +30,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.FilterDefs;
 import org.hibernate.annotations.ParamDef;
@@ -96,13 +93,14 @@ public Room(Long id) {
 		this.id = id;
 	}
 
-	public Room(Long id, String name, Integer capacity, Integer order, Event event) {
+	public Room(Long id, String name, Integer capacity, Integer order, Event event, String color) {
 		super();
 		this.id = id;
 		this.name = name;
 		this.capacity = capacity;
 		this.roomOrder = order;
 		this.event = event;
+		this.color = color;
 	}
 
 	@Override
diff --git a/src/main/java/com/devnexus/ting/model/ScheduleItem.java b/src/main/java/com/devnexus/ting/model/ScheduleItem.java
@@ -17,7 +17,6 @@
 
 import java.util.Date;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
@@ -31,8 +30,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.FilterDefs;
 import org.hibernate.annotations.ParamDef;
diff --git a/src/main/java/com/devnexus/ting/model/Speaker.java b/src/main/java/com/devnexus/ting/model/Speaker.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.ManyToMany;
@@ -30,8 +29,6 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.FilterDefs;
diff --git a/src/main/java/com/devnexus/ting/model/Sponsor.java b/src/main/java/com/devnexus/ting/model/Sponsor.java
@@ -15,7 +15,6 @@
  */
 package com.devnexus.ting.model;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.ManyToOne;
@@ -26,8 +25,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Parameter;
diff --git a/src/main/java/com/devnexus/ting/model/Track.java b/src/main/java/com/devnexus/ting/model/Track.java
@@ -18,7 +18,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -32,8 +31,6 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.Filters;
 import org.hibernate.validator.constraints.NotEmpty;
diff --git a/src/main/java/com/devnexus/ting/repository/FileDataRepository.java b/src/main/java/com/devnexus/ting/repository/FileDataRepository.java
@@ -15,10 +15,7 @@
  */
 package com.devnexus.ting.repository;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-
 import com.devnexus.ting.model.FileData;
-import com.devnexus.ting.model.Organizer;
 
 public interface FileDataRepository extends BaseRepository<FileData, Long>, FileDataRepositoryCustom {
 
diff --git a/src/main/java/com/devnexus/ting/repository/PresentationTagRepository.java b/src/main/java/com/devnexus/ting/repository/PresentationTagRepository.java
@@ -15,7 +15,6 @@
  */
 package com.devnexus.ting.repository;
 
-import com.devnexus.ting.model.Presentation;
 import com.devnexus.ting.model.PresentationTag;
 
 /**
diff --git a/src/main/java/com/devnexus/ting/repository/SystemRepository.java b/src/main/java/com/devnexus/ting/repository/SystemRepository.java
@@ -15,7 +15,6 @@
  */
 package com.devnexus.ting.repository;
 
-import com.devnexus.ting.model.Sponsor;
 
 /**
  * @author Gunnar Hillert
