Skip to content

Commit 72ab6a0

Browse files
nebhalenebhale
committed
Remove GemFire
Due to licensing restrictions, the change removes the GemFire Session Replication support for the buildpack. [resolves cloudfoundry#396]
1 parent 56022e0 commit 72ab6a0

31 files changed

Lines changed: 7 additions & 1478 deletions

‎config/tomcat.yml‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
tomcat:
1919
version: 8.0.+
2020
repository_root: "{default.repository.root}/tomcat"
21-
context_path:
21+
context_path:
2222
external_configuration_enabled: false
2323
external_configuration:
2424
version: 1.+
25-
repository_root:
25+
repository_root:
2626
lifecycle_support:
2727
version: 2.+
2828
repository_root: "{default.repository.root}/tomcat-lifecycle-support"
@@ -39,37 +39,3 @@ redis_store:
3939
database: 0
4040
timeout: 2000
4141
connection_pool_size: 2
42-
gemfire_store:
43-
gemfire:
44-
version: 8.+
45-
repository_root: "{default.repository.root}/gem-fire"
46-
gemfire_modules:
47-
version: 8.+
48-
repository_root: "{default.repository.root}/gem-fire-modules"
49-
gemfire_modules_tomcat7:
50-
version: 8.+
51-
repository_root: "{default.repository.root}/gem-fire-modules-tomcat7"
52-
gemfire_security:
53-
version: 8.+
54-
repository_root: "{default.repository.root}/gem-fire-security"
55-
gemfire_logging:
56-
version: 1.7.7
57-
repository_root: "{default.repository.root}/slf4j-jdk14"
58-
gemfire_logging_api:
59-
version: 1.7.7
60-
repository_root: "{default.repository.root}/slf4j-api"
61-
gemfire_log4j_api:
62-
version: 2.1.0
63-
repository_root: "{default.repository.root}/log4j-api"
64-
gemfire_log4j_core:
65-
version: 2.1.0
66-
repository_root: "{default.repository.root}/log4j-core"
67-
gemfire_log4j_jcl:
68-
version: 2.1.0
69-
repository_root: "{default.repository.root}/log4j-jcl"
70-
gemfire_log4j_jul:
71-
version: 2.1.0
72-
repository_root: "{default.repository.root}/log4j-jul"
73-
gemfire_log4j_slf4j_impl:
74-
version: 2.1.0
75-
repository_root: "{default.repository.root}/log4j-slf4j-impl"

‎docs/container-tomcat.md‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@ The container can be configured by modifying the [`config/tomcat.yml`][] file in
2525
| `access_logging_support.repository_root` | The URL of the Tomcat Access Logging Support repository index ([details][repositories]).
2626
| `access_logging_support.version` | The version of Tomcat Access Logging Support to use. Candidate versions can be found in [this listing](http://download.pivotal.io.s3.amazonaws.com/tomcat-access-logging-support/index.yml).
2727
| `access_logging_support.access_logging` | Set to `enabled` to turn on the access logging support. Default is `disabled`.
28-
| `gemfire_store.gemfire.repository_root` | The URL of the GemFire repository index ([details][repositories]).
29-
| `gemfire_store.gemfire.version` | The version of GemFire to use. Candidate versions can be found in [this listing](http://download.pivotal.io.s3.amazonaws.com/gem-fire/index.yml).
30-
| `gemfire_store.gemfire_logging.repository_root` | The URL of the GemFire Logging repository index ([details][repositories]).
31-
| `gemfire_store.gemfire_logging.version` | The version of GemFire Logging to use. Candidate versions can be found in [this listing](http://download.pivotal.io.s3.amazonaws.com/slf4j-jdk14/index.yml).
32-
| `gemfire_store.gemfire_logging_api.repository_root` | The URL of the GemFire Logging API repository index ([details][repositories]).
33-
| `gemfire_store.gemfire_logging_api.version` | The version of GemFire Logging API to use. Candidate versions can be found in [this listing](http://download.pivotal.io.s3.amazonaws.com/slf4j-api/index.yml).
34-
| `gemfire_store.gemfire_modules.repository_root` | The URL of the GemFire Modules repository index ([details][repositories]).
35-
| `gemfire_store.gemfire_modules.version` | The version of GemFire Modules to use. Candidate versions can be found in [this listing](http://download.pivotal.io.s3.amazonaws.com/gem-fire-modules/index.yml).
36-
| `gemfire_store.gemfire_modules_tomcat7.repository_root` | The URL of the GemFire Modules Tomcat 7 repository index ([details][repositories]).
37-
| `gemfire_store.gemfire_modules_tomcat7.version` | The version of GemFire Modules Tomcat 7 to use. Candidate versions can be found in [this listing](http://download.pivotal.io.s3.amazonaws.com/gem-fire-modules-tomcat7/index.yml).
38-
| `gemfire_store.gemfire_security.repository_root` | The URL of the GemFire Security repository index ([details][repositories]).
39-
| `gemfire_store.gemfire_security.version` | The version of GemFire Security to use. Candidate versions can be found in [this listing](http://download.pivotal.io.s3.amazonaws.com/gem-fire-security/index.yml).
4028
| `lifecycle_support.repository_root` | The URL of the Tomcat Lifecycle Support repository index ([details][repositories]).
4129
| `lifecycle_support.version` | The version of Tomcat Lifecycle Support to use. Candidate versions can be found in [this listing](http://download.pivotal.io.s3.amazonaws.com/tomcat-lifecycle-support/index.yml).
4230
| `logging_support.repository_root` | The URL of the Tomcat Logging Support repository index ([details][repositories]).
@@ -103,9 +91,6 @@ By default, the Tomcat instance is configured to store all Sessions and their da
10391
### Redis
10492
To enable Redis-based session replication, simply bind a Redis service containing a name, label, or tag that has `session-replication` as a substring.
10593

106-
### GemFire
107-
To enable GemFire-based session replication, simply bind a [Session State Caching (SSC) GemFire service][] containing a name, label, or tag that has `session_replication` as a substring. GemFire services intended to be used for session replication will automatically have a tag of 'session_replication'.
108-
10994
## Managing Entropy
11095
Entropy from `/dev/random` is used heavily to create session ids, and on startup for initializing `SecureRandom`, which can then cause instances to fail to start in time (see the [Tomcat wiki]). Also, the entropy is shared so it's possible for a single app to starve the DEA of entropy and cause apps in other containers that make use of entropy to be blocked.
11196
If this is an issue then configuring `/dev/urandom` as an alternative source of entropy may help. It is unlikely, but possible, that this may cause some security issues which should be taken in to account.
@@ -121,7 +106,6 @@ Additional supporting functionality can be found in the [`java-buildpack-support
121106

122107
[Configuration and Extension]: ../README.md#configuration-and-extension
123108
[`config/tomcat.yml`]: ../config/tomcat.yml
124-
[Session State Caching (SSC) GemFire service]: https://network.pivotal.io/products/p-ssc-gemfire
125109
[`java-buildpack-support`]: https://github.com/cloudfoundry/java-buildpack-support
126110
[repositories]: extending-repositories.md
127111
[Spring profiles]:http://blog.springsource.com/2011/02/14/spring-3-1-m1-introducing-profile/

‎java-buildpack.iml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,21 +278,21 @@
278278
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v2.0.5, rbenv: 2.2.6) [gem]" level="application" />
279279
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.2.1, rbenv: 2.2.6) [gem]" level="application" />
280280
<orderEntry type="library" scope="PROVIDED" name="rake (v12.0.0, rbenv: 2.2.6) [gem]" level="application" />
281-
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.3.4, rbenv: 2.2.6) [gem]" level="application" />
281+
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.4.0, rbenv: 2.2.6) [gem]" level="application" />
282282
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.5.0, rbenv: 2.2.6) [gem]" level="application" />
283283
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.5.4, rbenv: 2.2.6) [gem]" level="application" />
284284
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.5.0, rbenv: 2.2.6) [gem]" level="application" />
285285
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.5.0, rbenv: 2.2.6) [gem]" level="application" />
286286
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.5.0, rbenv: 2.2.6) [gem]" level="application" />
287-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.42.0, rbenv: 2.2.6) [gem]" level="application" />
288-
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.7.0, rbenv: 2.2.6) [gem]" level="application" />
287+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.47.1, rbenv: 2.2.6) [gem]" level="application" />
288+
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.12.0, rbenv: 2.2.6) [gem]" level="application" />
289289
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.8.1, rbenv: 2.2.6) [gem]" level="application" />
290-
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.0, rbenv: 2.2.6) [gem]" level="application" />
290+
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.1, rbenv: 2.2.6) [gem]" level="application" />
291291
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, rbenv: 2.2.6) [gem]" level="application" />
292292
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 2.2.6) [gem]" level="application" />
293293
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.1.3, rbenv: 2.2.6) [gem]" level="application" />
294294
<orderEntry type="library" scope="PROVIDED" name="webmock (v2.3.2, rbenv: 2.2.6) [gem]" level="application" />
295-
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.5, rbenv: 2.2.6) [gem]" level="application" />
295+
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.8, rbenv: 2.2.6) [gem]" level="application" />
296296
</component>
297297
<component name="RModuleSettingsStorage">
298298
<LOAD_PATH number="4" string0="$MODULE_DIR$/lib" string1="$MODULE_DIR$/spec" string2="$MODULE_DIR$/bin" string3="$MODULE_DIR$/spec/bin" />

‎lib/java_buildpack/container/tomcat.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
require 'java_buildpack/container/tomcat/tomcat_logging_support'
2424
require 'java_buildpack/container/tomcat/tomcat_access_logging_support'
2525
require 'java_buildpack/container/tomcat/tomcat_redis_store'
26-
require 'java_buildpack/container/tomcat/tomcat_gemfire_store'
2726
require 'java_buildpack/util/java_main_utils'
2827

2928
module JavaBuildpack
@@ -56,7 +55,6 @@ def sub_components(context)
5655
TomcatLoggingSupport.new(sub_configuration_context(context, 'logging_support')),
5756
TomcatAccessLoggingSupport.new(sub_configuration_context(context, 'access_logging_support')),
5857
TomcatRedisStore.new(sub_configuration_context(context, 'redis_store')),
59-
TomcatGemfireStore.new(sub_configuration_context(context, 'gemfire_store')),
6058
TomcatInsightSupport.new(context)
6159
]
6260

‎lib/java_buildpack/container/tomcat/gemfire/gemfire.rb‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎lib/java_buildpack/container/tomcat/gemfire/gemfire_log4j_api.rb‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎lib/java_buildpack/container/tomcat/gemfire/gemfire_log4j_core.rb‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎lib/java_buildpack/container/tomcat/gemfire/gemfire_log4j_jcl.rb‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎lib/java_buildpack/container/tomcat/gemfire/gemfire_log4j_jul.rb‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)