diff --git a/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle b/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle index 146fc3c..fd1b1ab 100644 --- a/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle +++ b/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle @@ -1,34 +1,30 @@ apply plugin: 'io.spring.convention.spring-sample-boot' apply plugin: "application" -apply from: IDE_GRADLE - -repositories { - mavenCentral() -} dependencies { compile project(':spring-session-data-geode') + compile("org.springframework.boot:spring-boot-starter-thymeleaf") { - exclude group: "org.springframework.boot", module: "spring-boot-starter-logging" + exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } + compile("org.springframework.boot:spring-boot-starter-web") { - exclude group: "org.springframework.boot", module: "spring-boot-starter-logging" + exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } + + compile "org.springframework.data:spring-data-geode-test" compile "org.webjars:bootstrap" compile "org.webjars:webjars-locator" runtime "org.springframework.shell:spring-shell" testCompile("org.springframework.boot:spring-boot-starter-test") { - exclude group: "org.springframework.boot", module: "spring-boot-starter-logging" + exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } + testCompile seleniumDependencies -// integrationTestCompile seleniumDependencies - -// integrationTestRuntime "org.springframework.shell:spring-shell" - } mainClassName = 'sample.client.Application' @@ -42,61 +38,3 @@ run { mainClassName = 'sample.server.GemFireServer' } } - -task runGemFireServer() { - doLast { - ext.port = reservePort() - - println "Starting Apache Geode Server on port [$port] ..." - - def out = new StringBuilder() - def err = new StringBuilder() - - String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator) - - String[] commandLine = [ - 'java', '-server', '-ea', '-classpath', classpath, - //"-Dgemfire.log-file=gemfire-server.log", - //"-Dgemfire.log-level=config", - "-Dspring.session.data.geode.cache.server.port=$port", - 'sample.server.GemFireServer' - ] - - //println commandLine - - ext.process = commandLine.execute() - //ext.process = new ProcessBuilder().command(commandLine).redirectErrorStream(true).start(); - - ext.process.consumeProcessOutput(out, err) - - //println 'OUT: ' + out - //println 'ERR: ' + err - } -} - - -/* -integrationTest { - dependsOn runGemFireServer - doFirst { - def port = reservePort() - systemProperties['management.port'] = 0 - systemProperties['server.port'] = port - //systemProperties['gemfire.log-file'] = "gemfire-client.log" - //systemProperties['gemfire.log-level'] = "config" - systemProperties['spring.session.data.geode.cache.server.port'] = runGemFireServer.port - } - doLast { - println 'Stopping Apache Geode Server...' - runGemFireServer.process?.destroyForcibly() - } -} -*/ - - -def reservePort() { - def socket = new ServerSocket(0) - def result = socket.localPort - socket.close() - result -} diff --git a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java index c065192..390d57d 100644 --- a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java @@ -86,7 +86,7 @@ public class Application { @Bean ClientCacheConfigurer clientCacheServerPortConfigurer( - @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <5> + @Value("${spring.data.gemfire.cache.server.port:40404}") int port) { // <5> return (beanName, clientCacheFactoryBean) -> clientCacheFactoryBean.setServers(Collections.singletonList( diff --git a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java index 26f462d..582308c 100644 --- a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java +++ b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java @@ -62,7 +62,7 @@ public class GemFireServer { @Bean CacheServerConfigurer cacheServerPortConfigurer( - @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <5> + @Value("${spring.data.gemfire.cache.server.port:40404}") int port) { // <5> return (beanName, cacheServerFactoryBean) -> cacheServerFactoryBean.setPort(port); diff --git a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle index 6ea7414..7a8f271 100644 --- a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle +++ b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle @@ -1,29 +1,28 @@ apply plugin: 'io.spring.convention.spring-sample-boot' +apply plugin: "gemfire-server" apply plugin: "application" -apply from: IDE_GRADLE - -repositories { - mavenCentral() -} dependencies { compile project(':spring-session-data-geode') + compile("org.springframework.boot:spring-boot-starter-thymeleaf") { - exclude group: "org.springframework.boot", module: "spring-boot-starter-logging" + exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } + compile("org.springframework.boot:spring-boot-starter-web") { - exclude group: "org.springframework.boot", module: "spring-boot-starter-logging" + exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } + + compile "org.springframework.data:spring-data-geode-test" compile "org.webjars:bootstrap" compile "org.webjars:webjars-locator" runtime "org.springframework.shell:spring-shell" testCompile("org.springframework.boot:spring-boot-starter-test") { - exclude group: "org.springframework.boot", module: "spring-boot-starter-logging" + exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - testCompile seleniumDependencies integrationTestCompile seleniumDependencies @@ -42,59 +41,3 @@ run { mainClassName = 'sample.server.GemFireServer' } } - -task runGemFireServer() { - doLast { - ext.port = reservePort() - - println "Starting Apache Geode Server on port [$port] ..." - - def out = new StringBuilder() - def err = new StringBuilder() - - String classpath = project.sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator) - - String[] commandLine = [ - 'java', '-server', '-ea', '-classpath', classpath, - //"-Dgemfire.log-file=gemfire-server.log", - //"-Dgemfire.log-level=config", - "-Dspring.session.data.geode.cache.server.port=$port", - 'sample.server.GemFireServer' - ] - - //println commandLine - - ext.process = commandLine.execute() - //ext.process = new ProcessBuilder().command(commandLine).redirectErrorStream(true).start(); - - ext.process.consumeProcessOutput(out, err) - - //println 'OUT: ' + out - //println 'ERR: ' + err - } -} - - -integrationTest { - dependsOn runGemFireServer - doFirst { - def port = reservePort() - systemProperties['management.port'] = 0 - systemProperties['server.port'] = port - //systemProperties['gemfire.log-file'] = "gemfire-client.log" - //systemProperties['gemfire.log-level'] = "config" - systemProperties['spring.session.data.geode.cache.server.port'] = runGemFireServer.port - } - doLast { - println 'Stopping Apache Geode Server...' - runGemFireServer.process?.destroyForcibly() - } -} - - -def reservePort() { - def socket = new ServerSocket(0) - def result = socket.localPort - socket.close() - result -} diff --git a/samples/boot/gemfire/src/main/java/sample/client/Application.java b/samples/boot/gemfire/src/main/java/sample/client/Application.java index ef44712..a4920b3 100644 --- a/samples/boot/gemfire/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire/src/main/java/sample/client/Application.java @@ -88,7 +88,7 @@ public class Application { @Bean ClientCacheConfigurer clientCacheServerPortConfigurer( - @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <5> + @Value("${spring.data.gemfire.cache.server.port:40404}") int port) { // <5> return (beanName, clientCacheFactoryBean) -> clientCacheFactoryBean.setServers(Collections.singletonList( diff --git a/samples/boot/gemfire/src/main/java/sample/client/IntegrationTestConfiguration.java b/samples/boot/gemfire/src/main/java/sample/client/IntegrationTestConfiguration.java index c6fc78c..9722b2d 100644 --- a/samples/boot/gemfire/src/main/java/sample/client/IntegrationTestConfiguration.java +++ b/samples/boot/gemfire/src/main/java/sample/client/IntegrationTestConfiguration.java @@ -56,7 +56,7 @@ public class IntegrationTestConfiguration { @Bean BeanPostProcessor clientServerReadyBeanPostProcessor( - @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <5> + @Value("${spring.data.gemfire.cache.server.port:40404}") int port) { // <5> return new BeanPostProcessor() { diff --git a/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java b/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java index 3d4137c..812666a 100644 --- a/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java +++ b/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java @@ -53,7 +53,7 @@ public class GemFireServer { @Bean CacheServerConfigurer cacheServerPortConfigurer( - @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <5> + @Value("${spring.data.gemfire.cache.server.port:40404}") int port) { // <5> return (beanName, cacheServerFactoryBean) -> cacheServerFactoryBean.setPort(port); diff --git a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle index 15fb96c..3455498 100644 --- a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle +++ b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle @@ -26,4 +26,13 @@ dependencies { } -mainClassName = "sample.ServerConfig" +mainClassName = 'sample.ServerConfig' + +project.tasks.findByName("prepareAppServerForIntegrationTests")?.configure { task -> + //println('Task gemfireServer' + project.tasks.findByName("gemfireServer")) + project.tasks.findByName("gemfireServer")?.configure { gemfireServerTask -> + //println "Task 'mainClassName' Property Value [$gemfireServerTask.mainClassName]" + gemfireServerTask.mainClassName = this.mainClassName + //println "Task 'mainClassName' Property Value [$gemfireServerTask.mainClassName]" + } +} diff --git a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java index 9bc4571..53e6da0 100644 --- a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java +++ b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java @@ -39,7 +39,7 @@ public class ClientConfig extends IntegrationTestConfig { @Bean ClientCacheConfigurer clientCacheServerPortConfigurer( - @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <3> + @Value("${spring.data.gemfire.cache.server.port:40404}") int port) { // <3> return (beanName, clientCacheFactoryBean) -> clientCacheFactoryBean.setServers(Collections.singletonList( diff --git a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/IntegrationTestConfig.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/IntegrationTestConfig.java index 4b1fcb9..780b983 100644 --- a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/IntegrationTestConfig.java +++ b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/IntegrationTestConfig.java @@ -56,7 +56,7 @@ public abstract class IntegrationTestConfig { @Bean BeanPostProcessor clientServerReadyBeanPostProcessor( - @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <5> + @Value("${spring.data.gemfire.cache.server.port:40404}") int port) { // <5> return new BeanPostProcessor() { diff --git a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java index 8fa557a..cb5b7b7 100644 --- a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java +++ b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java @@ -16,8 +16,6 @@ package sample; -import java.io.IOException; - import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -34,7 +32,7 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.Enabl public class ServerConfig { @SuppressWarnings("resource") - public static void main(String[] args) throws IOException { + public static void main(String[] args) { new AnnotationConfigApplicationContext(ServerConfig.class).registerShutdownHook(); } @@ -46,7 +44,7 @@ public class ServerConfig { @Bean CacheServerConfigurer cacheServerPortConfigurer( - @Value("${spring.session.data.geode.cache.server.port:40404}") int port) { // <4> + @Value("${spring.data.gemfire.cache.server.port:40404}") int port) { // <4> return (beanName, cacheServerFactoryBean) -> { cacheServerFactoryBean.setPort(port); diff --git a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle index 15fb96c..7da0b35 100644 --- a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle +++ b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle @@ -27,3 +27,9 @@ dependencies { } mainClassName = "sample.ServerConfig" + +project.tasks.findByName("prepareAppServerForIntegrationTests")?.configure { task -> + project.tasks.findByName("gemfireServer")?.configure { gemfireServerTask -> + gemfireServerTask.mainClassName = this.mainClassName + } +} diff --git a/samples/xml/gemfire-clientserver/src/main/java/sample/ClientServerReadyBeanPostProcessor.java b/samples/xml/gemfire-clientserver/src/main/java/sample/ClientServerReadyBeanPostProcessor.java index c5b81e2..30d4e69 100644 --- a/samples/xml/gemfire-clientserver/src/main/java/sample/ClientServerReadyBeanPostProcessor.java +++ b/samples/xml/gemfire-clientserver/src/main/java/sample/ClientServerReadyBeanPostProcessor.java @@ -55,7 +55,7 @@ public class ClientServerReadyBeanPostProcessor implements BeanPostProcessor { ); } - @Value("${spring.session.data.geode.cache.server.port:${application.geode.client-server.port:40404}}") + @Value("${spring.data.gemfire.cache.server.port:${application.geode.client-server.port:40404}}") private int port; @Value("${application.geode.client-server.host:localhost}") diff --git a/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml index 30f3cfb..c5298b7 100644 --- a/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml +++ b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml @@ -32,7 +32,7 @@ + port="${spring.data.gemfire.cache.server.port:${application.geode.client-server.port:40404}}"/> - ${spring.session.data.geode.log-level:error} + ${spring.data.gemfire.cache.log-level:error} @@ -30,7 +30,7 @@ + port="${spring.data.gemfire.cache.server.port:${application.geode.client-server.port:40404}}"/> diff --git a/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml b/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml index e75d7f4..760f8c0 100644 --- a/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml +++ b/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml @@ -20,7 +20,7 @@ SpringSessionSampleXmlGemFireP2p - ${spring.session.data.geode.log-level:error} + ${spring.data.gemfire.cache.log-level:error} true true