Migrate away from ehcache

ghillert · ghillert · commit 002a7374c010 · 2015-04-19T17:10:09.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -137,7 +137,24 @@
 			<plugin>
 				<groupId>org.cloudfoundry</groupId>
 				<artifactId>cf-maven-plugin</artifactId>
-				<version>1.0.0.M3</version>
+				<version>1.1.1</version>
+				<configuration>
+					<server>mycloudfoundry-instance</server>
+					<target>http://api.run.pivotal.io</target>
+					<org>FrameworksAndRuntimes</org>
+					<space>ghillert</space>
+					<appname>devnexus</appname>
+					<url>devnexus.cfapps.io</url>
+					<memory>512</memory>
+					<diskQuota>1024</diskQuota>
+					<healthCheckTimeout>180</healthCheckTimeout>
+					<mergeEnv>true</mergeEnv>
+					<services>
+						<service>
+							<name>devnexus-mail</name>
+						</service>
+					</services>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.zeroturnaround</groupId>
@@ -236,11 +253,6 @@
 			<artifactId>hibernate-core</artifactId>
 			<version>${org.hibernate.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-ehcache</artifactId>
-			<version>${org.hibernate.version}</version>
-		</dependency>
 		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-search</artifactId>
 			<version>4.0.0.Final</version> </dependency> -->
 		<dependency>
@@ -721,6 +733,11 @@
 			<artifactId>spring-cloud-spring-service-connector</artifactId>
 			<version>1.1.1.RELEASE</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-cloudfoundry-connector</artifactId>
+			<version>1.1.1.RELEASE</version>
+		</dependency>
 	</dependencies>
 
 	<inceptionYear>2010</inceptionYear>
diff --git a/src/main/java/com/devnexus/ting/model/CfpSubmissionSpeaker.java b/src/main/java/com/devnexus/ting/model/CfpSubmissionSpeaker.java
@@ -39,8 +39,6 @@
  *
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @FilterDefs({
 		@FilterDef(name = "presentationFilter"),
 		@FilterDef(name = "presentationFilterEventId", parameters=@ParamDef( name="eventId", type="long" ) )
diff --git a/src/main/java/com/devnexus/ting/model/Evaluation.java b/src/main/java/com/devnexus/ting/model/Evaluation.java
@@ -37,8 +37,6 @@
  *
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Evaluation extends BaseModelObject {
diff --git a/src/main/java/com/devnexus/ting/model/Event.java b/src/main/java/com/devnexus/ting/model/Event.java
@@ -40,8 +40,6 @@
  *
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @XmlAccessorType(value=XmlAccessType.FIELD)
 public class Event extends BaseModelObject {
 
diff --git a/src/main/java/com/devnexus/ting/model/FileData.java b/src/main/java/com/devnexus/ting/model/FileData.java
@@ -39,8 +39,6 @@
 import org.hibernate.validator.constraints.NotEmpty;
 
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 @Table(name="FILE_DATA")
diff --git a/src/main/java/com/devnexus/ting/model/Presentation.java b/src/main/java/com/devnexus/ting/model/Presentation.java
@@ -54,8 +54,6 @@
  * @author Gunnar Hillert
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 @org.hibernate.annotations.Table(appliesTo = "PRESENTATIONS", indexes = {@Index(name = "PRESENTATION_IDX", columnNames = {"TITLE"})})
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/src/main/java/com/devnexus/ting/model/PresentationTag.java b/src/main/java/com/devnexus/ting/model/PresentationTag.java
@@ -39,8 +39,6 @@
  *
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class PresentationTag extends BaseModelObject implements Comparable<PresentationTag> {
diff --git a/src/main/java/com/devnexus/ting/model/Room.java b/src/main/java/com/devnexus/ting/model/Room.java
@@ -45,8 +45,6 @@
  *
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @FilterDefs({
 		@FilterDef(name = "roomFilter"),
 		@FilterDef(name = "roomFilterEventId", parameters=@ParamDef( name="eventId", type="long" ) )
diff --git a/src/main/java/com/devnexus/ting/model/ScheduleItem.java b/src/main/java/com/devnexus/ting/model/ScheduleItem.java
@@ -44,8 +44,6 @@
  *
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @FilterDefs({
 		@FilterDef(name = "scheduleItemFilter"),
 		@FilterDef(name = "scheduleItemFilterEventId", parameters=@ParamDef( name="eventId", type="long" ) )
diff --git a/src/main/java/com/devnexus/ting/model/Speaker.java b/src/main/java/com/devnexus/ting/model/Speaker.java
@@ -44,8 +44,6 @@
  * @author Gunnar Hillert
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @FilterDefs({
 		@FilterDef(name = "presentationFilter"),
 		@FilterDef(name = "presentationFilterEventId", parameters=@ParamDef( name="eventId", type="long" ) )
diff --git a/src/main/java/com/devnexus/ting/model/Sponsor.java b/src/main/java/com/devnexus/ting/model/Sponsor.java
@@ -40,8 +40,6 @@
  *
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Sponsor extends BaseModelObject {
diff --git a/src/main/java/com/devnexus/ting/model/Track.java b/src/main/java/com/devnexus/ting/model/Track.java
@@ -47,8 +47,6 @@
  *
  */
 @Entity
-@Cacheable()
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Track extends BaseModelObject implements Comparable<Track> {
diff --git a/src/main/java/com/devnexus/ting/web/WebAppInitializer.java b/src/main/java/com/devnexus/ting/web/WebAppInitializer.java
@@ -186,10 +186,6 @@ public void setupContext(final ServletContext servletContext) {
 
 		System.setProperty("ting-spring-profile", springContextMode.getCode());
 
-		if (System.getProperty("ehcache.disk.store.dir") == null) {
-			System.setProperty("ehcache.disk.store.dir", System.getProperty(Apphome.APP_HOME_DIRECTORY) + File.separator + "ehcache");
-		}
-
 		final StringBuilder bootMessage = new StringBuilder();
 
 		bootMessage.append("\n");
diff --git a/src/main/java/com/devnexus/ting/web/config/CloudConfig.java b/src/main/java/com/devnexus/ting/web/config/CloudConfig.java
@@ -1,16 +1,33 @@
 package com.devnexus.ting.web.config;
 
-import org.springframework.cloud.config.java.AbstractCloudConfig;
+import javax.sql.DataSource;
+
+import org.springframework.cloud.Cloud;
+import org.springframework.cloud.CloudFactory;
+import org.springframework.cloud.service.ServiceInfo;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.mail.MailSender;
 
 @Profile("cloud")
 @Configuration
-public class CloudConfig extends AbstractCloudConfig {
+public class CloudConfig {
 	@Bean
 	public MailSender mailSender() {
-		return connectionFactory().service(MailSender.class);
+		CloudFactory cloudFactory = new CloudFactory();
+        Cloud cloud = cloudFactory.getCloud();
+        ServiceInfo serviceInfo = cloud.getServiceInfo("devnexus-mail");
+        String serviceID = serviceInfo.getId();
+        return cloud.getServiceConnector(serviceID, MailSender.class, null);
 	}
+
+//	@Bean
+//	public DataSource dataSource() {
+//		CloudFactory cloudFactory = new CloudFactory();
+//        Cloud cloud = cloudFactory.getCloud();
+//        ServiceInfo serviceInfo = cloud.getServiceInfo("devnexus-pg");
+//        String serviceID = serviceInfo.getId();
+//        return cloud.getServiceConnector(serviceID, DataSource.class, null);
+//	}
 }
diff --git a/src/main/java/com/devnexus/ting/web/config/MainConfig.java b/src/main/java/com/devnexus/ting/web/config/MainConfig.java
@@ -31,8 +31,9 @@
  */
 @Configuration
 @Import({
+	CloudConfig.class,
 	ServicesConfig.class,
-	WebSocketConfig.class,
+	//WebSocketConfig.class,
 	WebSecurityConfig.class,
 	WebConfig.class
 })
diff --git a/src/main/java/com/devnexus/ting/web/config/PersistenceConfig.java b/src/main/java/com/devnexus/ting/web/config/PersistenceConfig.java
@@ -46,8 +46,7 @@
  */
 @Configuration
 @ComponentScan("com.devnexus.ting.core.dao")
-@EnableJpaRepositories(
-		repositoryFactoryBeanClass=BaseRepositoryFactoryBean.class,
+@EnableJpaRepositories(repositoryFactoryBeanClass=BaseRepositoryFactoryBean.class,
 		entityManagerFactoryRef="entityManagerFactory", basePackages="com.devnexus.ting.repository")
 public class PersistenceConfig {
 
@@ -86,7 +85,7 @@ public HibernateJpaVendorAdapter hibernateJpaVendorAdapter() {
 	}
 
 	@Bean
-	@Profile({SpringProfile.STANDALONE, SpringProfile.DEFAULT, SpringProfile.DEMO})
+	@Profile({SpringProfile.STANDALONE, SpringProfile.DEFAULT, SpringProfile.DEMO, "cloud"})
 	public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
 		final LocalContainerEntityManagerFactoryBean entityManagerFactory = new LocalContainerEntityManagerFactoryBean();
 		entityManagerFactory.setDataSource(dataSource());
@@ -97,9 +96,9 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
 
 		jpaProperties.put("hibernate.dialect", getHibernateDialect());
 		jpaProperties.put("hibernate.generate_statistics", true);
-		jpaProperties.put("hibernate.cache.use_second_level_cache", true);
-		jpaProperties.put("hibernate.cache.use_query_cache", true);
-		jpaProperties.put("hibernate.cache.region.factory_class", "org.hibernate.cache.ehcache.EhCacheRegionFactory");
+		//jpaProperties.put("hibernate.cache.use_second_level_cache", false);
+		//jpaProperties.put("hibernate.cache.use_query_cache", true);
+		//jpaProperties.put("hibernate.cache.region.factory_class", "org.hibernate.cache.ehcache.EhCacheRegionFactory");
 		jpaProperties.put("hibernate.show_sql", isShowHibernateSql());
 		jpaProperties.put("hibernate.format_sql", true);
 		jpaProperties.put("hibernate.ejb.naming_strategy", "com.devnexus.ting.core.hibernate.ImprovedPluralizedNamingStrategy");
@@ -124,7 +123,7 @@ public PlatformTransactionManager transactionManager() {
 		return txManager;
 	}
 
-	@Profile("!cloud")
+	//@Profile({"cloud", "default"})
 	@Bean(destroyMethod = "close")
 	public DataSource dataSource() {
 		BoneCPDataSource dataSource = new BoneCPDataSource();
diff --git a/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -16,40 +16,12 @@
 		</triggeringPolicy>
 	</appender>
 
-	<appender name="LOGFILE-SECURITY" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<append>true</append>
-		<File>${TING_HOME}/logs/ting-security.log</File>
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d %5p [%t][%X{sessionId}][%X{username}][%-55logger{55}] %m [%X{requestUrl}]%n</pattern>
-		</layout>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<FileNamePattern>ting-security%i.log</FileNamePattern>
-			<maxIndex>50</maxIndex>
-		</rollingPolicy>
-		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<MaxFileSize>4096KB</MaxFileSize>
-		</triggeringPolicy>
-	</appender>
-
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<layout class="ch.qos.logback.classic.PatternLayout">
 			<pattern>%d %5p | %t | %X{sessionId} | %X{username} | %-55logger{55} | %m | %X{requestUrl}%n</pattern>
 		</layout>
 	</appender>
 
-	<appender name="SMTP" class="ch.qos.logback.classic.net.SMTPAppender">
-		<From>no_reply_errors@devnexus.org</From>
-		<Subject>DevNexus Website - Error Log</Subject>
-		<To>errors@devnexus.org</To>
-		<SMTPHost>localhost</SMTPHost>
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d %5p [%t][%-55logger{55}] - %m%n</pattern>
-		</layout>
-	</appender>
-
 	<logger name="com.devnexus.ting.web.WebAppInitializer">
 		<level value="INFO"/>
 	</logger>

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@`
`39`	`39`	`*`
`40`	`40`	`*/`
`41`	`41`	`@Entity`
`42`		`-@Cacheable()`
`43`		`-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"`
`44`	`42`	`@FilterDefs({`
`45`	`43`	`@FilterDef(name = "presentationFilter"),`
`46`	`44`	`@FilterDef(name = "presentationFilterEventId", parameters=@ParamDef( name="eventId", type="long" ) )`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@`
`37`	`37`	`*`
`38`	`38`	`*/`
`39`	`39`	`@Entity`
`40`		`-@Cacheable()`
`41`		`-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"`
`42`	`40`	`@XmlRootElement`
`43`	`41`	`@XmlAccessorType(XmlAccessType.FIELD)`
`44`	`42`	`public class Evaluation extends BaseModelObject {`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@`
`40`	`40`	`*`
`41`	`41`	`*/`
`42`	`42`	`@Entity`
`43`		`-@Cacheable()`
`44`		`-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"`
`45`	`43`	`@XmlAccessorType(value=XmlAccessType.FIELD)`
`46`	`44`	`public class Event extends BaseModelObject {`
`47`	`45`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@`
`45`	`45`	`*`
`46`	`46`	`*/`
`47`	`47`	`@Entity`
`48`		`-@Cacheable()`
`49`		`-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"`
`50`	`48`	`@FilterDefs({`
`51`	`49`	`@FilterDef(name = "roomFilter"),`
`52`	`50`	`@FilterDef(name = "roomFilterEventId", parameters=@ParamDef( name="eventId", type="long" ) )`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@`
`44`	`44`	`*`
`45`	`45`	`*/`
`46`	`46`	`@Entity`
`47`		`-@Cacheable()`
`48`		`-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //, include="non-lazy"`
`49`	`47`	`@FilterDefs({`
`50`	`48`	`@FilterDef(name = "scheduleItemFilter"),`
`51`	`49`	`@FilterDef(name = "scheduleItemFilterEventId", parameters=@ParamDef( name="eventId", type="long" ) )`