Repository: incubator-geode Updated Branches: refs/heads/develop d1a0748ba -> d216e5533
GEODE-1293: Updating module scripts and structure - Remove cacheserver.sh and gemfire.sh scripts in favor of using gfsh - Adjust p2p config to always use locators - Have modify_war reference correct jars Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d216e553 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d216e553 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d216e553 Branch: refs/heads/develop Commit: d216e55330e794137cee2684d05eaef683ff00f8 Parents: d1a0748 Author: Jens Deppe <jde...@pivotal.io> Authored: Tue Mar 29 12:46:22 2016 -0700 Committer: Jens Deppe <jde...@pivotal.io> Committed: Fri May 13 11:16:16 2016 -0700 ---------------------------------------------------------------------- extensions/geode-modules-assembly/build.gradle | 53 ++------ .../release/conf/cache-client.xml | 14 +- .../release/conf/cache-server.xml | 6 +- .../release/scripts/cacheserver.bat | 133 ------------------- .../release/scripts/cacheserver.sh | 97 -------------- .../release/scripts/gemfire.bat | 41 ------ .../release/scripts/gemfire.sh | 58 -------- .../release/scripts/setenv.properties | 1 + .../release/session/bin/cacheserver.bat | 56 -------- .../release/session/bin/cacheserver.sh | 57 -------- .../release/session/bin/gemfire.bat | 53 -------- .../release/session/bin/gemfire.sh | 69 ---------- .../release/session/bin/modify_war | 91 +++++++------ .../release/session/bin/setenv.properties | 6 - .../gemfire-cs-tomcat-7/context-fragment.xml | 15 --- .../tcserver/gemfire-cs-tomcat-7/modules.env | 1 - .../gemfire-cs-tomcat-8/context-fragment.xml | 15 --- .../tcserver/gemfire-cs-tomcat-8/modules.env | 1 - .../gemfire-cs/configuration-prompts.properties | 17 --- .../tcserver/gemfire-cs/context-fragment.xml | 13 -- .../release/tcserver/gemfire-cs/modules.env | 1 - .../tcserver/gemfire-cs/server-fragment.xml | 12 -- .../gemfire-p2p-tomcat-7/context-fragment.xml | 15 --- .../tcserver/gemfire-p2p-tomcat-7/modules.env | 1 - .../gemfire-p2p-tomcat-8/context-fragment.xml | 15 --- .../tcserver/gemfire-p2p-tomcat-8/modules.env | 1 - .../configuration-prompts.properties | 19 --- .../tcserver/gemfire-p2p/context-fragment.xml | 13 -- .../release/tcserver/gemfire-p2p/modules.env | 1 - .../tcserver/gemfire-p2p/server-fragment.xml | 14 -- .../geode-cs-tomcat-7/context-fragment.xml | 15 +++ .../geode-cs-tomcat-8/context-fragment.xml | 15 +++ .../geode-cs/configuration-prompts.properties | 17 +++ .../tcserver/geode-cs/context-fragment.xml | 13 ++ .../tcserver/geode-cs/server-fragment.xml | 12 ++ .../geode-p2p-tomcat-7/context-fragment.xml | 15 +++ .../geode-p2p-tomcat-8/context-fragment.xml | 15 +++ .../geode-p2p/configuration-prompts.properties | 19 +++ .../tcserver/geode-p2p/context-fragment.xml | 13 ++ .../tcserver/geode-p2p/server-fragment.xml | 14 ++ extensions/geode-modules-session/build.gradle | 3 +- .../gemstone/gemfire/modules/util/Banner.java | 20 +-- geode-core/build.gradle | 2 +- gradle/dependency-versions.properties | 1 + 44 files changed, 225 insertions(+), 838 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle index 960d924..8109466 100644 --- a/extensions/geode-modules-assembly/build.gradle +++ b/extensions/geode-modules-assembly/build.gradle @@ -19,15 +19,12 @@ import org.apache.tools.ant.filters.ReplaceTokens configurations { slf4jDeps - servletApiDeps moduleDistOutputs } dependencies { slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version' slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version' - - servletApiDeps 'javax.servlet:servlet-api:2.5' } jar.enabled = false @@ -42,7 +39,7 @@ disableSigning() def getJarArtifact(module) { project(module).configurations.archives.artifacts.findAll { - it instanceof PublishArtifact && it.classifier == '' && it.type == 'jar' + it instanceof PublishArtifact && it.type == 'jar' && it.classifier == '' }.collect { it.file } } @@ -59,10 +56,6 @@ def configureTcServerAssembly = { from('release/scripts') { include '*' } - from('release/tcserver/geode-cs') { - include 'modules.env' - } - filter(ReplaceTokens, tokens:['GEMFIRE_MODULES_VERSION': version]) } into('geode-cs/conf') { from('release/conf') { @@ -76,8 +69,6 @@ def configureTcServerAssembly = { into('geode-cs') { from('release/tcserver/geode-cs') { include 'configuration-prompts.properties' - include 'README.txt' - filter(ReplaceTokens, tokens:['VERSION': version]) } } @@ -87,11 +78,6 @@ def configureTcServerAssembly = { include 'context-fragment.xml' } } - into('geode-cs-tomcat-7/bin') { - from('release/tcserver/geode-cs-tomcat-7') { - include 'modules.env' - } - } // All peer-to-peer files into('geode-p2p/lib') { from getJarArtifact(':extensions/geode-modules') @@ -106,9 +92,6 @@ def configureTcServerAssembly = { include 'gemfire.*' include 'setenv.properties' } - from('release/tcserver/geode-p2p') { - include 'modules.env' - } } into('geode-p2p/conf') { from('release/conf') { @@ -122,8 +105,6 @@ def configureTcServerAssembly = { into('geode-p2p') { from('release/tcserver/geode-p2p') { include 'configuration-prompts.properties' - include 'README.txt' - filter(ReplaceTokens, tokens:['VERSION': version]) } } @@ -133,32 +114,17 @@ def configureTcServerAssembly = { include 'context-fragment.xml' } } - into('geode-p2p-tomcat-7/bin') { - from('release/tcserver/geode-p2p-tomcat-7') { - include 'modules.env' - } - } } def configureTcServer30Assembly = { archiveName = "Apache_Geode_Modules-${version}-tcServer30.zip" - into('geode-cs-tomcat-8/bin') { - from('release/tcserver/geode-cs-tomcat-8') { - include 'modules.env' - } - } into('geode-cs-tomcat-8/conf') { from('release/tcserver/geode-cs-tomcat-8') { include 'context-fragment.xml' } } - into('geode-p2p-tomcat-8/bin') { - from('release/tcserver/geode-p2p-tomcat-8') { - include 'modules.env' - } - } into('geode-p2p-tomcat-8/conf') { from('release/tcserver/geode-p2p-tomcat-8') { include 'context-fragment.xml' @@ -201,23 +167,24 @@ task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:asse archiveName = "Apache_Geode_Modules-${version}-AppServer.zip" into('lib') { + // Use a closure here so that the evaluation is deferred. Without this the 'internal' + // jar won't be picked up. + from { getJarArtifact(':extensions/geode-modules-session') } from getJarArtifact(':extensions/geode-modules') - from getJarArtifact(':extensions/geode-modules-session') from configurations.slf4jDeps - from configurations.servletApiDeps } into('bin') { from('release/session/bin/') { - include 'setenv.properties' include 'modify_war' - include 'cacheserver.*' - include 'gemfire.*' - filter(ReplaceTokens, tokens:['GEMFIRE_MODULES_VERSION': version]) + filter(ReplaceTokens, tokens:['GEODE_VERSION': version]) filter(ReplaceTokens, tokens:['SLF4J_VERSION': project.'slf4j-api.version']) - filter(ReplaceTokens, tokens:['SERVLET_API_VERSION': project.'javax.servlet-api.version']) - filter(ReplaceTokens, tokens:['GEMFIRE_VERSION': version]) + filter(ReplaceTokens, tokens:['LOG4J_VERSION': project.'log4j.version']) + filter(ReplaceTokens, tokens:['FASTUTIL_VERSION': project.'fastutil.version']) + filter(ReplaceTokens, tokens:['ANTLR_VERSION': project.'antlr.version']) + filter(ReplaceTokens, tokens:['TX_VERSION': project.'javax.transaction-api.version']) + filter(ReplaceTokens, tokens:['JGROUPS_VERSION': project.'jgroups.version']) } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/conf/cache-client.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/conf/cache-client.xml b/extensions/geode-modules-assembly/release/conf/cache-client.xml index c36e0ef..297b6a6 100755 --- a/extensions/geode-modules-assembly/release/conf/cache-client.xml +++ b/extensions/geode-modules-assembly/release/conf/cache-client.xml @@ -21,19 +21,19 @@ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"; version="1.0"> - <!-- The default pool connects to a cache server running on localhost at - port 40404. To connect to a different server host and port, modify - the following pool server host and port. --> + <!-- The default pool connects to a locator running on localhost at + port 10334. To connect to a different locator host and port, modify + the following pool locator host and port. --> <pool name="sessions" subscription-enabled="true"> - <server host="localhost" port="40404"/> + <locator host="localhost" port="10334"/> </pool> - <!-- To configure the client to use a locator instead of a server, replace - the server pool above with the locator pool below and modify the locator + <!-- To configure the client to use a server instead of a locator, replace + the locator pool above with the server pool below and modify the server host and port as necessary. --> <!-- <pool name="sessions" subscription-enabled="true"> - <locator host="localhost" port="10334"/> + <server host="localhost" port="40404"/> </pool> --> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/conf/cache-server.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/conf/cache-server.xml b/extensions/geode-modules-assembly/release/conf/cache-server.xml index 9dad75f..67ccbd1 100755 --- a/extensions/geode-modules-assembly/release/conf/cache-server.xml +++ b/extensions/geode-modules-assembly/release/conf/cache-server.xml @@ -31,10 +31,8 @@ </gateway-hub> --> - <!-- Uncomment the following cache-server element to modify the listen port --> - <!-- - <cache-server port="44444"/> - --> + <!-- Change the following cache-server element to modify the listening port --> + <cache-server port="0"/> <!-- Uncomment the following disk-store element to modify the default disk store directory --> <!-- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/scripts/cacheserver.bat ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/scripts/cacheserver.bat b/extensions/geode-modules-assembly/release/scripts/cacheserver.bat deleted file mode 100755 index ef7f99f..0000000 --- a/extensions/geode-modules-assembly/release/scripts/cacheserver.bat +++ /dev/null @@ -1,133 +0,0 @@ -@echo off -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -setlocal -setlocal enableextensions -setlocal enabledelayedexpansion -set scriptdir=%~dp0 -set gf=%scriptdir:\bin\=% -if exist "%gf%\lib\gemfire.jar" @goto gfok -echo Could not determine GEMFIRE location -rem verify other 2>nul -goto done -:gfok - -if exist "%gf%\bin\modules.env" ( - FOR /F "tokens=*" %%i in ('type %gf%\bin\modules.env') do SET %%i -) - -rem Check for the -d argument -set /a FOUND_ARG=0 -set TC_INSTALL_DIR= -FOR %%A IN (%*) DO ( - if !FOUND_ARG! == 1 ( - set /a FOUND_ARG-=1 - set TC_INSTALL_DIR=%%~fA - ) - if %%A == -d ( - set /a FOUND_ARG+=1 - ) -) - -rem Pull out the unused args for the java class -set CLASS_ARGS= -:loop -IF "%1"=="" GOTO ENDLOOP - if "%1" == "-d" ( - shift - shift - ) else ( - set "CLASS_ARGS=!CLASS_ARGS! %1" - shift - ) -GOTO loop - -:ENDLOOP - -IF NOT "%TC_INSTALL_DIR%" == "" goto SET_TOMCAT_DIR -FOR /f %%f in ('forfiles /P %gf%\.. /m tomcat-%TOMCAT_MAJOR_VER%* /c "cmd /c echo @path"') do set TOMCAT_DIR=%%f -REM Strip the surrounding quotes -set TOMCAT_DIR=%TOMCAT_DIR:"=% -goto TEST_TOMCAT_DIR - -:SET_TOMCAT_DIR -set /p TOMCAT_VER=<"%gf%\conf\tomcat.version" -set TOMCAT_DIR="!TC_INSTALL_DIR!\tomcat-!TOMCAT_VER!" - -:TEST_TOMCAT_DIR -if not exist "!TOMCAT_DIR!\lib\catalina.jar" goto TOMCAT_NOT_FOUND -goto FIND_MOD_JAR - -:FIND_MOD_JAR -FOR %%f in (!gf!\lib\geode-modules-?.*.jar) do set MOD_JAR=%%f -IF NOT "%MOD_JAR%" == "" goto FIND_LOG_API -rem This is the default modules jar -set MOD_JAR="!gf!\lib\geode-modules.jar" - -:FIND_LOG_API -FOR %%f in (!gf!\lib\log4j-api*.jar) do set LOG_API_JAR=%%f -IF NOT "%LOG_API_JAR%" == "" goto FIND_LOG_CORE -echo ERROR: Log4J API jar not found. -goto LIBS_NOT_FOUND - -:FIND_LOG_CORE -FOR %%f in (!gf!\lib\log4j-core*.jar) do set LOG_CORE_JAR=%%f -IF NOT "%LOG_CORE_JAR%" == "" goto MAIN_PROCESSING -echo ERROR: Log4J Core jar not found. -goto LIBS_NOT_FOUND - - -:LIBS_NOT_FOUND -echo ERROR: The required libraries could not be located. -echo Try using the -d ^<tc Server installation directory^> option or make sure it was installed correctly. -echo Example: cacheserver.bat start -d "c:\Program Files\Pivotal\tcServer\pivotal-tc-server-standard" -exit /b 1 - -:TOMCAT_NOT_FOUND -echo ERROR: The TOMCAT libraries could not be located. -echo Try using the -d ^<tc Server installation directory^> option or make sure it was installed correctly. -echo Example: cacheserver.bat start -d "c:\Program Files\Pivotal\tcServer\pivotal-tc-server-standard" -exit /b 1 - -:MAIN_PROCESSING -REM Initialize classpath - -REM Add GemFire classes -set GEMFIRE_JARS=%MOD_JAR%;%LOG_API_JAR%;%LOG_CORE_JAR%;%gf%/lib/gemfire.jar;%gf%/lib/antlr.jar;%gf%/lib/mail.jar - -REM Add Tomcat classes -set GEMFIRE_JARS=%GEMFIRE_JARS%;%TOMCAT_DIR%/lib/servlet-api.jar;%TOMCAT_DIR%/lib/catalina.jar;%gf%/lib/geode-modules.jar;%TOMCAT_DIR%/bin/tomcat-juli.jar;%TOMCAT_DIR%/lib/tomcat-util.jar - -REM Add conf directory -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%/conf - - -if defined CLASSPATH set GEMFIRE_JARS=%GEMFIRE_JARS%;%CLASSPATH% - -if not defined GF_JAVA ( - REM %GF_JAVA% is not defined, assume it is on the PATH - set GF_JAVA=java -) - -"%GF_JAVA%" %JAVA_ARGS% -classpath "%GEMFIRE_JARS%" com.gemstone.gemfire.internal.cache.CacheServerLauncher !CLASS_ARGS! -:done -set scriptdir= -set gf= -set GEMFIRE_JARS= - -endlocal http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/scripts/cacheserver.sh ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/scripts/cacheserver.sh b/extensions/geode-modules-assembly/release/scripts/cacheserver.sh deleted file mode 100755 index 28edc35..0000000 --- a/extensions/geode-modules-assembly/release/scripts/cacheserver.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Set GEMFIRE to the product toplevel directory -GEMFIRE=`dirname $0` -OLDPWD=$PWD -cd $GEMFIRE -GEMFIRE=`dirname $PWD` -cd $OLDPWD - -TOMCAT_VER=`cat "${GEMFIRE}/conf/tomcat.version"` - -if [ -f $GEMFIRE/bin/modules.env ]; then - # Pull in TOMCAT_MAJOR_VER - . $GEMFIRE/bin/modules.env -fi - -# Pull out the installation directory arguments passed in -ARGS=( "$@" ) -ARGS_LENGTH=${#ARGS[@]} -CLASS_ARGS=() -for (( i=0; i<$ARGS_LENGTH; i++ )); -do - if [ "${ARGS[$i]}" == "-d" ]; then - i=$(($i+1)) - else - CLASS_ARGS="${CLASS_ARGS} ${ARGS[$i]}" - fi -done -# End pulling out arguments - -# See if the user specified the tomcat installation directory location -while [ $# -gt 0 ]; do - case $1 in - -d ) - TC_INSTALL_DIR="$2" - break - ;; - esac - shift -done - - -if [[ -n $TC_INSTALL_DIR && -d $TC_INSTALL_DIR ]]; then - TOMCAT_DIR="$TC_INSTALL_DIR/tomcat-${TOMCAT_VER}" -else - TOMCAT_DIR=`ls -d "${GEMFIRE}"/../tomcat-${TOMCAT_MAJOR_VER}* 2> /dev/null` -fi - -if [[ -z "$TOMCAT_DIR" || ! -f "$TOMCAT_DIR/lib/catalina.jar" ]]; then - echo "ERROR: Could not determine TOMCAT library location." - echo " Use the -d <tc Server installation directory> option." - echo " Example: ./cacheserver.sh start -d /opt/pivotal/tcserver/pivotal-tc-server-standard" - exit 1 -fi - -if [ "x$WINDIR" != "x" ]; then - echo "ERROR: The variable WINDIR is set indicating this script is running in a Windows OS, please use the .bat file version instead." - exit 1 -fi - -GEMFIRE_DEP_JAR=$GEMFIRE/lib/geode-dependencies.jar -if [ ! -f "$GEMFIRE_DEP_JAR" ]; then - echo "ERROR: Could not determine GEMFIRE location." - exit 1 -fi - -MOD_JAR=`ls $GEMFIRE/lib/geode-modules-?.*.jar` 2>/dev/null -if [ -z "$MOD_JAR" ]; then - MOD_JAR=$GEMFIRE/lib/geode-modules.jar -fi - -# Add Tomcat classes -GEMFIRE_JARS=$GEMFIRE_DEP_JAR:$MOD_JAR:$TOMCAT_DIR/lib/servlet-api.jar:$TOMCAT_DIR/lib/catalina.jar:$TOMCAT_DIR/lib/tomcat-util.jar:$TOMCAT_DIR/bin/tomcat-juli.jar - -# Add configuration -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/conf - -if [ "x$CLASSPATH" != "x" ]; then - GEMFIRE_JARS=$GEMFIRE_JARS:$CLASSPATH -fi - -${GF_JAVA:-java} ${JAVA_ARGS} -classpath ${GEMFIRE_JARS} com.gemstone.gemfire.internal.cache.CacheServerLauncher ${CLASS_ARGS} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/scripts/gemfire.bat ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/scripts/gemfire.bat b/extensions/geode-modules-assembly/release/scripts/gemfire.bat deleted file mode 100755 index 6102b88..0000000 --- a/extensions/geode-modules-assembly/release/scripts/gemfire.bat +++ /dev/null @@ -1,41 +0,0 @@ -@echo off -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -@setlocal enableextensions -@set scriptdir=%~dp0 -@set gf=%scriptdir:\bin\=% -@if exist "%gf%\lib\gemfire.jar" @goto gfok -@echo Could not determine GEMFIRE location -@verify other 2>nul -@goto done -:gfok - -@set GEMFIRE_JARS=%gf%/lib/gemfire.jar;%gf%/lib/antlr.jar;%gf%/lib/mail.jar -@if defined CLASSPATH set GEMFIRE_JARS=%GEMFIRE_JARS%;%CLASSPATH% - -@if not defined GF_JAVA ( -@REM %GF_JAVA% is not defined, assume it is on the PATH -@set GF_JAVA=java -) - -@"%GF_JAVA%" %JAVA_ARGS% -classpath "%GEMFIRE_JARS%" com.gemstone.gemfire.internal.SystemAdmin %* -:done -@set scriptdir= -@set gf= -@set GEMFIRE_JARS= - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/scripts/gemfire.sh ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/scripts/gemfire.sh b/extensions/geode-modules-assembly/release/scripts/gemfire.sh deleted file mode 100755 index 12956cc..0000000 --- a/extensions/geode-modules-assembly/release/scripts/gemfire.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Set GEMFIRE to the product toplevel directory -GEMFIRE=`dirname $0` -OLDPWD=$PWD -cd $GEMFIRE -GEMFIRE=`dirname $PWD` -cd $OLDPWD - -if [ "x$WINDIR" != "x" ]; then - echo "ERROR: The variable WINDIR is set indicating this script is running in a Windows OS, please use the .bat file version instead." - exit 1 -fi - -GEMFIRE_DEP_JAR=$GEMFIRE/lib/geode-dependencies.jar -if [ ! -f "$GEMFIRE_DEP_JAR" ]; then - echo "ERROR: Could not determine GEMFIRE location." - exit 1 -fi - -GEMFIRE_JARS=$GEMFIRE_DEP_JAR - -if [ "x$CLASSPATH" != "x" ]; then - GEMFIRE_JARS=$GEMFIRE_JARS:$CLASSPATH -fi - -# Command line args that start with -J will be passed to the java vm in JARGS. -# See java --help for a listing of valid vm args. -# Example: -J-Xmx1g sets the max heap size to 1 gigabyte. - -JARGS= -GEMFIRE_ARGS= -for i in "$@" -do - if [ "-J" == "${i:0:2}" ] - then - JARGS="${JARGS} \"${i#-J}\"" - else - GEMFIRE_ARGS="${GEMFIRE_ARGS} \"${i}\"" - fi -done - -eval ${GF_JAVA:-java} ${JAVA_ARGS} ${JARGS} -classpath ${GEMFIRE_JARS} com.gemstone.gemfire.internal.SystemAdmin ${GEMFIRE_ARGS} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/scripts/setenv.properties ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/scripts/setenv.properties b/extensions/geode-modules-assembly/release/scripts/setenv.properties index fc8918b..a32aac4 100644 --- a/extensions/geode-modules-assembly/release/scripts/setenv.properties +++ b/extensions/geode-modules-assembly/release/scripts/setenv.properties @@ -3,4 +3,5 @@ java.opt.2=-Xmx${maximum.vm.heap.size.mb:512}M java.opt.hotspot.1=-XX:+UseParNewGC java.opt.hotspot.2=-XX:+UseConcMarkSweepGC java.opt.hotspot.3=-XX:CMSInitiatingOccupancyFraction=${cms.initiating.heap.percentage:50} +java.opt.hotspot.4=-Dgemfire.disableShutdownHook=true java.opt.j9.1=-Xgcpolicy:gencon \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/session/bin/cacheserver.bat ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/session/bin/cacheserver.bat b/extensions/geode-modules-assembly/release/session/bin/cacheserver.bat deleted file mode 100755 index 2935cde..0000000 --- a/extensions/geode-modules-assembly/release/session/bin/cacheserver.bat +++ /dev/null @@ -1,56 +0,0 @@ -@echo off -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -setlocal enableextensions -set scriptdir=%~dp0 -set gf=%scriptdir:\bin\=% - -set GEMFIRE_JARS=%gf%\lib\gemfire.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\antlr.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\spring-core-3.1.1.RELEASE.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\spring-shell-1.0.0.RC1.jar -if exist "%GEMFIRE_JARS%" goto gfok -echo Could not determine GEMFIRE location -verify other 2>nul -goto done -:gfok - -REM Initialize classpath -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-@GEMFIRE_MODULES_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-session-@GEMFIRE_MODULES_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-session-external-@GEMFIRE_MODULES_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\servlet-api-@SERVLET_API_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\slf4j-api-@SLF4J_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\slf4j-jdk14-@SLF4J_VERSION@.jar - -REM Add conf directory -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\conf - -if defined CLASSPATH set GEMFIRE_JARS=%GEMFIRE_JARS%;%CLASSPATH% - -if not defined GF_JAVA ( -REM %GF_JAVA% is not defined, assume it is on the PATH -set GF_JAVA=java -) - -"%GF_JAVA%" %JAVA_ARGS% -classpath "%GEMFIRE_JARS%" com.gemstone.gemfire.internal.cache.CacheServerLauncher %* -:done -set scriptdir= -set gf= -set GEMFIRE_JARS= - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/session/bin/cacheserver.sh ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/session/bin/cacheserver.sh b/extensions/geode-modules-assembly/release/session/bin/cacheserver.sh deleted file mode 100755 index 2c12b57..0000000 --- a/extensions/geode-modules-assembly/release/session/bin/cacheserver.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Set GEMFIRE to the product toplevel directory -GEMFIRE=`dirname $0` -OLDPWD=$PWD -cd $GEMFIRE -GEMFIRE=`dirname $PWD` -cd $OLDPWD - -if [ "x$WINDIR" != "x" ]; then - echo "ERROR: The variable WINDIR is set indicating this script is running in a Windows OS, please use the .bat file version instead." - exit 1 -fi - -GEMFIRE_JARS=$GEMFIRE/lib/gemfire.jar - -if [ ! -f "${GEMFIRE_JARS}" ]; then - echo "ERROR: Could not determine GEMFIRE location." - exit 1 -fi - -LOG4J_API=$( ls $GEMFIRE/lib/log4j-api*jar ) -LOG4J_CORE=$( ls $GEMFIRE/lib/log4j-core*jar ) - -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/antlr.jar:$LOG4J_API:$LOG4J_CORE - -# Initialize classpath -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-@GEMFIRE_MODULES_VERSION@.jar \ -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-session-@GEMFIRE_MODULES_VERSION@.jar \ -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/servlet-api-@SERVLET_API_VERSION@.jar \ -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-session-external-@GEMFIRE_MODULES_VERSION@.jar \ -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/slf4j-api-@SLF4J_VERSION@.jar \ -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/slf4j-jdk14-@SLF4J_VERSION@.jar - -# Add configuration -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/conf - -if [ "x$CLASSPATH" != "x" ]; then - GEMFIRE_JARS=$GEMFIRE_JARS:$CLASSPATH -fi - -${GF_JAVA:-java} ${JAVA_ARGS} -classpath ${GEMFIRE_JARS} com.gemstone.gemfire.internal.cache.CacheServerLauncher "$@" http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/session/bin/gemfire.bat ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/session/bin/gemfire.bat b/extensions/geode-modules-assembly/release/session/bin/gemfire.bat deleted file mode 100755 index a66964c..0000000 --- a/extensions/geode-modules-assembly/release/session/bin/gemfire.bat +++ /dev/null @@ -1,53 +0,0 @@ -@echo off -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -setlocal enableextensions -set scriptdir=%~dp0 -set gf=%scriptdir:\bin\=% - -set GEMFIRE_JARS=%gf%\lib\gemfire.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\antlr.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\spring-core-3.1.1.RELEASE.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\spring-shell-1.0.0.RC1.jar -if exist "%GEMFIRE_JARS%" goto gfok -echo Could not determine GEMFIRE location -verify other 2>nul -goto done -:gfok - -REM Initialize classpath -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-@GEMFIRE_MODULES_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-session-@GEMFIRE_MODULES_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-session-external-@GEMFIRE_MODULES_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\servlet-api-@SERVLET_API_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\slf4j-api-@SLF4J_VERSION@.jar -set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\slf4j-jdk14-@SLF4J_VERSION@.jar - -if defined CLASSPATH set GEMFIRE_JARS=%GEMFIRE_JARS%;%CLASSPATH% - -if not defined GF_JAVA ( -REM %GF_JAVA% is not defined, assume it is on the PATH -set GF_JAVA=java -) - -"%GF_JAVA%" %JAVA_ARGS% -classpath "%GEMFIRE_JARS%" com.gemstone.gemfire.internal.SystemAdmin %* -:done -set scriptdir= -set gf= -set GEMFIRE_JARS= - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/session/bin/gemfire.sh ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/session/bin/gemfire.sh b/extensions/geode-modules-assembly/release/session/bin/gemfire.sh deleted file mode 100755 index ac11a4d..0000000 --- a/extensions/geode-modules-assembly/release/session/bin/gemfire.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Set GEMFIRE to the product toplevel directory -GEMFIRE=`dirname $0` -OLDPWD=$PWD -cd $GEMFIRE -GEMFIRE=`dirname $PWD` -cd $OLDPWD - -if [ "x$WINDIR" != "x" ]; then - echo "ERROR: The variable WINDIR is set indicating this script is running in a Windows OS, please use the .bat file version instead." - exit 1 -fi - -GEMFIRE_JARS=$GEMFIRE/lib/gemfire.jar -if [ ! -f "${GEMFIRE_JARS}" ]; then - echo "ERROR: Could not determine GEMFIRE location." - exit 1 -fi - -LOG4J_API=$( ls $GEMFIRE/lib/log4j-api*jar ) -LOG4J_CORE=$( ls $GEMFIRE/lib/log4j-core*jar ) - -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/antlr.jar:$LOG4J_API:$LOG4J_CORE - -# Initialize classpath -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-@GEMFIRE_MODULES_VERSION@.jar -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-session-@GEMFIRE_MODULES_VERSION@.jar -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-session-external-@GEMFIRE_MODULES_VERSION@.jar -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/servlet-api-@SERVLET_API_VERSION@.jar -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/slf4j-api-@SLF4J_VERSION@.jar -GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/slf4j-jdk14-@SLF4J_VERSION@.jar - -if [ "x$CLASSPATH" != "x" ]; then - GEMFIRE_JARS=$GEMFIRE_JARS:$CLASSPATH -fi - -# Command line args that start with -J will be passed to the java vm in JARGS. -# See java --help for a listing of valid vm args. -# Example: -J-Xmx1g sets the max heap size to 1 gigabyte. - -JARGS= -GEMFIRE_ARGS= -for i in "$@" -do - if [ "-J" == "${i:0:2}" ] - then - JARGS="${JARGS} \"${i#-J}\"" - else - GEMFIRE_ARGS="${GEMFIRE_ARGS} \"${i}\"" - fi -done - -eval ${GF_JAVA:-java} ${JAVA_ARGS} ${JARGS} -classpath ${GEMFIRE_JARS} com.gemstone.gemfire.internal.SystemAdmin ${GEMFIRE_ARGS} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/session/bin/modify_war ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/session/bin/modify_war b/extensions/geode-modules-assembly/release/session/bin/modify_war index 9c87104..7b5db21 100755 --- a/extensions/geode-modules-assembly/release/session/bin/modify_war +++ b/extensions/geode-modules-assembly/release/session/bin/modify_war @@ -15,41 +15,6 @@ # limitations under the License. # -X=`dirname $0` -EXE_DIR=`cd $X; pwd` -LIB_DIR=`cd ${X}/../lib; pwd` - -SESSION_JAR="${LIB_DIR}/geode-modules-session-external-@GEMFIRE_MODULES_VERSION@.jar" - -declare -a OTHER_JARS -OTHER_JARS=(${LIB_DIR}/gemfire.jar \ - ${LIB_DIR}/antlr.jar - ${LIB_DIR}/geode-modules-@GEMFIRE_MODULES_VERSION@.jar \ - ${LIB_DIR}/geode-modules-session-@GEMFIRE_MODULES_VERSION@.jar \ - ${LIB_DIR}/slf4j-api-@SLF4J_VERSION@.jar) - -# This is required for GemFire 8.1 -LOG4J_API=$(ls ${LIB_DIR}/log4j-api*jar) -LOG4J_CORE=$(ls ${LIB_DIR}/log4j-core*jar) -if [ -f ${LOG4J_API} -a -f ${LOG4J_CORE} ]; then - OTHER_JARS[${#OTHER_JARS[*]}]=$LOG4J_API - OTHER_JARS[${#OTHER_JARS[*]}]=$LOG4J_CORE -fi - -TMP_DIR="/tmp/modify_war.$$" - -ARG_INPUT_FILE="" -ARG_WAR_LIB_DIR="WEB-INF/lib" -ARG_EAR_LIB_DIR="lib" -ARG_OUTPUT_FILE="" -ARG_TEST_RUN=0 -ARG_CACHE_TYPE="peer-to-peer" -ARG_PROCESS_LIBS=1 -declare -a ARG_GEMFIRE_PARAMETERS="" -declare -a ARG_WAR_LIBS="$SESSION_JAR" -declare -a ARG_EAR_LIBS="" -declare -a ARG_JVM_OPTS="" - function usage() { cat <<EOF USAGE: modify_war <args> @@ -119,13 +84,21 @@ WHERE <args>: necessary jars into the file. When this option is used, additional jars will need to be made available to the container: - gemfire.jar geode-modules.jar - geode-modules-session.jar + geode-modules-session-internal.jar + geode-core.jar + geode-json.jar + antlr.jar + log4j-core.jar + log4j-api.jar + log4j-jul.jar + fastutil.jar + javax.transactions-api.jar + jgroups.jar slf4j-api.jar slf4j-jdk14.jar (not for WebLogic) geode-modules-slf4j-weblogic.jar (WebLogic only) - This option still modifes any web.xml files. + This option still modifies any web.xml files. EOF } @@ -272,6 +245,48 @@ function process_input_file() { done } +######## Mainline ######### + +X=`dirname $0` +EXE_DIR=`cd $X; pwd` +LIB_DIR=`cd ${X}/../lib; pwd` +VERSION="@GEODE_VERSION@" + +if [ -z "$GEODE" ]; then + exiting "Please set the GEODE environment variable to the root of the Geode install location" 1 +fi + +SESSION_JAR="${LIB_DIR}/geode-modules-session-${VERSION}.jar" + +declare -a OTHER_JARS +OTHER_JARS=(${GEODE}/lib/geode-core-${VERSION}.jar \ + ${GEODE}/lib/geode-json-${VERSION}.jar \ + ${GEODE}/lib/antlr-@ANTLR_VERSION@.jar \ + ${GEODE}/lib/log4j-core-@LOG4J_VERSION@.jar \ + ${GEODE}/lib/log4j-api-@LOG4J_VERSION@.jar \ + ${GEODE}/lib/log4j-jul-@LOG4J_VERSION@.jar \ + ${GEODE}/lib/fastutil-@FASTUTIL_VERSION@.jar \ + ${GEODE}/lib/javax.transaction-api-@TX_VERSION@.jar \ + ${GEODE}/lib/jgroups-@JGROUPS_VERSION@.jar + ${LIB_DIR}/geode-modules-${VERSION}.jar \ + ${LIB_DIR}/geode-modules-session-internal-${VERSION}.jar \ + ${LIB_DIR}/slf4j-api-@SLF4J_VERSION@.jar \ + ${LIB_DIR}/slf4j-jdk14-@SLF4J_VERSION@.jar) + +TMP_DIR="/tmp/modify_war.$$" + +ARG_INPUT_FILE="" +ARG_WAR_LIB_DIR="WEB-INF/lib" +ARG_EAR_LIB_DIR="lib" +ARG_OUTPUT_FILE="" +ARG_TEST_RUN=0 +ARG_CACHE_TYPE="" +ARG_PROCESS_LIBS=1 +declare -a ARG_GEMFIRE_PARAMETERS="" +declare -a ARG_WAR_LIBS="$SESSION_JAR" +declare -a ARG_EAR_LIBS="" +declare -a ARG_JVM_OPTS="" + trap exiting INT QUIT TERM mkdir $TMP_DIR http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/session/bin/setenv.properties ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/session/bin/setenv.properties b/extensions/geode-modules-assembly/release/session/bin/setenv.properties deleted file mode 100644 index fc8918b..0000000 --- a/extensions/geode-modules-assembly/release/session/bin/setenv.properties +++ /dev/null @@ -1,6 +0,0 @@ -java.opt.1=-Xms${initial.vm.heap.size.mb:512}M -java.opt.2=-Xmx${maximum.vm.heap.size.mb:512}M -java.opt.hotspot.1=-XX:+UseParNewGC -java.opt.hotspot.2=-XX:+UseConcMarkSweepGC -java.opt.hotspot.3=-XX:CMSInitiatingOccupancyFraction=${cms.initiating.heap.percentage:50} -java.opt.j9.1=-Xgcpolicy:gencon \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/context-fragment.xml deleted file mode 100644 index 72faee2..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/context-fragment.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context> - - <remove:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager"/> - - <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat7DeltaSessionManager" - 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/modules.env ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/modules.env b/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/modules.env deleted file mode 100644 index 1c14a6c..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/modules.env +++ /dev/null @@ -1 +0,0 @@ -TOMCAT_MAJOR_VER=7 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/context-fragment.xml deleted file mode 100644 index 72faee2..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/context-fragment.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context> - - <remove:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager"/> - - <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat7DeltaSessionManager" - 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/modules.env ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/modules.env b/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/modules.env deleted file mode 100644 index d220675..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/modules.env +++ /dev/null @@ -1 +0,0 @@ -TOMCAT_MAJOR_VER=8 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/configuration-prompts.properties ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/configuration-prompts.properties b/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/configuration-prompts.properties deleted file mode 100644 index 0ebae97..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/configuration-prompts.properties +++ /dev/null @@ -1,17 +0,0 @@ -cache.configuration.file=Please enter the name of the GemFire cache configuration file. Default '${default}': -critical.heap.percentage=Please enter the percentage of heap at which updates to the cache are refused. 0.0 means disabled. Default '${default}': -enable.debug.listener=Please specify whether to enable a GemFire listener that logs session create, update, destroy and expiration events. Default '${default}': -enable.gateway.replication=Please specify whether session modifications should be replicated across the WAN. Default '${default}': -enable.local.cache=Please specify whether to maintain a local GemFire cache. Default '${default}': -enable.commit.valve=Please specify whether to commit sessions once per request. Default '${default}': -prefer.deserialized.form=Please specify whether to prefer keeping attributes in deserialized form. Default '${default}': -eviction.heap.percentage=Please enter the percentage of heap at which sessions will be evicted from the local cache. Default '${default}': -log.file=Please enter the name of the file used to log GemFire messages. Default '${default}': -region.attributes.id=Please enter the id of the attributes of the GemFire region used to cache sessions. Default '${default}': -region.name=Please enter the name of the GemFire region used to cache sessions. Default '${default}': -statistic.archive.file=Please enter the name of the file used to store GemFire statistics. Default '${default}': -statistic.sampling.enabled=Please specify whether GemFire statistic sampling should be enabled. Default '${default}': -initial.vm.heap.size.mb=Please specify the initial VM heap size in MB (-Xms). Default '${default}': -maximum.vm.heap.size.mb=Please specify the maximum VM heap size in MB (-Xmx). Default '${default}': -cms.initiating.heap.percentage=Please specify the percentage of VM heap utilization before a concurrent collection is initiated (--XX:CMSInitiatingOccupancyFraction [Hotspot-only]). Default '${default}': -tomcat.version=Please enter the major version of Tomcat you will be using (6, 7 or 8). Default '${default}' http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/context-fragment.xml deleted file mode 100644 index fac3044..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/context-fragment.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context> - - <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager" - 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/modules.env ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/modules.env b/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/modules.env deleted file mode 100644 index 9c4c00a..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/modules.env +++ /dev/null @@ -1 +0,0 @@ -TOMCAT_MAJOR_VER=6 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/server-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/server-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/server-fragment.xml deleted file mode 100644 index c4adc66..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-cs/server-fragment.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<Server> - - <add:Listener className="com.gemstone.gemfire.modules.session.catalina.ClientServerCacheLifecycleListener" - cache-xml-file="${cache.configuration.file:cache-client.xml}" - criticalHeapPercentage="${critical.heap.percentage:0.0}" - evictionHeapPercentage="${eviction.heap.percentage:80.0}" - log-file="${log.file:gemfire_modules.log}" - statistic-archive-file="${statistic.archive.file:gemfire_modules.gfs}" - statistic-sampling-enabled="${statistic.sampling.enabled:false}"/> - -</Server> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/context-fragment.xml deleted file mode 100644 index 155aa2a..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/context-fragment.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context> - - <remove:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager"/> - - <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat7DeltaSessionManager" - 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/modules.env ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/modules.env b/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/modules.env deleted file mode 100644 index 1c14a6c..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/modules.env +++ /dev/null @@ -1 +0,0 @@ -TOMCAT_MAJOR_VER=7 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/context-fragment.xml deleted file mode 100644 index 155aa2a..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/context-fragment.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context> - - <remove:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager"/> - - <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat7DeltaSessionManager" - 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/modules.env ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/modules.env b/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/modules.env deleted file mode 100644 index d220675..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/modules.env +++ /dev/null @@ -1 +0,0 @@ -TOMCAT_MAJOR_VER=8 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties b/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties deleted file mode 100644 index fdead44..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties +++ /dev/null @@ -1,19 +0,0 @@ -cache.configuration.file=Please enter the name of the GemFire cache configuration file. Default '${default}': -critical.heap.percentage=Please enter the percentage of heap at which updates to the cache are refused. 0.0 means disabled. Default '${default}': -enable.debug.listener=Please specify whether to enable a GemFire listener that logs session create, update, destroy and expiration events. Default '${default}': -enable.gateway.replication=Please specify whether session modifications should be replicated across the WAN. Default '${default}': -enable.local.cache=Please specify whether to maintain a local GemFire cache. Default '${default}': -enable.commit.valve=Please specify whether to commit sessions once per request. Default '${default}': -prefer.deserialized.form=Please specify whether to prefer keeping attributes in deserialized form. Default '${default}': -eviction.heap.percentage=Please enter the percentage of heap at which sessions will be evicted from the local cache. Default '${default}': -locators=Please enter the list of locators used by GemFire members to discover each other. The format is a comma-separated list of host[port]. Default '${default}': -log.file=Please enter the name of the file used to log GemFire messages. Default '${default}': -rebalance=Please specify whether to rebalance the GemFire cache at startup. Default '${default}': -region.attributes.id=Please enter the id of the attributes of the GemFire region used to cache sessions. Default '${default}': -region.name=Please enter the name of the GemFire region used to cache sessions. Default '${default}': -statistic.archive.file=Please enter the name of the file used to store GemFire statistics. Default '${default}': -statistic.sampling.enabled=Please specify whether GemFire statistic sampling should be enabled. Default '${default}': -initial.vm.heap.size.mb=Please specify the initial VM heap size in MB (-Xms). Default '${default}': -maximum.vm.heap.size.mb=Please specify the maximum VM heap size in MB (-Xmx). Default '${default}': -cms.initiating.heap.percentage=Please specify the percentage of VM heap utilization before a concurrent collection is initiated (--XX:CMSInitiatingOccupancyFraction [Hotspot-only]). Default '${default}': -tomcat.version=Please enter the major version of Tomcat you will be using (6, 7 or 8). Default '${default}': http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/context-fragment.xml deleted file mode 100644 index 2b3d25c..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/context-fragment.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context> - - <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager" - 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/modules.env ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/modules.env b/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/modules.env deleted file mode 100644 index 9c4c00a..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/modules.env +++ /dev/null @@ -1 +0,0 @@ -TOMCAT_MAJOR_VER=6 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml deleted file mode 100644 index cf7dc0d..0000000 --- a/extensions/geode-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<Server> - - <add:Listener className="com.gemstone.gemfire.modules.session.catalina.PeerToPeerCacheLifecycleListener" - cache-xml-file="${cache.configuration.file:cache-peer.xml}" - criticalHeapPercentage="${critical.heap.percentage:0.0}" - evictionHeapPercentage="${eviction.heap.percentage:80.0}" - locators="${locators:localhost[10334]}" - log-file="${log.file:gemfire_modules.log}" - rebalance="${rebalance:false}" - statistic-archive-file="${statistic.archive.file:gemfire_modules.gfs}" - statistic-sampling-enabled="${statistic.sampling.enabled:false}"/> - -</Server> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml new file mode 100644 index 0000000..72faee2 --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context> + + <remove:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager"/> + + <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat7DeltaSessionManager" + 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml new file mode 100644 index 0000000..72faee2 --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context> + + <remove:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager"/> + + <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat7DeltaSessionManager" + 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-cs/configuration-prompts.properties ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs/configuration-prompts.properties b/extensions/geode-modules-assembly/release/tcserver/geode-cs/configuration-prompts.properties new file mode 100644 index 0000000..391b86f --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs/configuration-prompts.properties @@ -0,0 +1,17 @@ +cache.configuration.file=Please enter the name of the Geode cache configuration file. Default '${default}': +critical.heap.percentage=Please enter the percentage of heap at which updates to the cache are refused. 0.0 means disabled. Default '${default}': +enable.debug.listener=Please specify whether to enable a Geode listener that logs session create, update, destroy and expiration events. Default '${default}': +enable.gateway.replication=Please specify whether session modifications should be replicated across the WAN. Default '${default}': +enable.local.cache=Please specify whether to maintain a local Geode cache. Default '${default}': +enable.commit.valve=Please specify whether to commit sessions once per request. Default '${default}': +prefer.deserialized.form=Please specify whether to prefer keeping attributes in deserialized form. Default '${default}': +eviction.heap.percentage=Please enter the percentage of heap at which sessions will be evicted from the local cache. Default '${default}': +log.file=Please enter the name of the file used to log Geode messages. Default '${default}': +region.attributes.id=Please enter the id of the attributes of the Geode region used to cache sessions. Default '${default}': +region.name=Please enter the name of the Geode region used to cache sessions. Default '${default}': +statistic.archive.file=Please enter the name of the file used to store Geode statistics. Default '${default}': +statistic.sampling.enabled=Please specify whether Geode statistic sampling should be enabled. Default '${default}': +initial.vm.heap.size.mb=Please specify the initial VM heap size in MB (-Xms). Default '${default}': +maximum.vm.heap.size.mb=Please specify the maximum VM heap size in MB (-Xmx). Default '${default}': +cms.initiating.heap.percentage=Please specify the percentage of VM heap utilization before a concurrent collection is initiated (--XX:CMSInitiatingOccupancyFraction [Hotspot-only]). Default '${default}': +tomcat.version=Please enter the major version of Tomcat you will be using (6, 7 or 8). Default '${default}' http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml new file mode 100644 index 0000000..fac3044 --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context> + + <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager" + 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml new file mode 100644 index 0000000..c4adc66 --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='utf-8'?> +<Server> + + <add:Listener className="com.gemstone.gemfire.modules.session.catalina.ClientServerCacheLifecycleListener" + cache-xml-file="${cache.configuration.file:cache-client.xml}" + criticalHeapPercentage="${critical.heap.percentage:0.0}" + evictionHeapPercentage="${eviction.heap.percentage:80.0}" + log-file="${log.file:gemfire_modules.log}" + statistic-archive-file="${statistic.archive.file:gemfire_modules.gfs}" + statistic-sampling-enabled="${statistic.sampling.enabled:false}"/> + +</Server> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-7/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-7/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-7/context-fragment.xml new file mode 100644 index 0000000..155aa2a --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-7/context-fragment.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context> + + <remove:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager"/> + + <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat7DeltaSessionManager" + 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-8/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-8/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-8/context-fragment.xml new file mode 100644 index 0000000..155aa2a --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-8/context-fragment.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context> + + <remove:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager"/> + + <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat7DeltaSessionManager" + 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-p2p/configuration-prompts.properties ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-p2p/configuration-prompts.properties b/extensions/geode-modules-assembly/release/tcserver/geode-p2p/configuration-prompts.properties new file mode 100644 index 0000000..e739513 --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-p2p/configuration-prompts.properties @@ -0,0 +1,19 @@ +cache.configuration.file=Please enter the name of the Geode cache configuration file. Default '${default}': +critical.heap.percentage=Please enter the percentage of heap at which updates to the cache are refused. 0.0 means disabled. Default '${default}': +enable.debug.listener=Please specify whether to enable a Geode listener that logs session create, update, destroy and expiration events. Default '${default}': +enable.gateway.replication=Please specify whether session modifications should be replicated across the WAN. Default '${default}': +enable.local.cache=Please specify whether to maintain a local Geode cache. Default '${default}': +enable.commit.valve=Please specify whether to commit sessions once per request. Default '${default}': +prefer.deserialized.form=Please specify whether to prefer keeping attributes in deserialized form. Default '${default}': +eviction.heap.percentage=Please enter the percentage of heap at which sessions will be evicted from the local cache. Default '${default}': +locators=Please enter the list of locators used by Geode members to discover each other. The format is a comma-separated list of host[port]. Default '${default}': +log.file=Please enter the name of the file used to log Geode messages. Default '${default}': +rebalance=Please specify whether to rebalance the Geode cache at startup. Default '${default}': +region.attributes.id=Please enter the id of the attributes of the Geode region used to cache sessions. Default '${default}': +region.name=Please enter the name of the Geode region used to cache sessions. Default '${default}': +statistic.archive.file=Please enter the name of the file used to store Geode statistics. Default '${default}': +statistic.sampling.enabled=Please specify whether Geode statistic sampling should be enabled. Default '${default}': +initial.vm.heap.size.mb=Please specify the initial VM heap size in MB (-Xms). Default '${default}': +maximum.vm.heap.size.mb=Please specify the maximum VM heap size in MB (-Xmx). Default '${default}': +cms.initiating.heap.percentage=Please specify the percentage of VM heap utilization before a concurrent collection is initiated (--XX:CMSInitiatingOccupancyFraction [Hotspot-only]). Default '${default}': +tomcat.version=Please enter the major version of Tomcat you will be using (6, 7 or 8). Default '${default}': http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-p2p/context-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-p2p/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-p2p/context-fragment.xml new file mode 100644 index 0000000..2b3d25c --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-p2p/context-fragment.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context> + + <add:Manager className="com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager" + 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> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-assembly/release/tcserver/geode-p2p/server-fragment.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-p2p/server-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-p2p/server-fragment.xml new file mode 100644 index 0000000..cf7dc0d --- /dev/null +++ b/extensions/geode-modules-assembly/release/tcserver/geode-p2p/server-fragment.xml @@ -0,0 +1,14 @@ +<?xml version='1.0' encoding='utf-8'?> +<Server> + + <add:Listener className="com.gemstone.gemfire.modules.session.catalina.PeerToPeerCacheLifecycleListener" + cache-xml-file="${cache.configuration.file:cache-peer.xml}" + criticalHeapPercentage="${critical.heap.percentage:0.0}" + evictionHeapPercentage="${eviction.heap.percentage:80.0}" + locators="${locators:localhost[10334]}" + log-file="${log.file:gemfire_modules.log}" + rebalance="${rebalance:false}" + statistic-archive-file="${statistic.archive.file:gemfire_modules.gfs}" + statistic-sampling-enabled="${statistic.sampling.enabled:false}"/> + +</Server> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules-session/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle index e301a6a..765bdd9 100644 --- a/extensions/geode-modules-session/build.gradle +++ b/extensions/geode-modules-session/build.gradle @@ -45,8 +45,7 @@ task internalJar(type: Jar) { from sourceSets.main.output include '**/internal/**/*' includeEmptyDirs = false - baseName = 'geode-modules-session' - classifier = 'internal' + baseName = 'geode-modules-session-internal' } artifacts { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/Banner.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/Banner.java b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/Banner.java index dbe8e05..413da07 100644 --- a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/Banner.java +++ b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/Banner.java @@ -26,19 +26,6 @@ import java.util.Properties; public class Banner { - private static String VERSION = "unknown"; - - private static Properties props = new Properties(); - - static { - InputStream is = Banner.class.getResourceAsStream("/modules-version.properties"); - try { - props.load(is); - VERSION = props.getProperty("version"); - } catch (IOException e) { - } - } - public static String getString() { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); @@ -48,12 +35,7 @@ public class Banner { } private static void print(PrintWriter pw) { - pw.println("GemFire Modules"); - pw.print("Modules version: "); - pw.println(VERSION); + pw.println("Geode Modules"); GemFireVersion.print(pw); } - - private Banner() { - } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/geode-core/build.gradle ---------------------------------------------------------------------- diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 8cd5bf3..4877e03 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -32,7 +32,7 @@ dependencies { // External provided files("${System.getProperty('java.home')}/../lib/tools.jar") compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version' - compile 'org.jgroups:jgroups:3.6.8.Final' + compile 'org.jgroups:jgroups:' + project.'jgroups.version' compile 'antlr:antlr:' + project.'antlr.version' compile 'com.fasterxml.jackson.core:jackson-databind:' + project.'jackson.version' compile 'commons-io:commons-io:' + project.'commons-io.version' http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d216e553/gradle/dependency-versions.properties ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties index 640b175..b6687e5 100644 --- a/gradle/dependency-versions.properties +++ b/gradle/dependency-versions.properties @@ -63,6 +63,7 @@ javax.servlet-api.version = 3.1.0 javax.transaction-api.version = 1.2 jedis.version = 2.7.2 jetty.version = 9.3.6.v20151106 +jgroups.version = 3.6.8.Final jline.version = 2.12 jmock.version = 2.8.2 jna.version = 4.0.0
