diff --git a/docs/spring-session-docs.gradle b/docs/spring-session-docs.gradle index e0753f19..721df0ee 100644 --- a/docs/spring-session-docs.gradle +++ b/docs/spring-session-docs.gradle @@ -4,6 +4,7 @@ apply plugin: 'io.spring.convention.spring-test' dependencies { testCompile project(':spring-session-core') testCompile project(':spring-session-data-redis') + testCompile project(':spring-session-hazelcast') testCompile "org.springframework:spring-jdbc" testCompile "org.springframework:spring-messaging" testCompile "org.springframework:spring-webmvc" diff --git a/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index 69bb2fbf..58aab6d2 100644 --- a/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle @@ -1,7 +1,7 @@ apply plugin: 'io.spring.convention.spring-sample-war' dependencies { - compile project(':spring-session-core') + compile project(':spring-session-hazelcast') compile "org.springframework:spring-web" compile "org.springframework.security:spring-security-config" compile "org.springframework.security:spring-security-web" diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle index 6516cbd0..e413144e 100644 --- a/spring-session-core/spring-session-core.gradle +++ b/spring-session-core/spring-session-core.gradle @@ -12,14 +12,12 @@ dependencies { optional "org.springframework:spring-websocket" optional "org.springframework.security:spring-security-core" optional "org.springframework.security:spring-security-web" - optional "com.hazelcast:hazelcast" provided "javax.servlet:javax.servlet-api" integrationTestCompile "org.apache.commons:commons-pool2" integrationTestCompile "org.apache.derby:derby" integrationTestCompile "com.h2database:h2" - integrationTestCompile "com.hazelcast:hazelcast-client" integrationTestCompile "org.hsqldb:hsqldb" testCompile "junit:junit" diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle index 6b30fb0a..c9acbfdc 100644 --- a/spring-session-hazelcast/spring-session-hazelcast.gradle +++ b/spring-session-hazelcast/spring-session-hazelcast.gradle @@ -1,6 +1,13 @@ -apply plugin: 'io.spring.convention.spring-pom' +apply plugin: 'io.spring.convention.spring-module' dependencies { compile project(':spring-session-core') compile "com.hazelcast:hazelcast" + compile "org.springframework:spring-context" + + testCompile "javax.servlet:javax.servlet-api" + testCompile "org.springframework.security:spring-security-core" + testCompile "org.springframework:spring-web" + + integrationTestCompile "com.hazelcast:hazelcast-client" } \ No newline at end of file diff --git a/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java similarity index 100% rename from spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java rename to spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java diff --git a/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java similarity index 100% rename from spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java rename to spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java diff --git a/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java similarity index 100% rename from spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java rename to spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java diff --git a/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java similarity index 100% rename from spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java rename to spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java diff --git a/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java similarity index 100% rename from spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java rename to spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java diff --git a/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java similarity index 100% rename from spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java rename to spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java diff --git a/spring-session/src/main/java/org/springframework/session/hazelcast/HazelcastFlushMode.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastFlushMode.java similarity index 100% rename from spring-session/src/main/java/org/springframework/session/hazelcast/HazelcastFlushMode.java rename to spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastFlushMode.java diff --git a/spring-session/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java similarity index 100% rename from spring-session/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java rename to spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java diff --git a/spring-session/src/main/java/org/springframework/session/hazelcast/PrincipalNameExtractor.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/PrincipalNameExtractor.java similarity index 100% rename from spring-session/src/main/java/org/springframework/session/hazelcast/PrincipalNameExtractor.java rename to spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/PrincipalNameExtractor.java diff --git a/spring-session/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSession.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSession.java similarity index 100% rename from spring-session/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSession.java rename to spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSession.java diff --git a/spring-session/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java similarity index 100% rename from spring-session/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java rename to spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java diff --git a/spring-session/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java b/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java similarity index 100% rename from spring-session/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java rename to spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java diff --git a/spring-session/src/test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationTests.java b/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationTests.java similarity index 100% rename from spring-session/src/test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationTests.java rename to spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationTests.java diff --git a/spring-session/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml b/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml similarity index 100% rename from spring-session/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml rename to spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml diff --git a/spring-session/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml b/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml similarity index 100% rename from spring-session/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml rename to spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml