Made improvements to README, example-setup, and webapp from reviews
diff --git a/sessionState/README.md b/sessionState/README.md
index 0e6488e..8fe9ccd 100644
--- a/sessionState/README.md
+++ b/sessionState/README.md
@@ -21,7 +21,9 @@
This example assumes you have Geode and Java installed. It also assumes you have local copy of Tomcat Downloaded.
It was designed and tested with Geode 1.9.0 and Tomcat 9, and while the session features will work with other combinations
-you may need to make some changes to the setup if you're using other versions.
+you may need to make some changes to the setup if you're using other versions. For more information about how to set up
+the tomcat module with your version of Tomcat and Geode see the official documentation at:
+https://geode.apache.org/docs/guide/19/tools_modules/http_session_mgmt/tomcat_installing_the_module.html
##Steps
@@ -39,11 +41,12 @@
```
3. Run the setup script:
```
-./scripts/example.sh <root directory of Geode install>
+./example-setup.sh <root directory of Geode install>
```
Specify the root directory of your local Geode installation. Make sure you have no local Geode cluster running, as this step will start
-a new local cluster to manage our Session States.
+a new local cluster to manage our Session States. This can be done by running gfsh from your geode installation and running a connect
+command with no parameters. If a cluster is found, use the shutdown command to stop the cluster before continuting.
4. Run the tomcat startup script located at $CATALINA_HOME/bin/startup.sh. You should now be able to reach the example webapp by entering
the following URL into your browser:
diff --git a/sessionState/scripts/example-setup.sh b/sessionState/scripts/example-setup.sh
index 5a85f46..1098475 100755
--- a/sessionState/scripts/example-setup.sh
+++ b/sessionState/scripts/example-setup.sh
@@ -39,9 +39,6 @@
#Unzip Tomcat Module conf/lib files into tomcats conf/lib directories
unzip -o $1/tools/Modules/Apache_Geode_Modules-1.9.0-Tomcat.zip -d $CATALINA_HOME/
-GEODE_LOCATION=${1%/}
-CATALINA_LOCATION=${CATALINA_HOME%/}
-
export CLASSPATH=$CATALINA_HOME/lib/*
sh $GEODE_LOCATION/bin/gfsh "start locator --name=l1"
diff --git a/sessionState/src/main/webapp/index.jsp b/sessionState/src/main/webapp/index.jsp
deleted file mode 100644
index 2676f89..0000000
--- a/sessionState/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,113 +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.
--->
-<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*"
-%>
-<% session=request.getSession();%>
-<html>
-
-<head>
- <title>
- </title>
-</head>
-
-<body>
-<div align="center">
- <table border="1">
- <tr>
- <td>
- Is New Session
- </td>
- <td>
- <% out.print(request.getAttribute("isNew")); %>
- </td>
- </tr>
- <tr>
- <td>
- Session Time Out
- </td>
- <td>
- <% out.println(session.getMaxInactiveInterval());%>
- </td>
- </tr>
- <tr>
- <td>
- Session Creation Time
- </td>
- <td>
- <% out.print(new Date(session.getCreationTime())); %>
- </td>
- </tr>
- <tr>
- <td>
- Session Last Accessed Time
- </td>
- <td>
- <% out.println(new Date(session.getLastAccessedTime())); %>
- </td>
- </tr>
- </table>
- <form action="" method="get">
- <table>
- <tr>
- <td>
- key:
- </td>
- <td>
- <input type="text" name="key">
- </td>
- </tr>
- <tr>
- <td>
- value:
- </td>
- <td>
- <input type="text" name="value">
- </td>
- </tr>
- <tr>
- <td>
- <input type="submit" name="action" value="Set Attribute">
- </td>
- </tr>
- </table>
- </form>
- <form action="" method="get">
- <table>
- <tr>
- <td>
- key:
- </td>
- <td>
- <input type="text" name="key">
- </td>
- </tr>
- <tr>
- <td>
- <input type="submit" name="action" value="Get Attribute" />
- </td>
- <td>
- <input type="submit" name="action" value="Delete Attribute" />
- </td>
- </tr>
- </table>
- </form>
- <p>
- result:
- <%out.println(request.getAttribute("getKey"));%>
- </p>
-</div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/sessionState/webapp/src/main/webapp/index.jsp b/sessionState/webapp/src/main/webapp/index.jsp
index 2676f89..4f90d4f 100644
--- a/sessionState/webapp/src/main/webapp/index.jsp
+++ b/sessionState/webapp/src/main/webapp/index.jsp
@@ -16,12 +16,6 @@
%>
<% session=request.getSession();%>
<html>
-
-<head>
- <title>
- </title>
-</head>
-
<body>
<div align="center">
<table border="1">
@@ -105,9 +99,9 @@
</form>
<p>
result:
- <%out.println(request.getAttribute("getKey"));%>
+ <%if(request.getAttribute("getKey") != null) {out.println(request.getAttribute("getKey"));}%>
</p>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
