From 61541c7fd83d8844e65f8bb18e0942354c2bf0ab Mon Sep 17 00:00:00 2001 From: Zachary Kjellberg Date: Thu, 26 Jan 2017 15:46:09 -0500 Subject: [PATCH 1/4] Fixed catalina binary references at end of guide --- README.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 839d4bc..4244e7a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ Run the following from your `~/workspace/tomcat-mysql-c9` directory. ``` ./setupTomcat.sh - ``` ## Building Java classes @@ -40,7 +39,6 @@ Run the following from your `~/workspace/tomcat-mysql-c9` directory. Once the Tomcat script is run, the `survey.war` file is deployed to `./tomcat/webapps` and as the Survey site is requested, Tomcat extracts the WAR file. - ## Make sure you "Run" the site so it expands.. 1. Choose "preview" from C9.io interface @@ -56,9 +54,6 @@ requested, Tomcat extracts the WAR file. ![img4](./img/4.png) - - - ## once the site is run, Tomcat 'expands' the `survey.war` file This WAR file contains all the content, JSP, Class - and the Java source files. @@ -91,10 +86,8 @@ Recompile, then restart Tomcat... ```bash ./buildJava.sh ./tomcat/bin/catalina.sh stop -./tomcat/bin/cataling.sh start +./tomcat/bin/catalina.sh start ``` - -Note: JSP files if changes are immediately reprocessed and reflected within Tomcat. -Class files, sourced from Java files, requires a "restart" of Tomcat - that is what the `./tomcat/bin/cataling stop/start` provides. - +Note: JSP file changes are immediately reprocessed and reflected within Tomcat. +Class files, sourced from Java files, requires a "restart" of Tomcat - that is what the `./tomcat/bin/catalina.sh stop/start` provides. From 4cbc2ef3e2c8fc079a8b954e35d823a33e77de43 Mon Sep 17 00:00:00 2001 From: Zachary Kjellberg Date: Thu, 26 Jan 2017 15:46:49 -0500 Subject: [PATCH 2/4] Removed whitespace --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 4244e7a..62fcbbb 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ Call it whatever you like, but choose "Custom". git clone https://github.com/cs612-f15/tomcat-mysql-c9.git cd tomcat-mysql-c9 - ``` ## Setting up MySQL From 6a37b646768b5180b40cff2724eafe62639f8400 Mon Sep 17 00:00:00 2001 From: Zachary Kjellberg Date: Thu, 26 Jan 2017 15:48:08 -0500 Subject: [PATCH 3/4] Fixed a newLine --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62fcbbb..c60e440 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,7 @@ Run the following from your `~/workspace/tomcat-mysql-c9` directory. ## Building Java classes -Once the Tomcat script is run, the `survey.war` file is deployed to `./tomcat/webapps` and as the Survey site is -requested, Tomcat extracts the WAR file. +Once the Tomcat script is run, the `survey.war` file is deployed to `./tomcat/webapps` and as the Survey site is requested, Tomcat extracts the WAR file. ## Make sure you "Run" the site so it expands.. @@ -89,4 +88,5 @@ Recompile, then restart Tomcat... ``` Note: JSP file changes are immediately reprocessed and reflected within Tomcat. + Class files, sourced from Java files, requires a "restart" of Tomcat - that is what the `./tomcat/bin/catalina.sh stop/start` provides. From 2d2531e644a25878a509e75239aeb4476abd3ee6 Mon Sep 17 00:00:00 2001 From: Zachary Kjellberg Date: Thu, 26 Jan 2017 15:56:23 -0500 Subject: [PATCH 4/4] Switched order of start Tomcat and View Website --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index c60e440..9bf26d1 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,19 @@ Run the following from your `~/workspace/tomcat-mysql-c9` directory. Once the Tomcat script is run, the `survey.war` file is deployed to `./tomcat/webapps` and as the Survey site is requested, Tomcat extracts the WAR file. -## Make sure you "Run" the site so it expands.. +## When you start Tomcat, it 'expands' the `survey.war` file + +This WAR file contains all the content, JSP, Class - and the Java source files. + +A helper script allows you build `*.java` source files, then build, then restart tomcat. + +``` +./buildJava.sh +./tomcat/bin/catalina.sh stop +./tomcat/bin/cataling.sh start +``` + +## To view the website 1. Choose "preview" from C9.io interface 2. Preview Running application @@ -52,18 +64,6 @@ Once the Tomcat script is run, the `survey.war` file is deployed to `./tomcat/we ![img4](./img/4.png) -## once the site is run, Tomcat 'expands' the `survey.war` file - -This WAR file contains all the content, JSP, Class - and the Java source files. - -A helper script allows you build `*.java` source files, then build, then restart tomcat. - -``` -./buildJava.sh -./tomcat/bin/catalina.sh stop -./tomcat/bin/cataling.sh start -``` - # Important - Update the UserName Password Go into the `./tomcat/webapps/survey/WEB-INF/classes/survey/DatabaseAccess.java` file