From 96983fda7ad627f1118522ea010959d2a6006796 Mon Sep 17 00:00:00 2001 From: openalm Date: Wed, 12 Aug 2015 16:28:15 +0530 Subject: [PATCH 01/15] Updated index.jsp modified pricing --- TheCoffeeShop3.0/WebContent/index.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 0239549..b19fc29 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -36,7 +36,7 @@

Cappuccino

-

$3.55

+

$3.75

Cappuccino

@@ -123,4 +123,4 @@ - \ No newline at end of file + From 009514619100b764aeea0357b2774073fdea057b Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 12 Aug 2015 18:47:20 +0530 Subject: [PATCH 02/15] ronai: updated pricing --- TheCoffeeShop3.0/WebContent/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index b19fc29..9dd1edf 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -36,7 +36,7 @@

Cappuccino

-

$3.75

+

$3.85

Cappuccino

From 27c9f4c0a3231d3651c9bf8270522311c3e0bd31 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 12 Aug 2015 20:13:07 +0530 Subject: [PATCH 03/15] Price refined --- TheCoffeeShop3.0/WebContent/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 9dd1edf..12eed8e 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -36,7 +36,7 @@

Cappuccino

-

$3.85

+

$3.45

Cappuccino

From 54182398c8e825ed26b838ef548641569e7c6a05 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 12 Aug 2015 20:27:47 +0530 Subject: [PATCH 04/15] index.jsp Added sign up link --- TheCoffeeShop3.0/WebContent/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 12eed8e..6ee732d 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -24,6 +24,7 @@
  • About Us
  • Shopping Cart
  • Contact Us
    • +
  • Sign up
    • From e656361c8994b414facd289f46004013b7243776 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 12 Aug 2015 21:47:56 +0530 Subject: [PATCH 05/15] reverted sign-up --- TheCoffeeShop3.0/WebContent/index.jsp | 1 - 1 file changed, 1 deletion(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 6ee732d..12eed8e 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -24,7 +24,6 @@
  • About Us
  • Shopping Cart
  • Contact Us
    • -
  • Sign up
    • From 960f4821863359f9b9ef493a8a60451996590595 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 12 Aug 2015 23:02:33 +0530 Subject: [PATCH 06/15] fixed a local link --- TheCoffeeShop3.0/WebContent/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 12eed8e..fed22a2 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -16,7 +16,7 @@

    - Coffee Shop + Coffee Shop

    From 8337d35e9829d8126f14700ad01d4b1ae7657113 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Thu, 13 Aug 2015 10:45:13 +0530 Subject: [PATCH 08/15] Changes to links --- TheCoffeeShop3.0/WebContent/index.jsp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 0ad245c..f52e844 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -22,8 +22,7 @@
    From 3f04b54817330ca07964f5bead97c58748eeb13b Mon Sep 17 00:00:00 2001 From: openalm Date: Thu, 13 Aug 2015 11:47:46 +0530 Subject: [PATCH 09/15] Removed unnecessary deployment steps removed line sudo apt-get -y update --- TheCoffeeShop3.0/Deploy/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TheCoffeeShop3.0/Deploy/deploy.sh b/TheCoffeeShop3.0/Deploy/deploy.sh index 15a9adf..94af04d 100644 --- a/TheCoffeeShop3.0/Deploy/deploy.sh +++ b/TheCoffeeShop3.0/Deploy/deploy.sh @@ -1,5 +1,5 @@ #!/bin/bash -sudo apt-get -y update + sudo apt-get -y install default-jre sudo apt-get -y install tomcat7 sudo cp TheCoffeeShop.war /var/lib/tomcat7/webapps/ From e96d1b984eff0897bdb9e86cd635aa3f6555b855 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Thu, 13 Aug 2015 16:32:06 +0530 Subject: [PATCH 10/15] New sign in link --- TheCoffeeShop3.0/WebContent/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index f52e844..2a74adb 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -23,6 +23,7 @@
  • Home
  • About Us
  • Contact Us
    • +
  • Sign in
    • From 1945a25d2013b84467a70bc5f931e394d78a36d0 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Tue, 18 Aug 2015 14:22:58 +0530 Subject: [PATCH 11/15] Fixed links --- TheCoffeeShop3.0/WebContent/index.jsp | 1 - 1 file changed, 1 deletion(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 2a74adb..f52e844 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -23,7 +23,6 @@
  • Home
  • About Us
  • Contact Us
    • -
  • Sign in
    • From fb7c8ea04505aa122d5def14f68507924c294d0e Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 19 Aug 2015 12:02:14 +0530 Subject: [PATCH 12/15] Added sign-in link --- TheCoffeeShop3.0/WebContent/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index f52e844..2a74adb 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -23,6 +23,7 @@
  • Home
  • About Us
  • Contact Us
    • +
  • Sign in
    • From 3e4b03b335af107b210770f7c38b315643d2878b Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 19 Aug 2015 14:21:04 +0530 Subject: [PATCH 13/15] Changes to links --- TheCoffeeShop3.0/WebContent/index.jsp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 2a74adb..90ab663 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -21,9 +21,7 @@
    From 524390f4d73ae3ad14ceb26e632ef32a25578759 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 19 Aug 2015 14:24:34 +0530 Subject: [PATCH 14/15] Contact us link --- TheCoffeeShop3.0/WebContent/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 90ab663..44ead9d 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -21,7 +21,7 @@
    From 74a1f3694161bd7d52c740ee1ee511b722a541d5 Mon Sep 17 00:00:00 2001 From: "devopsdemos@outlook.com" Date: Wed, 19 Aug 2015 17:26:38 +0530 Subject: [PATCH 15/15] ronai: added sign-in link added sigin-in link --- TheCoffeeShop3.0/WebContent/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/TheCoffeeShop3.0/WebContent/index.jsp b/TheCoffeeShop3.0/WebContent/index.jsp index 44ead9d..571e249 100644 --- a/TheCoffeeShop3.0/WebContent/index.jsp +++ b/TheCoffeeShop3.0/WebContent/index.jsp @@ -22,6 +22,7 @@