Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regex Pattern updated to support both 10.1 and 10.0 Gemfire Tomcat jar file #1063

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Regex Pattern updated to support both 10.1 and 10.0 Gemfire Tomcat jar file #1063

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c09125a
Regex Pattern updated to support gemfire
ainani Mar 12, 2024
3be6c48
Debug print
ainani Mar 12, 2024
aaf05b4
another debug
ainani Mar 12, 2024
26be466
few more debug statements
ainani Mar 12, 2024
3b7a518
Removed debug statements
ainani Mar 12, 2024
ae1ea28
Updated geode-modules to gemfire-session-management
ainani Mar 12, 2024
cf389e3
Reverted the geode-module naming
ainani Mar 13, 2024
e6b9b85
Added session mangement chnage
ainani Mar 13, 2024
f3918a2
reverted code for geode
ainani Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/java_buildpack/container/tomcat/tomcat_geode_store.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ def create_cache_client_xml

def detect_geode_tomcat_version
geode_tomcat_version = nil

geode_modules_tomcat_pattern = /ge.*-modules-tomcat(?<version>[0-9]*).*.jar/.freeze
geode_modules_tomcat_pattern = /ge.*-tomcat(?<version>[0-9]*).*.jar/.freeze
ainani-vmw marked this conversation as resolved.
Show resolved Hide resolved
Dir.foreach(@droplet.sandbox + 'lib') do |file|
if geode_modules_tomcat_pattern.match(file)
unless geode_tomcat_version.nil?
Expand Down
2 changes: 1 addition & 1 deletion spec/java_buildpack/container/tomcat/tomcat_geode_store_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

expect(sandbox + 'lib/stub-jar-1.jar').to exist
expect(sandbox + 'lib/stub-jar-2.jar').to exist
expect(sandbox + 'lib/geode-modules-tomcat9.jar').to exist
expect(sandbox + 'lib/gemfire-session-management-tomcat9.jar').to exist
end

it 'mutates context.xml',
Expand Down