This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c90d7e7869e61d2d3d6bdf05ec183233753f9d0e
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Tue Jul 3 07:05:02 2018 -0700
GEODE-5363: Moves geode-modules-tomcat8 tests into new source sets.
---
extensions/geode-modules-tomcat8/build.gradle | 24 +++++++++++++++++++++-
.../geode/modules/session/EmbeddedTomcat8.java | 0
.../modules/session/TestSessionsTomcat8Base.java | 0
.../Tomcat8SessionsClientServerDUnitTest.java | 0
.../modules/session/Tomcat8SessionsDUnitTest.java | 0
.../resources/tomcat/conf/tomcat-users.xml | 0
.../resources/tomcat/logs}/.gitkeep | 0
.../resources/tomcat/temp}/.gitkeep | 0
8 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/extensions/geode-modules-tomcat8/build.gradle
b/extensions/geode-modules-tomcat8/build.gradle
index b60e458..f837fc0 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -50,4 +50,26 @@ dependencies {
}
}
-disableMavenPublishing()
\ No newline at end of file
+disableMavenPublishing()
+
+configurations {
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
rename to
extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
diff --git
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
rename to
extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
diff --git
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
rename to
extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
diff --git
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
rename to
extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
diff --git
a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/conf/tomcat-users.xml
b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/conf/tomcat-users.xml
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/resources/tomcat/conf/tomcat-users.xml
rename to
extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/conf/tomcat-users.xml
diff --git
a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/temp/.gitkeep
b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/logs/.gitkeep
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/resources/tomcat/temp/.gitkeep
rename to
extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/logs/.gitkeep
diff --git
a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/logs/.gitkeep
b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/temp/.gitkeep
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/resources/tomcat/logs/.gitkeep
rename to
extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/temp/.gitkeep
