From 243d88b6d16479740caddc020085bf000c23ebdb Mon Sep 17 00:00:00 2001
From: rlawson <rlawson@rlawson-HP>
Date: Sun, 24 Aug 2014 13:46:02 -0400
Subject: [PATCH] fix missing sources, pom was not copying source into
 WEB-INF/classes some cleanup and better logging while I was in there

---
 pom.xml                                       | 42 +++++++++++--------
 .../owasp/webgoat/lessons/AbstractLesson.java | 10 +++--
 .../org/owasp/webgoat/session/Course.java     | 15 ++++---
 .../org/owasp/webgoat/session/WebSession.java |  2 +-
 4 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 883f265c5..c8221222e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,14 @@
     </properties>
 
     <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/java</directory>
+            </resource>
+                        <resource>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -33,23 +41,23 @@
                 </configuration>
             </plugin>
             <plugin>
-              <groupId>org.apache.tomcat.maven</groupId>
-              <artifactId>tomcat7-maven-plugin</artifactId>
-              <version>2.1</version>
-              <executions>
-                <execution>
-                  <id>tomcat-run</id>
-                  <goals>
-                    <goal>exec-war-only</goal>
-                  </goals>
-                  <phase>package</phase>
-                  <configuration>
-                    <url>http://localhost:8080/manager</url>
-                    <path>/WebGoat</path>
-                    <attachArtifactClassifier>exec</attachArtifactClassifier>
-                  </configuration>
-                </execution>
-              </executions>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.1</version>
+                <executions>
+                    <execution>
+                        <id>tomcat-run</id>
+                        <goals>
+                            <goal>exec-war-only</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <url>http://localhost:8080/manager</url>
+                            <path>/WebGoat</path>
+                            <attachArtifactClassifier>exec</attachArtifactClassifier>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>            
         </plugins>
     </build>
diff --git a/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index f1b64b33a..3d575a476 100644
--- a/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -30,6 +30,8 @@ import org.owasp.webgoat.session.Screen;
 import org.owasp.webgoat.session.WebSession;
 import org.owasp.webgoat.session.WebgoatContext;
 import org.owasp.webgoat.session.WebgoatProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * *************************************************************************************************
@@ -66,6 +68,8 @@ import org.owasp.webgoat.session.WebgoatProperties;
  */
 public abstract class AbstractLesson extends Screen implements Comparable<Object> {
 
+    final Logger logger = LoggerFactory.getLogger(AbstractLesson.class);
+
     /**
      * Description of the Field
      */
@@ -496,8 +500,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
         String src;
 
         try {
-            // System.out.println("Loading source file: " +
-            // getSourceFileName());
+            logger.debug("Loading source file: " + getSourceFileName());
             src = readFromFile(new BufferedReader(new FileReader(s.getWebResource(getSourceFileName()))), true);
 
         } catch (FileNotFoundException e) {
@@ -782,8 +785,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
     }
 
     public void setSourceFileName(String sourceFileName) {
-        // System.out.println("Setting source file of lesson " + this + " to: "
-        // + sourceFileName);
+        logger.debug("Setting source file of lesson " + this + " to: " + sourceFileName);
         this.sourceFileName = sourceFileName;
     }
 
diff --git a/src/main/java/org/owasp/webgoat/session/Course.java b/src/main/java/org/owasp/webgoat/session/Course.java
index 5f32470f0..35c6829ed 100644
--- a/src/main/java/org/owasp/webgoat/session/Course.java
+++ b/src/main/java/org/owasp/webgoat/session/Course.java
@@ -346,32 +346,35 @@ public class Course {
      */
     private void loadResources() {
         for (AbstractLesson lesson : lessons) {
+            logger.info("Loading resources for lesson -> " + lesson.getName());
             String className = lesson.getClass().getName();
             String classFile = getSourceFile(className);
+            logger.info("Lesson classname: " + className);
+            logger.info("Lesson java file: " + classFile);
 
             for (String absoluteFile : files) {
                 String fileName = getFileName(absoluteFile);
-                logger.debug("Course: looking at file: " + absoluteFile);
+                //logger.debug("Course: looking at file: " + absoluteFile);
 
                 if (absoluteFile.endsWith(classFile)) {
-                    // System.out.println("Set source file for " + classFile);
+                    logger.info("Set source file for " + classFile);
                     lesson.setSourceFileName(absoluteFile);
                 }
 
                 if (absoluteFile.startsWith("/lesson_plans") && absoluteFile.endsWith(".html")
                         && className.endsWith(fileName)) {
-                    logger.debug("DEBUG: setting lesson plan file " + absoluteFile + " for lesson "
+                    logger.info("setting lesson plan file " + absoluteFile + " for lesson "
                             + lesson.getClass().getName());
-                    logger.debug("fileName: " + fileName + " == className: " + className);
+                    logger.info("fileName: " + fileName + " == className: " + className);
                     String language = getLanguageFromFileName("/lesson_plans", absoluteFile);
                     lesson.setLessonPlanFileName(language, absoluteFile);
                     WebGoatI18N.loadLanguage(language);
                 }
                 if (absoluteFile.startsWith("/lesson_solutions") && absoluteFile.endsWith(".html")
                         && className.endsWith(fileName)) {
-                    logger.debug("DEBUG: setting lesson solution file " + absoluteFile + " for lesson "
+                    logger.info("setting lesson solution file " + absoluteFile + " for lesson "
                             + lesson.getClass().getName());
-                    logger.debug("fileName: " + fileName + " == className: " + className);
+                    logger.info("fileName: " + fileName + " == className: " + className);
                     lesson.setLessonSolutionFileName(absoluteFile);
                 }
             }
diff --git a/src/main/java/org/owasp/webgoat/session/WebSession.java b/src/main/java/org/owasp/webgoat/session/WebSession.java
index a9c92896f..6a0950885 100644
--- a/src/main/java/org/owasp/webgoat/session/WebSession.java
+++ b/src/main/java/org/owasp/webgoat/session/WebSession.java
@@ -219,7 +219,7 @@ public class WebSession {
     /**
      * Constructor for the WebSession object
      *
-     * @param servlet Description of the Parameter
+     * @param webgoatContext
      * @param context Description of the Parameter
      */
     public WebSession(WebgoatContext webgoatContext, ServletContext context) {