geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [50/51] [partial] incubator-geode git commit: GEODE-917: rename gemfire subprojects to geode
Date Wed, 17 Feb 2016 18:23:54 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/COMPILING.txt
----------------------------------------------------------------------
diff --git a/COMPILING.txt b/COMPILING.txt
index d2556ca..f2d1098 100644
--- a/COMPILING.txt
+++ b/COMPILING.txt
@@ -15,7 +15,7 @@ or
 
 ./gradlew distZip
 
-the distribution archives will be located in gemfire-assembly/build/distributions/.
+the distribution archives will be located in geode-assembly/build/distributions/.
 
 To create an unzipped distribution run
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/RUNNING.txt
----------------------------------------------------------------------
diff --git a/RUNNING.txt b/RUNNING.txt
index 8286657..616b2f1 100755
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -2,7 +2,7 @@ Create a distribution archive using
 
 ./gradlew distTar
 
-Unpack the archive found in gemfire-assembly/build/distributions and run the gfsh shell
+Unpack the archive found in geode-assembly/build/distributions and run the gfsh shell
 
 cd apache-geode-*
 bin/gfsh

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 8fa7e5d..19f72a0 100755
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,7 @@ task clean(type: Delete) {
 }
 
 // allow external projects to override include location
-if (name == 'gemfire') {
+if (name == 'geode') {
   ext.scriptDir = 'gradle'
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e7d0ba0..e68d5d4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,12 +26,12 @@ LABEL version=unstable
 RUN	git clone -b develop https://github.com/apache/incubator-geode.git \
 	&& cd incubator-geode \
 	&& ./gradlew build -Dskip.tests=true \
-	&& ls /incubator-geode | grep -v gemfire-assembly | xargs rm -rf \
+	&& ls /incubator-geode | grep -v geode-assembly | xargs rm -rf \
 	&& rm -rf /root/.gradle/ \
-	&& rm -rf /incubator-geode/gemfire-assembly/build/distributions/ \
+	&& rm -rf /incubator-geode/geode-assembly/build/distributions/ \
     && yum remove -y perl
 
-ENV GEODE_HOME /incubator-geode/gemfire-assembly/build/install/apache-geode
+ENV GEODE_HOME /incubator-geode/geode-assembly/build/install/apache-geode
 ENV PATH $PATH:$GEODE_HOME/bin
 
 # Default ports:

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/extensions/gemfire-modules-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/build.gradle b/extensions/gemfire-modules-assembly/build.gradle
deleted file mode 100644
index b20ddff..0000000
--- a/extensions/gemfire-modules-assembly/build.gradle
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * 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.
- */
-
-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
-extraArchive {
-  sources = false
-  javadoc = false
-  tests = false
-}
-
-disableMavenPublishing()
-
-def getJarArtifact(module) {
-  project(module).configurations.archives.artifacts.findAll {
-    it instanceof PublishArtifact && it.classifier == '' && it.type == 'jar'
-  }.collect { it.file }
-}
-
-def configureTcServerAssembly = {
-  archiveName = "Apache_Geode_Modules-${version}-tcServer.zip"
-
-  // All client-server files
-  into('gemfire-cs/lib') {
-    from getJarArtifact(':extensions/gemfire-modules')
-    from getJarArtifact(':extensions/gemfire-modules-tomcat7')
-    from configurations.slf4jDeps
-  }
-  into('gemfire-cs/bin') {
-    from('release/scripts') {
-      include '*'
-    }
-    from('release/tcserver/gemfire-cs') {
-      include 'modules.env'
-    }
-    filter(ReplaceTokens, tokens:['GEMFIRE_MODULES_VERSION': version])
-  }
-  into('gemfire-cs/conf') {
-    from('release/conf') {
-      exclude 'cache-peer.xml'
-    }
-    from('release/tcserver/gemfire-cs') {
-      include 'context-fragment.xml'
-      include 'server-fragment.xml'
-    }
-  }
-  into('gemfire-cs') {
-    from('release/tcserver/gemfire-cs') {
-      include 'configuration-prompts.properties'
-      include 'README.txt'
-      filter(ReplaceTokens, tokens:['VERSION': version])
-    }
-  }
-
-  // Tomncat 7 specifics
-  into('gemfire-cs-tomcat-7/conf') {
-    from('release/tcserver/gemfire-cs-tomcat-7') {
-      include 'context-fragment.xml'
-    }
-  }
-  into('gemfire-cs-tomcat-7/bin') {
-    from('release/tcserver/gemfire-cs-tomcat-7') {
-      include 'modules.env'
-    }
-  }
-  // All peer-to-peer files
-  into('gemfire-p2p/lib') {
-    from getJarArtifact(':extensions/gemfire-modules')
-    from getJarArtifact(':extensions/gemfire-modules-tomcat7')
-    from configurations.slf4jDeps
-    from('release/3rdparty_license') {
-      include "open_source_licenses*${version}.txt"
-    }
-  }
-  into('gemfire-p2p/bin') {
-    from('release/scripts') {
-      include 'gemfire.*'
-      include 'setenv.properties'
-    }
-    from('release/tcserver/gemfire-p2p') {
-      include 'modules.env'
-    }
-  }
-  into('gemfire-p2p/conf') {
-    from('release/conf') {
-      include 'cache-peer.xml'
-    }
-    from('release/tcserver/gemfire-p2p') {
-      include 'context-fragment.xml'
-      include 'server-fragment.xml'
-    }
-  }
-  into('gemfire-p2p') {
-    from('release/tcserver/gemfire-p2p') {
-      include 'configuration-prompts.properties'
-      include 'README.txt'
-      filter(ReplaceTokens, tokens:['VERSION': version])
-    }
-  }
-
-  // Tomncat 7 specifics
-  into('gemfire-p2p-tomcat-7/conf') {
-    from('release/tcserver/gemfire-p2p-tomcat-7') {
-      include 'context-fragment.xml'
-    }
-  }
-  into('gemfire-p2p-tomcat-7/bin') {
-    from('release/tcserver/gemfire-p2p-tomcat-7') {
-      include 'modules.env'
-    }
-  }
-}
-
-def configureTcServer30Assembly = {
-  archiveName = "Apache_Geode_Modules-${version}-tcServer30.zip"
-
-  into('gemfire-cs-tomcat-8/bin') {
-    from('release/tcserver/gemfire-cs-tomcat-8') {
-      include 'modules.env'
-    }
-  }
-  into('gemfire-cs-tomcat-8/conf') {
-    from('release/tcserver/gemfire-cs-tomcat-8') {
-      include 'context-fragment.xml'
-    }
-  }
-
-  into('gemfire-p2p-tomcat-8/bin') {
-    from('release/tcserver/gemfire-p2p-tomcat-8') {
-      include 'modules.env'
-    }
-  }
-  into('gemfire-p2p-tomcat-8/conf') {
-    from('release/tcserver/gemfire-p2p-tomcat-8') {
-      include 'context-fragment.xml'
-    }
-  }
-}
-
-task distTomcat(type: Zip, dependsOn: ':extensions/gemfire-modules:build') {
-  archiveName = "Apache_Geode_Modules-${version}-Tomcat.zip"
-
-  // All client-server files
-  into('lib') {
-    from getJarArtifact(':extensions/gemfire-modules')
-    from getJarArtifact(':extensions/gemfire-modules-tomcat7')
-    from configurations.slf4jDeps
-  }
-  into('bin') {
-    from('release/scripts') {
-      include '*'
-      exclude 'setenv.properties'
-    }
-  }
-  into('conf') {
-    from('release/conf') {
-      include '*'
-    }
-  }
-}
-
-task distHibernate(type: Zip, dependsOn: ':extensions/gemfire-modules-hibernate:build') {
-  archiveName = "Apache_Geode_Modules-${version}-Hibernate.zip"
-
-  into('lib') {
-    from getJarArtifact(':extensions/gemfire-modules')
-    from getJarArtifact(':extensions/gemfire-modules-hibernate')
-  }
-}
-
-task distAppServer(type: Zip, dependsOn: ':extensions/gemfire-modules-session:build') {
-  archiveName = "Apache_Geode_Modules-${version}-AppServer.zip"
-
-  into('lib') {
-    from getJarArtifact(':extensions/gemfire-modules')
-    from getJarArtifact(':extensions/gemfire-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:['SLF4J_VERSION': project.'slf4j-api.version'])
-      filter(ReplaceTokens, tokens:['SERVLET_API_VERSION': project.'javax.servlet-api.version'])
-      filter(ReplaceTokens, tokens:['GEMFIRE_VERSION': version])
-    }
-  }
-
-  into('conf') {
-    from('release/conf')
-  }
-}
-
-task distTcServer(type: Zip, dependsOn: [':extensions/gemfire-modules:build', ':extensions/gemfire-modules-tomcat7:build']) {
-  configure(configureTcServerAssembly)
-}
-
-task distTcServer30(type: Zip, dependsOn: [':extensions/gemfire-modules:build', ':extensions/gemfire-modules-tomcat7:build']) {
-  configure(configureTcServerAssembly)
-  configure(configureTcServer30Assembly)
-}
-
-dependencies {
-  moduleDistOutputs distTcServer.outputs.files
-  moduleDistOutputs distTcServer30.outputs.files
-  moduleDistOutputs distHibernate.outputs.files
-  moduleDistOutputs distAppServer.outputs.files
-  moduleDistOutputs distTomcat.outputs.files
-}
-
-task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 'distTomcat', 'distHibernate', 'distAppServer'])
-
-build.dependsOn dist

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/extensions/gemfire-modules-assembly/release/conf/cache-client.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/conf/cache-client.xml b/extensions/gemfire-modules-assembly/release/conf/cache-client.xml
deleted file mode 100755
index 3ae9ba7..0000000
--- a/extensions/gemfire-modules-assembly/release/conf/cache-client.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	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.
--->
-<client-cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"
-    version="9.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. -->
-  <pool name="sessions" subscription-enabled="true">
-    <server host="localhost" port="40404"/>
-  </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
-       host and port as necessary. -->
-  <!--
-  <pool name="sessions" subscription-enabled="true">
-    <locator host="localhost" port="10334"/>
-  </pool>
-  -->
-  
-</client-cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/extensions/gemfire-modules-assembly/release/conf/cache-peer.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/conf/cache-peer.xml b/extensions/gemfire-modules-assembly/release/conf/cache-peer.xml
deleted file mode 100755
index 1f62cb1..0000000
--- a/extensions/gemfire-modules-assembly/release/conf/cache-peer.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	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.
--->
-<cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"
-    version="9.0">
-
-  <!-- Uncomment the following disk-store element to modify the default disk store directory -->
-  <!--
-  <disk-store name="DEFAULT">
-    <disk-dirs>
-      <disk-dir>/path/to/persistent/data</disk-dir>
-    </disk-dirs>
-  </disk-store>
-  -->
-
-  <!-- This is the definition of the default session region -->
-  <!--
-  <region name="gemfire_modules_sessions">
-    <region-attributes scope="distributed-ack" enable-gateway="false" data-policy="replicate" statistics-enabled="true">
-      <entry-idle-time>
-        <expiration-attributes timeout="0" action="invalidate">
-          <custom-expiry>
-            <class-name>com.gemstone.gemfire.modules.util.SessionCustomExpiry</class-name>
-          </custom-expiry>
-        </expiration-attributes>
-      </entry-idle-time>
-    </region-attributes>
-  </region>
-  -->
-  
-</cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/extensions/gemfire-modules-assembly/release/conf/cache-server.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/conf/cache-server.xml b/extensions/gemfire-modules-assembly/release/conf/cache-server.xml
deleted file mode 100755
index b9d8c2c..0000000
--- a/extensions/gemfire-modules-assembly/release/conf/cache-server.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	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.
--->
-<cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"
-    version="9.0">
-
-  <!-- Uncomment the following gateway-hub element to create a gateway hub -->
-  <!--
-  <gateway-hub id="NY" port="11110">
-    <gateway id="LN">
-      <gateway-endpoint id="LN-1" host="localhost" port="22220"/>
-      <gateway-queue disk-store-name="NY_GATEWAY"/>
-    </gateway>
-  </gateway-hub>
-  -->
-
-  <!-- Uncomment the following cache-server element to modify the listen port -->
-  <!--
-  <cache-server port="44444"/>
-  -->
-
-  <!-- Uncomment the following disk-store element to modify the default disk store directory -->
-  <!--
-  <disk-store name="DEFAULT">
-    <disk-dirs>
-      <disk-dir>/path/to/persistent/data</disk-dir>
-    </disk-dirs>
-  </disk-store>
-  -->
-  
-  <!-- Uncomment the following disk-store element to create the NY_GATEWAY disk store
-       (for the gateway-hub element defined above) -->
-  <!--
-  <disk-store name="NY_GATEWAY">
-    <disk-dirs>
-      <disk-dir>/path/to/persistent/data</disk-dir>
-    </disk-dirs>
-  </disk-store>
-  -->
-  
-  <!-- This is the definition of the default session region -->
-  <!--
-  <region name="gemfire_modules_sessions">
-    <region-attributes enable-gateway="false" data-policy="partition" statistics-enabled="true">
-      <entry-idle-time>
-        <expiration-attributes timeout="0" action="invalidate">
-          <custom-expiry>
-            <class-name>com.gemstone.gemfire.modules.util.SessionCustomExpiry</class-name>
-          </custom-expiry>
-        </expiration-attributes>
-      </entry-idle-time>
-      <partition-attributes redundant-copies="1" total-num-buckets="113"/>
-    </region-attributes>
-  </region>
-  -->
-
-</cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/extensions/gemfire-modules-assembly/release/scripts/cacheserver.bat
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/scripts/cacheserver.bat b/extensions/gemfire-modules-assembly/release/scripts/cacheserver.bat
deleted file mode 100755
index 8ae0776..0000000
--- a/extensions/gemfire-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\gemfire-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\gemfire-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/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh b/extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh
deleted file mode 100755
index 24946a6..0000000
--- a/extensions/gemfire-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/gemfire-core-dependencies.jar
-if [ ! -f "$GEMFIRE_DEP_JAR" ]; then
-  echo "ERROR: Could not determine GEMFIRE location."
-  exit 1
-fi
-
-MOD_JAR=`ls $GEMFIRE/lib/gemfire-modules-?.*.jar` 2>/dev/null
-if [ -z "$MOD_JAR" ]; then
-  MOD_JAR=$GEMFIRE/lib/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/scripts/gemfire.bat
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/scripts/gemfire.bat b/extensions/gemfire-modules-assembly/release/scripts/gemfire.bat
deleted file mode 100755
index 6102b88..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/scripts/gemfire.sh
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/scripts/gemfire.sh b/extensions/gemfire-modules-assembly/release/scripts/gemfire.sh
deleted file mode 100755
index 7ca2c21..0000000
--- a/extensions/gemfire-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/gemfire-core-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/scripts/setenv.properties
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/scripts/setenv.properties b/extensions/gemfire-modules-assembly/release/scripts/setenv.properties
deleted file mode 100644
index fc8918b..0000000
--- a/extensions/gemfire-modules-assembly/release/scripts/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/f6c4c2f9/extensions/gemfire-modules-assembly/release/session/bin/cacheserver.bat
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/session/bin/cacheserver.bat b/extensions/gemfire-modules-assembly/release/session/bin/cacheserver.bat
deleted file mode 100755
index eb60d3d..0000000
--- a/extensions/gemfire-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\gemfire-modules-@GEMFIRE_MODULES_VERSION@.jar
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-modules-session-@GEMFIRE_MODULES_VERSION@.jar
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/session/bin/cacheserver.sh
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/session/bin/cacheserver.sh b/extensions/gemfire-modules-assembly/release/session/bin/cacheserver.sh
deleted file mode 100755
index 1ac8e0d..0000000
--- a/extensions/gemfire-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/gemfire-modules-@GEMFIRE_MODULES_VERSION@.jar \
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/gemfire-modules-session-@GEMFIRE_MODULES_VERSION@.jar \
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/servlet-api-@SERVLET_API_VERSION@.jar \
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/session/bin/gemfire.bat
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/session/bin/gemfire.bat b/extensions/gemfire-modules-assembly/release/session/bin/gemfire.bat
deleted file mode 100755
index abf1138..0000000
--- a/extensions/gemfire-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\gemfire-modules-@GEMFIRE_MODULES_VERSION@.jar
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-modules-session-@GEMFIRE_MODULES_VERSION@.jar
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/session/bin/gemfire.sh
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/session/bin/gemfire.sh b/extensions/gemfire-modules-assembly/release/session/bin/gemfire.sh
deleted file mode 100755
index 1d8abb4..0000000
--- a/extensions/gemfire-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/gemfire-modules-@GEMFIRE_MODULES_VERSION@.jar
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/gemfire-modules-session-@GEMFIRE_MODULES_VERSION@.jar
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/session/bin/modify_war
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/session/bin/modify_war b/extensions/gemfire-modules-assembly/release/session/bin/modify_war
deleted file mode 100755
index 617a33b..0000000
--- a/extensions/gemfire-modules-assembly/release/session/bin/modify_war
+++ /dev/null
@@ -1,392 +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.
-#
-
-X=`dirname $0`
-EXE_DIR=`cd $X; pwd`
-LIB_DIR=`cd ${X}/../lib; pwd`
-
-SESSION_JAR="${LIB_DIR}/gemfire-modules-session-external-@GEMFIRE_MODULES_VERSION@.jar"
-
-declare -a OTHER_JARS
-OTHER_JARS=(${LIB_DIR}/gemfire.jar \
-    ${LIB_DIR}/antlr.jar
-    ${LIB_DIR}/gemfire-modules-@GEMFIRE_MODULES_VERSION@.jar \
-    ${LIB_DIR}/gemfire-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>
-WHERE <args>:
-
-    -e <jar>
-                    Assumes the input file is an .ear file and will add the
-                    given jar as a shared, application library. The file will
-                    be added in a /lib directory (by default) and any embedded
-                    .war files will have a corresponding Class-Path entry added
-                    to their MANIFEST.MF file. The option can be given multiple times.
-
-    -h
-                    Displays this help message.
-
-    -j <jar>
-                    Additional library to add to the input file. Can be given
-                    multiple times.
-
-    -J <jvm opt>
-                    JVM argument to pass to sub-commands. Typically this might
-                    be to define proxy values. For example -J"-Dhttp.proxyHost=my-proxy"
-
-    -l <lib>
-                    Library directory where new jars will be placed inside war.
-                    Defaults to WEB-INF/lib.
-
-    -m <lib>
-                    Library directory where new jars will be placed inside ear.
-                    Defaults to /lib.
-
-    -o <file>
-                    The output file.
-
-    -p <param=value>
-                    Specific parameter for inclusion into the session filter
-                    definition as a regular init-param. Can be given multiple times.
-
-    -r
-                    Test run which only outputs an updated web.xml file.
-
-    -t <cache-type>
-                    Type of cache. Must be one of 'peer-to-peer' or
-                    'client-server'. Default is peer-to-peer.
-
-    -v              
-                    Verbose output
- 
-    -w <war/ear file>
-                    The input file - either a WAR or EAR. The following actions
-                    will be performed depending on the type of file:
-                    WARs will have a <filter> element added to the web.xml and
-                    will have the appropriate jars copied to WEB-INF/lib.
-                    If the file is an EAR, then the appropriate jars will be
-                    copied to lib, within the ear and each embedded war files'
-                    manifest will have a Class-Path entry added (if one does
-                    not already exist).
-                    An appropriate slf4j binding jar must be included for ears
-                    or wars using -e or -j respectively. The following jars are
-                    provided:
-                        slf4j-jdk14
-                        slf4j-log4j12
-                        gemfire-modules-slf4j-weblogic
-
-    -x
-                    Do not create a self-contained war/ear file by copying all
-                    necessary jars into the file. When this option is used,
-                    additional jars will need to be made available to the
-                    container:
-                        gemfire.jar
-                        gemfire-modules.jar
-                        gemfire-modules-session.jar
-                        slf4j-api.jar
-                        slf4j-jdk14.jar (not for WebLogic)
-                        gemfire-modules-slf4j-weblogic.jar (WebLogic only)
-                    This option still modifes any web.xml files.
-                        
-EOF
-}
-
-
-# Two logging levels - 'I'nfo and 'D'ebug
-function log() {
-    local MSG=$1
-    local LVL=${2:-I}
-
-    if [ "$LVL" == "D" ]; then
-        if [ -n "$DEBUG" ]; then
-            echo "$(date '+%Y-%m-%d %H:%M:%S')  $LVL  $MSG" >&2
-        fi
-    else
-        echo "$(date '+%Y-%m-%d %H:%M:%S')  $LVL  $MSG" >&2
-    fi
-}
-
-
-function exiting() {
-    local MSG=$1
-    local CODE=${2:-0}
-
-    if [ -n "$MSG" ]; then
-        echo "ERROR: $MSG"
-    fi
-
-    rm -rf $TMP_DIR
-    exit $CODE
-}
-
-
-function add_war_jars() {
-    local WAR_LIB_DIR=$1/$ARG_WAR_LIB_DIR/
-    mkdir -p $WAR_LIB_DIR
-
-    log "Copying jar(s) into war's '$ARG_WAR_LIB_DIR' directory" D
-    for J in ${ARG_WAR_LIBS[*]}; do
-        log "    $J" D
-        cp $J $WAR_LIB_DIR || exiting "Unable to copy $J to temp location $WAR_LIB_DIR" 1
-    done
-}
-
-
-function process_manifest() {
-    local MANIFEST=$1
-    local TMP_MANIFEST
-
-    log "Processing manifest $MANIFEST" D
-
-    CP_LIBS=""
-    for J in ${OTHER_JARS[*]} ${ARG_EAR_LIBS[*]}; do
-        CP_LIBS="$CP_LIBS $ARG_EAR_LIB_DIR/$(basename $J)"
-    done
-
-    TMP_MANIFEST="$TMP_DIR/manifest.mf.$$"
-    cp $MANIFEST $TMP_MANIFEST
-
-    awk -v CP_LIBS="$CP_LIBS" '
-        BEGIN {
-            cp = 0
-            split(CP_LIBS, cp_array)
-        }
-        /^Class-Path/ {print $0 CP_LIBS; cp = 1; getline}
-        /^ *\r?$/ {
-            if (cp == 0) {
-                print "Class-Path:" CP_LIBS
-                cp = 1
-            }
-        }
-        {print $0}
-        END { if (cp == 0) print "Class-Path:" CP_LIBS }
-    ' $TMP_MANIFEST > $MANIFEST
-
-    rm $TMP_MANIFEST
-}
-
-
-function process_web_xml() {
-    local WORK_DIR=$1
-    local ARG_P=""
-    local JVM_OPTS=""
-
-    for i in ${ARG_GEMFIRE_PARAMETERS[*]}; do
-        ARG_P="$ARG_P -p $i"
-    done
-
-    for j in ${ARG_JVM_OPTS[*]}; do
-        JVM_OPTS="$JVM_OPTS $j"
-    done
-    
-    WEB_XML=$(find $WORK_DIR -name web.xml)
-    TMP_WEB_XML="${WORK_DIR}/web.xml.$$"
-    JAVA_CMD="java $JVM_OPTS -jar $SESSION_JAR $ARG_P -t $ARG_CACHE_TYPE -w $WEB_XML"
-    log "Executing java cmd: $JAVA_CMD" D
-
-    if [ $ARG_TEST_RUN -eq 0 ]; then
-        eval $JAVA_CMD > $TMP_WEB_XML || exiting "Error updating web.xml" 1
-        cp $TMP_WEB_XML $WEB_XML
-        rm -f $TMP_WEB_XML
-    else
-        eval $JAVA_CMD || exiting "Error updating web.xml" 1
-    fi
-}
-
-
-function process_input_file() {
-    local WORK_DIR=$1
-
-    if [[ "$ARG_INPUT_FILE" =~ \.war$ ]]; then
-        process_web_xml $WORK_DIR
-        add_war_jars $WORK_DIR
-        return
-    fi
- 
-    WAR_LIST=$( find $WORK_DIR -name '*.war' )
-    for WAR in $WAR_LIST; do
-        log "Processing embedded war file $WAR" D
-        TMP_WAR_DIR="${WAR}.$$"
-
-        log "Unzipping war to $TMP_WAR_DIR" D
-        unzip -q -o -d $TMP_WAR_DIR $WAR
-
-        process_web_xml $TMP_WAR_DIR
-        if [ $ARG_TEST_RUN -eq 0 ]; then
-            add_war_jars $TMP_WAR_DIR
-
-            MANIFEST=$( find $TMP_WAR_DIR -name MANIFEST.MF )
-
-            if [ $ARG_PROCESS_LIBS -eq 1 -a -n "$MANIFEST" ]; then
-                process_manifest $MANIFEST
-            fi
-
-            log "Creating new war $WAR" D
-            if [ -n "$MANIFEST" ]; then
-                jar cmf $MANIFEST $WAR -C $TMP_WAR_DIR .
-            else
-                jar cf $WAR -C $TMP_WAR_DIR .
-            fi
-        fi
-
-        rm -rf $TMP_WAR_DIR
-    done
-}
-
-trap exiting INT QUIT TERM
-
-mkdir $TMP_DIR
-
-CMD_ARGS="-j $SESSION_JAR"
-
-while getopts "e:hj:J:l:m:o:p:rt:vw:x" OPT; do
-    case $OPT in
-        e)
-            if [ ! -f $OPTARG ]; then
-                exiting "Cannot read file '$OPTARG' given with option -e" 1
-            fi
-            ARG_EAR_LIBS[${#ARG_EAR_LIBS[@]}]=$OPTARG
-            ;;
-        h)
-            usage
-            exiting "" 1
-            ;;
-        j)
-            if [ ! -f $OPTARG ]; then
-                exiting "Cannot read file '$OPTARG' given with option -j" 1
-            fi
-            ARG_WAR_LIBS[${#ARG_WAR_LIBS[@]}]=$OPTARG
-            ;;
-        J)
-            ARG_JVM_OPTS[${#ARG_JVM_OPTS[@]}]=$OPTARG
-            ;;
-        l)
-            ARG_WAR_LIB_DIR=$OPTARG
-            ;;
-        m)
-            ARG_EAR_LIB_DIR=$OPTARG
-            ;;
-        o)
-            ARG_OUTPUT_FILE=$OPTARG
-            ;;
-        p)
-            ARG_GEMFIRE_PARAMETERS[${#ARG_GEMFIRE_PARAMETERS[@]}]=$OPTARG
-            ;;
-        r)
-            ARG_TEST_RUN=1
-            ;;
-        t)
-            case $OPTARG in
-                peer-to-peer|client-server)
-                    ARG_CACHE_TYPE=$OPTARG
-                    ;;
-                *)
-                    exiting "Invalid cache type '$OPTARG' given with option -t. Options are 'peer-to-peer' or 'client-server'." 1
-                    ;;
-            esac
-            ;;
-        v)
-            DEBUG=1
-            ;;
-        w)
-            if [ ! -f $OPTARG ]; then
-                exiting "Cannot read file '$OPTARG' given with option -w" 1
-            fi
-            ARG_INPUT_FILE=$OPTARG
-            ;;
-        x)
-            ARG_PROCESS_LIBS=0
-            ;;
-        [?])
-            echo "Unknown option '$OPTARG'"
-            echo
-            usage
-            exit 1
-            ;;
-        :)
-            echo "Option '$OPTARG' requires an argument"
-            echo
-            usage
-            exit 1
-            ;;
-    esac
-done
-
-# Some validation
-if [ -z "$ARG_INPUT_FILE" ]; then
-    exiting "Please supply an input file with the -w option" 1
-fi
-
-if [ -z "$ARG_OUTPUT_FILE" ]; then
-    ARG_OUTPUT_FILE="sessions-$(basename $ARG_INPUT_FILE)"
-fi
-
-if [[ "$ARG_INPUT_FILE" =~ \.war$ && -n "${ARG_EAR_LIBS[*]}" ]]; then
-    log "Input file appears to be a war but -e also specified. EAR processing will be skipped." W
-fi
-
-if [[ "$ARG_INPUT_FILE" =~ \.war$ && $ARG_PROCESS_LIBS -eq 1 ]]; then
-    for J in ${OTHER_JARS[*]}; do
-        ARG_WAR_LIBS[${#ARG_WAR_LIBS[@]}]=$J
-    done
-fi
-
-unzip -q -o -d $TMP_DIR $ARG_INPUT_FILE
-process_input_file $TMP_DIR
-
-if [[ $ARG_TEST_RUN -eq 0 && $ARG_PROCESS_LIBS -eq 1 && "$ARG_INPUT_FILE" =~ \.ear$ ]]; then
-    log "Copying additional jars into ear's '$ARG_EAR_LIB_DIR' directory" D
-    mkdir -p $TMP_DIR/$ARG_EAR_LIB_DIR
-    for i in ${OTHER_JARS[*]} ${ARG_EAR_LIBS[*]}; do
-        log "    $i" D
-        cp $i $TMP_DIR/$ARG_EAR_LIB_DIR/ || exiting "Unable to copy $i to $TMP_DIR/$ARG_EAR_LIB_DIR" 1
-    done
-fi
-
-if [ $ARG_TEST_RUN -eq 0 ]; then
-    mkdir -p $TMP_DIR/META-INF
-    touch $TMP_DIR/META-INF/MANIFEST.MF
-    jar cmf $TMP_DIR/META-INF/MANIFEST.MF $ARG_OUTPUT_FILE -C $TMP_DIR .
-    log "Created file: $ARG_OUTPUT_FILE" I
-fi
-
-exiting

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/extensions/gemfire-modules-assembly/release/session/bin/setenv.properties
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/session/bin/setenv.properties b/extensions/gemfire-modules-assembly/release/session/bin/setenv.properties
deleted file mode 100644
index fc8918b..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/context-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/context-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/context-fragment.xml
deleted file mode 100644
index 72faee2..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/modules.env
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/modules.env b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-7/modules.env
deleted file mode 100644
index 1c14a6c..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/context-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/context-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/context-fragment.xml
deleted file mode 100644
index 72faee2..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/modules.env
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/modules.env b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs-tomcat-8/modules.env
deleted file mode 100644
index d220675..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/configuration-prompts.properties
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/configuration-prompts.properties b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/configuration-prompts.properties
deleted file mode 100644
index 0ebae97..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/context-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/context-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/context-fragment.xml
deleted file mode 100644
index fac3044..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/modules.env
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/modules.env b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/modules.env
deleted file mode 100644
index 9c4c00a..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/server-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/server-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-cs/server-fragment.xml
deleted file mode 100644
index c4adc66..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/context-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/context-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/context-fragment.xml
deleted file mode 100644
index 155aa2a..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/modules.env
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/modules.env b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-7/modules.env
deleted file mode 100644
index 1c14a6c..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/context-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/context-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/context-fragment.xml
deleted file mode 100644
index 155aa2a..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/modules.env
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/modules.env b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p-tomcat-8/modules.env
deleted file mode 100644
index d220675..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties
deleted file mode 100644
index fdead44..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/context-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/context-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/context-fragment.xml
deleted file mode 100644
index 2b3d25c..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/modules.env
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/modules.env b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/modules.env
deleted file mode 100644
index 9c4c00a..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml
deleted file mode 100644
index cf7dc0d..0000000
--- a/extensions/gemfire-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/f6c4c2f9/extensions/gemfire-modules-hibernate/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-hibernate/build.gradle b/extensions/gemfire-modules-hibernate/build.gradle
deleted file mode 100644
index 9d6cc5d..0000000
--- a/extensions/gemfire-modules-hibernate/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-dependencies {
-  compile project(':extensions/gemfire-modules')
-  compile 'org.hibernate:hibernate-core:' + project.'hibernate.version'
-  compile 'org.hibernate:hibernate-annotations:' + project.'hibernate.version'
-  compile 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
-
-  runtime 'dom4j:dom4j:' + project.'dom4j.version'
-
-  testRuntime 'commons-collections:commons-collections:' + project.'commons-collections.version'
-  testRuntime 'org.hibernate:hibernate-commons-annotations:' + project.'hibernate-commons-annotations.version'
-  testRuntime 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
-  testRuntime 'org.hsqldb:hsqldb:' + project.'hsqldb.version'
-  testRuntime 'org.javassist:javassist:' + project.'javassist.version'
-
-  testCompile project(path: ':gemfire-junit')
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/extensions/gemfire-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/EnumType.java
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/EnumType.java b/extensions/gemfire-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/EnumType.java
deleted file mode 100644
index 55b824c..0000000
--- a/extensions/gemfire-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/EnumType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* 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.
-*/
-package com.gemstone.gemfire.modules.hibernate;
-
-import java.io.Serializable;
-
-import org.hibernate.HibernateException;
-
-/**
- * Extends {@link org.hibernate.type.EnumType} so as to
- * override methods responsible for cached representation
- * of enums in hibernate.
- * This class must be used in place of {@link org.hibernate.type.EnumType}
- * in client-server topology when the application classes are
- * not available on the server.
- * e.g. a typical enum configuration should look like this:
- * <pre>
- * &lt;property name="myEnum"&gt;
- *   &lt;type name="<b>com.gemstone.gemfire.modules.hibernate.EnumType</b>"&gt;
- *     &lt;param name="enumClass"&gt;com.mycompany.MyEntity$MyEnum&lt;/param&gt;
- *     &lt;param name="type"&gt;12&lt;/param&gt;
- *   &lt;/type&gt;
- * &lt;/property&gt;
- * </pre>
- * @author sbawaska
- */
-public class EnumType extends org.hibernate.type.EnumType {
-
-  private static final long serialVersionUID = 3414902482639744676L;
-  
-  @Override
-  public Object assemble(Serializable cached, Object owner)
-      throws HibernateException {
-    String name = (String) cached;
-    Class<? extends Enum> clazz = returnedClass();
-    return Enum.valueOf(clazz, name);
-  }
-  
-  @Override
-  public Serializable disassemble(Object value) throws HibernateException {
-    return ((Enum)value).name();
-  }
-  
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6c4c2f9/extensions/gemfire-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCache.java
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCache.java b/extensions/gemfire-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCache.java
deleted file mode 100644
index 7548061..0000000
--- a/extensions/gemfire-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCache.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-* 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.
-*/
-package com.gemstone.gemfire.modules.hibernate;
-
-import java.util.Map;
-
-import org.hibernate.cache.Cache;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.Timestamper;
-
-import com.gemstone.gemfire.cache.EntryNotFoundException;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.distributed.DistributedLockService;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
-
-public class GemFireCache implements Cache {
-  private Region region;
-
-  private boolean clientRegion = false;
-
-  private final DistributedLockService distributedLockService;
-
-  public GemFireCache(Region region, DistributedLockService lockService) {
-    this.region = region;
-    this.distributedLockService = lockService;
-    this.clientRegion = isClient(region);
-  }
-
-  private boolean isClient(Region region) {
-    return region.getAttributes().getPoolName() != null;
-  }
-
-  /**
-   * Clear the cache
-   */
-  public void clear() throws CacheException {
-    GemFireCacheProvider.getLogger().info("GemFireCache: clear called");
-    region.clear();
-  }
-
-  /**
-   * Clean up
-   */
-  public void destroy() throws CacheException {
-    GemFireCacheProvider.getLogger().info("GemFireCache: destroy called");
-    region.localDestroyRegion();
-  }
-
-  /**
-   * Get an item from the cache
-   * 
-   * @param key
-   * @return the cached object or <tt>null</tt>
-   * @throws CacheException
-   */
-  public Object get(Object key) throws CacheException {
-    GemFireCacheProvider.getLogger().debug(
-        "GemFireCache: get called for: " + key);
-    try {
-      Object value = region.get(key);
-      GemFireCacheProvider.getLogger().debug(
-          "GemFireCache: retrieved: " + key + "-->" + value);
-      return value;
-    }
-    catch (com.gemstone.gemfire.cache.CacheException e) {
-      throw new CacheException(e);
-    }
-  }
-
-  /**
-   * The count of entries currently contained in the regions in-memory store.
-   * 
-   * @return The count of entries in memory; -1 if unknown or unsupported.
-   */
-  public long getElementCountInMemory() {
-    return ((LocalRegion)region).entryCount();
-  }
-
-  /**
-   * The count of entries currently contained in the regions disk store.
-   * 
-   * @return The count of entries on disk; -1 if unknown or unsupported.
-   */
-  public long getElementCountOnDisk() {
-    return -1;
-  }
-
-  /**
-   * Get the name of the cache region
-   */
-  public String getRegionName() {
-    return region.getName();
-  }
-
-  /**
-   * The number of bytes is this cache region currently consuming in memory.
-   * 
-   * @return The number of bytes consumed by this region; -1 if unknown or
-   *         unsupported.
-   */
-  public long getSizeInMemory() {
-    return -1;
-  }
-
-  /**
-   * Return the lock timeout for this cache.
-   */
-  public int getTimeout() {
-    GemFireCacheProvider.getLogger().debug("GemFireCache: getTimeout");
-    return Timestamper.ONE_MS * 60000;
-  }
-
-  /**
-   * If this is a clustered cache, lock the item
-   */
-  public void lock(Object key) throws CacheException {
-    GemFireCacheProvider.getLogger().info(
-        "GemFireCache: lock called for: " + key);
-
-    if (!clientRegion) {
-      // If we're using GLOBAL scope, we don't have to worry about
-      // locking.
-      if (!Scope.GLOBAL.equals(region.getAttributes().getScope())) {
-        this.distributedLockService.lock(key, -1, -1);
-      }
-    }
-    else {
-      // We assume the server region is GLOBAL for now. Else, use command
-      // pattern to acquire lock on the server
-      GemFireCacheProvider.getLogger().info(
-          "GemFireCache: client region, ignoring lock : " + key);
-    }
-  }
-
-  /**
-   * Generate the next timestamp
-   */
-  public long nextTimestamp() {
-    GemFireCacheProvider.getLogger().debug("GemFireCache: nextTimestamp called");
-    // TODO : Need a counter, cache-wide
-    return Timestamper.next();
-  }
-
-  /**
-   * Add an item to the cache
-   * 
-   * @param key
-   * @param value
-   * @throws CacheException
-   */
-  public void put(Object key, Object value) throws CacheException {
-    GemFireCacheProvider.getLogger().debug(
-        "GemFireCache: put called for key: " + key + "value: " + value);
-    try {
-      region.put(key, value);
-      GemFireCacheProvider.getLogger().debug(
-          "GemFireCache: put " + key + "-->" + value);
-    }
-    catch (com.gemstone.gemfire.cache.CacheException e) {
-      throw new CacheException(e);
-    }
-  }
-
-  public Object read(Object key) throws CacheException {
-    GemFireCacheProvider.getLogger().info(
-        "GemFireCache: read called for: " + key);
-    return region.get(key);
-  }
-
-  /**
-   * Remove an item from the cache
-   */
-  public void remove(Object key) throws CacheException {
-    GemFireCacheProvider.getLogger().debug(
-        "GemFireCache: remove called for: " + key);
-    try {
-      region.destroy(key);
-      GemFireCacheProvider.getLogger().debug("GemFireCache: removed: " + key);
-    }
-    catch (EntryNotFoundException e) {
-      // We can silently ignore this
-    }
-    catch (com.gemstone.gemfire.cache.CacheException e) {
-      throw new CacheException(e);
-    }
-  }
-
-  public String toString() {
-    StringBuffer buffer = new StringBuffer();
-    buffer.append("Hibernate cache on GemFire region: ");
-    buffer.append(region);
-    return buffer.toString();
-  }
-
-  /**
-   * If this is a clustered cache, unlock the item
-   */
-  public void unlock(Object key) throws CacheException {
-    GemFireCacheProvider.getLogger().info(
-        "GemFireCache: unlock called for: " + key);
-
-    if (!clientRegion) {
-      // If we're using GLOBAL scope, we don't have to worry about locking.
-      if (!Scope.GLOBAL.equals(region.getAttributes().getScope())) {
-        this.distributedLockService.unlock(key);
-      }
-    }
-    else {
-      GemFireCacheProvider.getLogger().info(
-          "GemFireCache: client region, ignoring lock : " + key);
-    }
-  }
-
-  public void update(Object key, Object value) throws CacheException {
-    GemFireCacheProvider.getLogger().info(
-        "GemFireCache: update called for: " + key);
-    this.region.put(key, value);
-  }
-
-  public Map<?, ?> toMap() {
-    return null;
-  }
-}



Mime
View raw message