GEODE-917: rename gemfire subprojects to geode

Rename the gemfire-* subdirectories to geode-*.  This has the effect
of changing the maven published artifacts as well.  For example,

gemfire-core-1.0.0-incubating.M2-SNAPSHOT.jar

is now

geode-core-1.0.0-incubating.M2-SNAPSHOT.jar

Also took the opportunity to rename gemfire-core-dependencies.jar
to geode-dependencies.jar.

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
 

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

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'
 }
 

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:

extensions/gemfire-modules-assembly/build.gradle → extensions/geode-modules-assembly/build.gradle

@@ -49,91 +49,91 @@ 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')
+  into('geode-cs/lib') {
+    from getJarArtifact(':extensions/geode-modules')
+    from getJarArtifact(':extensions/geode-modules-tomcat7')
     from configurations.slf4jDeps
   }
-  into('gemfire-cs/bin') {
+  into('geode-cs/bin') {
     from('release/scripts') {
       include '*'
     }
-    from('release/tcserver/gemfire-cs') {
+    from('release/tcserver/geode-cs') {
       include 'modules.env'
     }
     filter(ReplaceTokens, tokens:['GEMFIRE_MODULES_VERSION': version])
   }
-  into('gemfire-cs/conf') {
+  into('geode-cs/conf') {
     from('release/conf') {
       exclude 'cache-peer.xml'
     }
-    from('release/tcserver/gemfire-cs') {
+    from('release/tcserver/geode-cs') {
       include 'context-fragment.xml'
       include 'server-fragment.xml'
     }
   }
-  into('gemfire-cs') {
-    from('release/tcserver/gemfire-cs') {
+  into('geode-cs') {
+    from('release/tcserver/geode-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') {
+  into('geode-cs-tomcat-7/conf') {
+    from('release/tcserver/geode-cs-tomcat-7') {
       include 'context-fragment.xml'
     }
   }
-  into('gemfire-cs-tomcat-7/bin') {
-    from('release/tcserver/gemfire-cs-tomcat-7') {
+  into('geode-cs-tomcat-7/bin') {
+    from('release/tcserver/geode-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')
+  into('geode-p2p/lib') {
+    from getJarArtifact(':extensions/geode-modules')
+    from getJarArtifact(':extensions/geode-modules-tomcat7')
     from configurations.slf4jDeps
     from('release/3rdparty_license') {
       include "open_source_licenses*${version}.txt"
     }
   }
-  into('gemfire-p2p/bin') {
+  into('geode-p2p/bin') {
     from('release/scripts') {
       include 'gemfire.*'
       include 'setenv.properties'
     }
-    from('release/tcserver/gemfire-p2p') {
+    from('release/tcserver/geode-p2p') {
       include 'modules.env'
     }
   }
-  into('gemfire-p2p/conf') {
+  into('geode-p2p/conf') {
     from('release/conf') {
       include 'cache-peer.xml'
     }
-    from('release/tcserver/gemfire-p2p') {
+    from('release/tcserver/geode-p2p') {
       include 'context-fragment.xml'
       include 'server-fragment.xml'
     }
   }
-  into('gemfire-p2p') {
-    from('release/tcserver/gemfire-p2p') {
+  into('geode-p2p') {
+    from('release/tcserver/geode-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') {
+  into('geode-p2p-tomcat-7/conf') {
+    from('release/tcserver/geode-p2p-tomcat-7') {
       include 'context-fragment.xml'
     }
   }
-  into('gemfire-p2p-tomcat-7/bin') {
-    from('release/tcserver/gemfire-p2p-tomcat-7') {
+  into('geode-p2p-tomcat-7/bin') {
+    from('release/tcserver/geode-p2p-tomcat-7') {
       include 'modules.env'
     }
   }
@@ -142,36 +142,36 @@ def configureTcServerAssembly = {
 def configureTcServer30Assembly = {
   archiveName = "Apache_Geode_Modules-${version}-tcServer30.zip"
 
-  into('gemfire-cs-tomcat-8/bin') {
-    from('release/tcserver/gemfire-cs-tomcat-8') {
+  into('geode-cs-tomcat-8/bin') {
+    from('release/tcserver/geode-cs-tomcat-8') {
       include 'modules.env'
     }
   }
-  into('gemfire-cs-tomcat-8/conf') {
-    from('release/tcserver/gemfire-cs-tomcat-8') {
+  into('geode-cs-tomcat-8/conf') {
+    from('release/tcserver/geode-cs-tomcat-8') {
       include 'context-fragment.xml'
     }
   }
 
-  into('gemfire-p2p-tomcat-8/bin') {
-    from('release/tcserver/gemfire-p2p-tomcat-8') {
+  into('geode-p2p-tomcat-8/bin') {
+    from('release/tcserver/geode-p2p-tomcat-8') {
       include 'modules.env'
     }
   }
-  into('gemfire-p2p-tomcat-8/conf') {
-    from('release/tcserver/gemfire-p2p-tomcat-8') {
+  into('geode-p2p-tomcat-8/conf') {
+    from('release/tcserver/geode-p2p-tomcat-8') {
       include 'context-fragment.xml'
     }
   }
 }
 
-task distTomcat(type: Zip, dependsOn: ':extensions/gemfire-modules:build') {
+task distTomcat(type: Zip, dependsOn: ':extensions/geode-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 getJarArtifact(':extensions/geode-modules')
+    from getJarArtifact(':extensions/geode-modules-tomcat7')
     from configurations.slf4jDeps
   }
   into('bin') {
@@ -187,21 +187,21 @@ task distTomcat(type: Zip, dependsOn: ':extensions/gemfire-modules:build') {
   }
 }
 
-task distHibernate(type: Zip, dependsOn: ':extensions/gemfire-modules-hibernate:build') {
+task distHibernate(type: Zip, dependsOn: ':extensions/geode-modules-hibernate:build') {
   archiveName = "Apache_Geode_Modules-${version}-Hibernate.zip"
 
   into('lib') {
-    from getJarArtifact(':extensions/gemfire-modules')
-    from getJarArtifact(':extensions/gemfire-modules-hibernate')
+    from getJarArtifact(':extensions/geode-modules')
+    from getJarArtifact(':extensions/geode-modules-hibernate')
   }
 }
 
-task distAppServer(type: Zip, dependsOn: ':extensions/gemfire-modules-session:build') {
+task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:build') {
   archiveName = "Apache_Geode_Modules-${version}-AppServer.zip"
 
   into('lib') {
-    from getJarArtifact(':extensions/gemfire-modules')
-    from getJarArtifact(':extensions/gemfire-modules-session')
+    from getJarArtifact(':extensions/geode-modules')
+    from getJarArtifact(':extensions/geode-modules-session')
     from configurations.slf4jDeps
     from configurations.servletApiDeps
   }
@@ -225,11 +225,11 @@ task distAppServer(type: Zip, dependsOn: ':extensions/gemfire-modules-session:bu
   }
 }
 
-task distTcServer(type: Zip, dependsOn: [':extensions/gemfire-modules:build', ':extensions/gemfire-modules-tomcat7:build']) {
+task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:build', ':extensions/geode-modules-tomcat7:build']) {
   configure(configureTcServerAssembly)
 }
 
-task distTcServer30(type: Zip, dependsOn: [':extensions/gemfire-modules:build', ':extensions/gemfire-modules-tomcat7:build']) {
+task distTcServer30(type: Zip, dependsOn: [':extensions/geode-modules:build', ':extensions/geode-modules-tomcat7:build']) {
   configure(configureTcServerAssembly)
   configure(configureTcServer30Assembly)
 }

extensions/gemfire-modules-assembly/release/scripts/cacheserver.bat → extensions/geode-modules-assembly/release/scripts/cacheserver.bat

@@ -74,10 +74,10 @@ 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
+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\gemfire-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
@@ -111,7 +111,7 @@ 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
+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

extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh → extensions/geode-modules-assembly/release/scripts/cacheserver.sh

@@ -73,15 +73,15 @@ if [ "x$WINDIR" != "x" ]; then
   exit 1
 fi
 
-GEMFIRE_DEP_JAR=$GEMFIRE/lib/gemfire-core-dependencies.jar
+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/gemfire-modules-?.*.jar` 2>/dev/null
+MOD_JAR=`ls $GEMFIRE/lib/geode-modules-?.*.jar` 2>/dev/null
 if [ -z "$MOD_JAR" ]; then
-  MOD_JAR=$GEMFIRE/lib/gemfire-modules.jar
+  MOD_JAR=$GEMFIRE/lib/geode-modules.jar
 fi
 
 # Add Tomcat classes

extensions/gemfire-modules-assembly/release/scripts/gemfire.sh → extensions/geode-modules-assembly/release/scripts/gemfire.sh

@@ -27,7 +27,7 @@ if [ "x$WINDIR" != "x" ]; then
   exit 1
 fi
 
-GEMFIRE_DEP_JAR=$GEMFIRE/lib/gemfire-core-dependencies.jar
+GEMFIRE_DEP_JAR=$GEMFIRE/lib/geode-dependencies.jar
 if [ ! -f "$GEMFIRE_DEP_JAR" ]; then
   echo "ERROR: Could not determine GEMFIRE location."
   exit 1

extensions/gemfire-modules-assembly/release/session/bin/cacheserver.bat → extensions/geode-modules-assembly/release/session/bin/cacheserver.bat

@@ -31,9 +31,9 @@ goto done
 :gfok
 
 REM Initialize classpath
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-modules-@[email protected]
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-modules-session-@[email protected]
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-modules-session-external-@[email protected]
+set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-@[email protected]
+set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-session-@[email protected]
+set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-session-external-@[email protected]
 set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\servlet-api-@[email protected]
 set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\slf4j-api-@[email protected]
 set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\slf4j-jdk14-@[email protected]

extensions/gemfire-modules-assembly/release/session/bin/cacheserver.sh → extensions/geode-modules-assembly/release/session/bin/cacheserver.sh

@@ -40,10 +40,10 @@ 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-@[email protected] \
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/gemfire-modules-session-@[email protected] \
+GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-@[email protected] \
+GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-session-@[email protected] \
 GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/servlet-api-@[email protected] \
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/gemfire-modules-session-external-@[email protected] \
+GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-session-external-@[email protected] \
 GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/slf4j-api-@[email protected] \
 GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/slf4j-jdk14-@[email protected]
 

extensions/gemfire-modules-assembly/release/session/bin/gemfire.bat → extensions/geode-modules-assembly/release/session/bin/gemfire.bat

@@ -31,9 +31,9 @@ goto done
 :gfok
 
 REM Initialize classpath
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-modules-@[email protected]
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-modules-session-@[email protected]
-set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\gemfire-modules-session-external-@[email protected]
+set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-@[email protected]
+set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-session-@[email protected]
+set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\geode-modules-session-external-@[email protected]
 set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\servlet-api-@[email protected]
 set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\slf4j-api-@[email protected]
 set GEMFIRE_JARS=%GEMFIRE_JARS%;%gf%\lib\slf4j-jdk14-@[email protected]

extensions/gemfire-modules-assembly/release/session/bin/gemfire.sh → extensions/geode-modules-assembly/release/session/bin/gemfire.sh

@@ -39,9 +39,9 @@ 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-@[email protected]
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/gemfire-modules-session-@[email protected]
-GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/gemfire-modules-session-external-@[email protected]
+GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-@[email protected]
+GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-session-@[email protected]
+GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/geode-modules-session-external-@[email protected]
 GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/servlet-api-@[email protected]
 GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/slf4j-api-@[email protected]
 GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/lib/slf4j-jdk14-@[email protected]

extensions/gemfire-modules-assembly/release/session/bin/modify_war → extensions/geode-modules-assembly/release/session/bin/modify_war

@@ -19,13 +19,13 @@ X=`dirname $0`
 EXE_DIR=`cd $X; pwd`
 LIB_DIR=`cd ${X}/../lib; pwd`
 
-SESSION_JAR="${LIB_DIR}/gemfire-modules-session-external-@[email protected]"
+SESSION_JAR="${LIB_DIR}/geode-modules-session-external-@[email protected]"
 
 declare -a OTHER_JARS
 OTHER_JARS=(${LIB_DIR}/gemfire.jar \
     ${LIB_DIR}/antlr.jar
-    ${LIB_DIR}/gemfire-modules-@[email protected] \
-    ${LIB_DIR}/gemfire-modules-session-@[email protected] \
+    ${LIB_DIR}/geode-modules-@[email protected] \
+    ${LIB_DIR}/geode-modules-session-@[email protected] \
     ${LIB_DIR}/slf4j-api-@[email protected])
 
 # This is required for GemFire 8.1
@@ -112,19 +112,19 @@ WHERE <args>:
                     provided:
                         slf4j-jdk14
                         slf4j-log4j12
-                        gemfire-modules-slf4j-weblogic
+                        geode-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
+                        geode-modules.jar
+                        geode-modules-session.jar
                         slf4j-api.jar
                         slf4j-jdk14.jar (not for WebLogic)
-                        gemfire-modules-slf4j-weblogic.jar (WebLogic only)
+                        geode-modules-slf4j-weblogic.jar (WebLogic only)
                     This option still modifes any web.xml files.
                         
 EOF