You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/04/06 23:24:39 UTC
[geode] branch develop updated: Revert "GEODE-4999: Added explicit
tomcat 8.5 directory for tcserver support (#1737)"
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new f6f58d3 Revert "GEODE-4999: Added explicit tomcat 8.5 directory for tcserver support (#1737)"
f6f58d3 is described below
commit f6f58d389492b1cdabde1d2442dc3067278cda3b
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Fri Apr 6 16:24:13 2018 -0700
Revert "GEODE-4999: Added explicit tomcat 8.5 directory for tcserver support (#1737)"
This reverts commit 2d45dad835d70e731ecc8053f75184f0dd0a9265.
---
extensions/geode-modules-assembly/build.gradle | 19 ++-----------------
.../tcserver/geode-cs-tomcat-85/context-fragment.xml | 15 ---------------
.../tcserver/geode-p2p-tomcat-85/context-fragment.xml | 15 ---------------
settings.gradle | 1 -
4 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle
index c320f21..59398ce 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -54,7 +54,6 @@ def configureTcServerAssembly = {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
- from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('geode-cs/bin') {
@@ -88,7 +87,6 @@ def configureTcServerAssembly = {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
- from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('geode-p2p/bin') {
@@ -130,23 +128,11 @@ def configureTcServer30Assembly = {
}
}
- into('geode-cs-tomcat-85/conf') {
- from('release/tcserver/geode-cs-tomcat-85') {
- include 'context-fragment.xml'
- }
- }
-
into('geode-p2p-tomcat-8/conf') {
from('release/tcserver/geode-p2p-tomcat-8') {
include 'context-fragment.xml'
}
}
-
- into('geode-p2p-tomcat-85/conf') {
- from('release/tcserver/geode-p2p-tomcat-85') {
- include 'context-fragment.xml'
- }
- }
}
task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') {
@@ -158,7 +144,6 @@ task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
- from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('bin') {
@@ -207,11 +192,11 @@ task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:asse
}
}
-task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble', ':extensions/geode-modules-tomcat7:assemble', ':extensions/geode-modules-tomcat8:assemble', ':extensions/geode-modules-tomcat85:assemble'] ) {
+task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble', ':extensions/geode-modules-tomcat7:assemble', ':extensions/geode-modules-tomcat8:assemble'] ) {
configure(configureTcServerAssembly)
}
-task distTcServer30(type: Zip, dependsOn: [':extensions/geode-modules:assemble', ':extensions/geode-modules-tomcat7:assemble', ':extensions/geode-modules-tomcat8:assemble', ':extensions/geode-modules-tomcat85:assemble']) {
+task distTcServer30(type: Zip, dependsOn: [':extensions/geode-modules:assemble', ':extensions/geode-modules-tomcat7:assemble', ':extensions/geode-modules-tomcat8:assemble']) {
configure(configureTcServerAssembly)
configure(configureTcServer30Assembly)
}
diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml
deleted file mode 100644
index c8ff83d..0000000
--- a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context>
-
- <remove:Manager className="org.apache.geode.modules.session.catalina.Tomcat6DeltaSessionManager"/>
-
- <add:Manager className="org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager"
- enableDebugListener="${enable.debug.listener:false}"
- enableGatewayReplication="${enable.gateway.replication:false}"
- enableLocalCache="${enable.local.cache:true}"
- enableCommitValve="${enable.commit.valve:true}"
- preferDeserializedForm="${prefer.deserialized.form:true}"
- regionAttributesId="${region.attributes.id:PARTITION_REDUNDANT}"
- regionName="${region.name:gemfire_modules_sessions}"/>
-
-</Context>
diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml
deleted file mode 100644
index 48bfcbb..0000000
--- a/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context>
-
- <remove:Manager className="org.apache.geode.modules.session.catalina.Tomcat6DeltaSessionManager"/>
-
- <add:Manager className="org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager"
- enableDebugListener="${enable.debug.listener:false}"
- enableGatewayReplication="${enable.gateway.replication:false}"
- enableLocalCache="${enable.local.cache:false}"
- enableCommitValve="${enable.commit.valve:true}"
- preferDeserializedForm="${prefer.deserialized.form:true}"
- regionAttributesId="${region.attributes.id:REPLICATE}"
- regionName="${region.name:gemfire_modules_sessions}"/>
-
-</Context>
diff --git a/settings.gradle b/settings.gradle
index 3c03aca..74c1811 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -34,7 +34,6 @@ include 'geode-connectors'
include 'extensions/geode-modules'
include 'extensions/geode-modules-tomcat7'
include 'extensions/geode-modules-tomcat8'
-include 'extensions/geode-modules-tomcat85'
include 'extensions/geode-modules-session-internal'
include 'extensions/geode-modules-session'
include 'extensions/geode-modules-assembly'
--
To stop receiving notification emails like this one, please contact
nnag@apache.org.