From 7ce82733765bcb1ed1e3d31390ac3616b783531b Mon Sep 17 00:00:00 2001
From: mayhew64 <mayhew64@yahoo.com>
Date: Fri, 18 Sep 2015 08:39:15 -0400
Subject: [PATCH 1/3] Updated contributors and sponsors

---
 .../src/main/webapp/WEB-INF/pages/about.jsp   | 53 ++++++++++++-------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/webgoat-container/src/main/webapp/WEB-INF/pages/about.jsp b/webgoat-container/src/main/webapp/WEB-INF/pages/about.jsp
index cbf3a5fcf..eccfa5b24 100644
--- a/webgoat-container/src/main/webapp/WEB-INF/pages/about.jsp
+++ b/webgoat-container/src/main/webapp/WEB-INF/pages/about.jsp
@@ -35,40 +35,57 @@
             <div class="col-md-6">
                 <p>WebGoat Authors
                 <ul>
-                    <li>Bruce Mayhew (Project Lead)</li>
-                    <li>Jeff Williams (Original Idea)</li>
+                    <li>Bruce Mayhew   (Author & Project Lead)</li>
+                    <li>Jeff Williams  (Author & Original Idea)</li>
+                    <li>Jason White    (Architect)</li>
+                    <li>Nanne Baars    (Plugin Architecture)</li>
                     <li>Richard Lawson (Architect)</li>
-                    <li>Jason White (Architect)</li>
                 </ul>
                 </p>
             </div>
             <div class="col-md-6">
-                <p>WebGoat Design Team
+                <p>Active Contributors
                 <ul>
-                    <li>Richard Lawson</li>
-                    <li>Bruce Mayhew</li>
-                    <li>Jason White</li>
-                    <li>Ali Looney (User Interface)</li>
-                    <li>Jeff Wayman (Website and Docs)</li>
+                    <li>Nanne Baars   (Developer)</li>
+                    <li>Jason White   (Developer)</li>
+                    <li>Doug Morato   (Developer & CI)</li>
+                    <li>Jeff Wayman   (Docs)</li>
+                    <li>Bruce Mayhew  (Developer)</li>
+                    <li>Michael Dever (Developer)</li>
                 </ul>
                 </p>
             </div>
         </div>
         <div class="row">
             <div class="col-md-6">
-                <p>Active Contributors
+                <p>WebGoat Design Team (Active)
                 <ul>
-                    <li>Nanne Baars (Developer)</li>
-                    <li>Dave Cowden (Everything)</li>
-                    <li>Keith Gasser (Survey/Security)</li>
-                    <li>Devin Mayhew (Setup/Admin)</li>
-                    <li>Li Simon (Developer)</li>
+                    <li>Nanne Baars    (Plugin Architecture)</li>
+                    <li>Bruce Mayhew   (Goat Herder)</li>
+                    <li>Jeff Wayman    (Website and Docs)</li>
+                    <li>Jason White    (User Interface)</li>
                 </ul>
-                </p>
+                </p><br></br>
+                <p>Corporate Sponsorship - Companies that have donated significant time to WebGoat development
+                <ul>
+                    <li>Aspect Security</li>
+                    <li>Ounce Labs</li>
+                </ul>
+                </p><br></br>
+                <p>Did we miss you? Our sincere apologies, as we know there have
+                    been many contributors over the years. If your name does not
+                    appear in any of the lists above, please send us a note. We'll
+                    get you added with no further sacrifices required.</p>
             </div>
             <div class="col-md-6">
                 <p>Past Contributors
                 <ul>
+                    <li>Dave Cowden (Everything)</li>
+                    <li>Richard Lawson (Service Layer)</li>
+                    <li>Keith Gasser (Survey/Security)</li>
+                    <li>Devin Mayhew (Setup/Admin)</li>
+                    <li>Li Simon (Developer)</li>
+                    <li>Ali Looney (UI Design)</li>
                     <li>David Anderson (Developer/Design)</li>
                     <li>Christopher Blum (Lessons)</li>
                     <li>Laurence Casey (Graphics)</li>
@@ -88,10 +105,6 @@
                     <li>Marcel Wirth (Lessons)</li>
                 </ul>
                 </p>
-                <p>Did we miss you? Our sincere apologies, as we know there have
-                    been many contributors over the years. If your name does not
-                    appear in any of the lists above, please send us a note. We'll
-                    get you added with no further sacrifices required.</p>
             </div>
         </div>
     </div>

From 5365f632e7d2277fa024b5a0863654c416c0b3bc Mon Sep 17 00:00:00 2001
From: mayhew64 <mayhew64@yahoo.com>
Date: Fri, 18 Sep 2015 13:30:32 -0400
Subject: [PATCH 2/3] Added a lesson restart call to allow lesson specific
 restart functionality

---
 .../java/org/owasp/webgoat/lessons/AbstractLesson.java    | 5 +++++
 .../java/org/owasp/webgoat/lessons/LessonAdapter.java     | 8 ++++++++
 .../main/java/org/owasp/webgoat/session/WebSession.java   | 1 +
 3 files changed, 14 insertions(+)

diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index 45bfea76f..dcc4f7cdb 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -201,6 +201,11 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
 
     protected abstract Category getDefaultCategory();
 
+    /**
+     * Initiates lesson restart functionality
+     */
+    public abstract void restartLesson();
+
     protected abstract boolean getDefaultHidden();
 
     /**
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
index 83258c855..5107576de 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
@@ -108,6 +108,14 @@ public abstract class LessonAdapter extends AbstractLesson {
         return false;
     }
 
+    /**
+     * Initiates lesson restart functionality. Lessons should override this for 
+     * lesson specific actions 
+     */
+    public void restartLesson() {
+        // Do Nothing - called when restart lesson is pressed. Each lesson can do something
+    }
+    
     private final static Integer DEFAULT_RANKING = new Integer(1000);
 
     protected Integer getDefaultRanking() {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
index 879c3af03..375ff5921 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
@@ -949,6 +949,7 @@ public class WebSession {
     public void restartLesson(int lessonId) {
         AbstractLesson al = getLesson(lessonId);
         System.out.println("Restarting lesson: " + al);
+        al.restartLesson();
         al.getLessonTracker(this).setCompleted(false);
         if (al instanceof SequentialLessonAdapter) {
             SequentialLessonAdapter sla = (SequentialLessonAdapter) al;

From 1e860928e689e9dc88da96daaebb5713aeb39769 Mon Sep 17 00:00:00 2001
From: mayhew64 <mayhew64@yahoo.com>
Date: Fri, 18 Sep 2015 15:30:17 -0400
Subject: [PATCH 3/3] Revert "Added a lesson restart call to allow lesson
 specific restart functionality"

This reverts commit 5365f632e7d2277fa024b5a0863654c416c0b3bc.
---
 .../java/org/owasp/webgoat/lessons/AbstractLesson.java    | 5 -----
 .../java/org/owasp/webgoat/lessons/LessonAdapter.java     | 8 --------
 .../main/java/org/owasp/webgoat/session/WebSession.java   | 1 -
 3 files changed, 14 deletions(-)

diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index dcc4f7cdb..45bfea76f 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -201,11 +201,6 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
 
     protected abstract Category getDefaultCategory();
 
-    /**
-     * Initiates lesson restart functionality
-     */
-    public abstract void restartLesson();
-
     protected abstract boolean getDefaultHidden();
 
     /**
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
index 5107576de..83258c855 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
@@ -108,14 +108,6 @@ public abstract class LessonAdapter extends AbstractLesson {
         return false;
     }
 
-    /**
-     * Initiates lesson restart functionality. Lessons should override this for 
-     * lesson specific actions 
-     */
-    public void restartLesson() {
-        // Do Nothing - called when restart lesson is pressed. Each lesson can do something
-    }
-    
     private final static Integer DEFAULT_RANKING = new Integer(1000);
 
     protected Integer getDefaultRanking() {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
index 375ff5921..879c3af03 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
@@ -949,7 +949,6 @@ public class WebSession {
     public void restartLesson(int lessonId) {
         AbstractLesson al = getLesson(lessonId);
         System.out.println("Restarting lesson: " + al);
-        al.restartLesson();
         al.getLessonTracker(this).setCompleted(false);
         if (al instanceof SequentialLessonAdapter) {
             SequentialLessonAdapter sla = (SequentialLessonAdapter) al;