Refactor everything to be just in the owasp.benchmark project.

Author: davewichers

pom.xml

@@ -1,22 +1,22 @@
 /**
-* OWASP WebGoat Benchmark Edition (WBE)
+* OWASP Benchmark Project
 *
 * This file is part of the Open Web Application Security Project (OWASP)
-* WebGoat Benchmark Edition (WBE) project. For details, please see
-* <a href="https://www.owasp.org/index.php/WBE">https://www.owasp.org/index.php/WBE</a>.
+* Benchmark Project. For details, please see
+* <a href="https://www.owasp.org/index.php/Benchmark">https://www.owasp.org/index.php/Benchmark</a>.
 *
-* The WBE is free software: you can redistribute it and/or modify it under the terms
+* The Benchmark is free software: you can redistribute it and/or modify it under the terms
 * of the GNU General Public License as published by the Free Software Foundation, version 2.
 *
-* The WBE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+* The Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
 * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details
 *
 * @author Juan Gama <a href="https://www.aspectsecurity.com">Aspect Security</a>
 * @created 2015
 */
 
-package org.owasp.webgoat.benchmark.helpers;
+package org.owasp.benchmark.helpers;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

src/main/java/org/owasp/webgoat/benchmark/helpers/DatabaseHelper.java

@@ -1,22 +1,22 @@
 /**
-* OWASP WebGoat Benchmark Edition (WBE)
+* OWASP Benchmark Project
 *
 * This file is part of the Open Web Application Security Project (OWASP)
-* WebGoat Benchmark Edition (WBE) project. For details, please see
-* <a href="https://www.owasp.org/index.php/WBE">https://www.owasp.org/index.php/WBE</a>.
+* Benchmark Project. For details, please see
+* <a href="https://www.owasp.org/index.php/Benchmark">https://www.owasp.org/index.php/Benchmark</a>.
 *
-* The WBE is free software: you can redistribute it and/or modify it under the terms
+* The Benchmark is free software: you can redistribute it and/or modify it under the terms
 * of the GNU General Public License as published by the Free Software Foundation, version 2.
 *
-* The WBE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+* The Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
 * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details
 *
 * @author Juan Gama <a href="https://www.aspectsecurity.com">Aspect Security</a>
 * @created 2015
 */
 
-package org.owasp.webgoat.benchmark.helpers;
+package org.owasp.benchmark.helpers;
 
 import java.util.Map;
 

src/main/java/org/owasp/webgoat/benchmark/helpers/ExpressionEvaluator.java

@@ -1,22 +1,22 @@
 /**
-* OWASP WebGoat Benchmark Edition (WBE)
+* OWASP Benchmark Project
 *
 * This file is part of the Open Web Application Security Project (OWASP)
-* WebGoat Benchmark Edition (WBE) project. For details, please see
-* <a href="https://www.owasp.org/index.php/WBE">https://www.owasp.org/index.php/WBE</a>.
+* Benchmark Project. For details, please see
+* <a href="https://www.owasp.org/index.php/Benchmark">https://www.owasp.org/index.php/Benchmark</a>.
 *
-* The WBE is free software: you can redistribute it and/or modify it under the terms
+* The Benchmark is free software: you can redistribute it and/or modify it under the terms
 * of the GNU General Public License as published by the Free Software Foundation, version 2.
 *
-* The WBE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+* The Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
 * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details
 *
 * @author Dave Wichers <a href="https://www.aspectsecurity.com">Aspect Security</a>
 * @created 2015
 */
 
-package org.owasp.webgoat.benchmark.helpers;
+package org.owasp.benchmark.helpers;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;

src/main/java/org/owasp/webgoat/benchmark/helpers/SeparateClassRequest.java

@@ -1,22 +1,22 @@
 /**
-* OWASP WebGoat Benchmark Edition (WBE)
+* OWASP Benchmark Project
 *
 * This file is part of the Open Web Application Security Project (OWASP)
-* WebGoat Benchmark Edition (WBE) project. For details, please see
-* <a href="https://www.owasp.org/index.php/WBE">https://www.owasp.org/index.php/WBE</a>.
+* Benchmark Project. For details, please see
+* <a href="https://www.owasp.org/index.php/Benchmark">https://www.owasp.org/index.php/Benchmark</a>.
 *
-* The WBE is free software: you can redistribute it and/or modify it under the terms
+* The Benchmark is free software: you can redistribute it and/or modify it under the terms
 * of the GNU General Public License as published by the Free Software Foundation, version 2.
 *
-* The WBE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+* The Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
 * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details
 *
 * @author Dave Wichers <a href="https://www.aspectsecurity.com">Aspect Security</a>
 * @created 2015
 */
 
-package org.owasp.webgoat.benchmark.helpers;
+package org.owasp.benchmark.helpers;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;

src/main/java/org/owasp/webgoat/benchmark/helpers/SourceUtils.java

@@ -1,22 +1,22 @@
 /**
-* OWASP WebGoat Benchmark Edition (WBE)
+* OWASP Benchmark Project
 *
 * This file is part of the Open Web Application Security Project (OWASP)
-* WebGoat Benchmark Edition (WBE) project. For details, please see
-* <a href="https://www.owasp.org/index.php/WBE">https://www.owasp.org/index.php/WBE</a>.
+* Benchmark Project. For details, please see
+* <a href="https://www.owasp.org/index.php/Benchmark">https://www.owasp.org/index.php/Benchmark</a>.
 *
-* The WBE is free software: you can redistribute it and/or modify it under the terms
+* The Benchmark is free software: you can redistribute it and/or modify it under the terms
 * of the GNU General Public License as published by the Free Software Foundation, version 2.
 *
-* The WBE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+* The Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
 * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details
 *
 * @author Nick Sanidas <a href="https://www.aspectsecurity.com">Aspect Security</a>
 * @created 2015
 */
 
-package org.owasp.webgoat.benchmark.helpers;
+package org.owasp.benchmark.helpers;
 
 public class Thing1 implements ThingInterface {
 

src/main/java/org/owasp/webgoat/benchmark/helpers/Thing1.java

@@ -1,22 +1,22 @@
 /**
-* OWASP WebGoat Benchmark Edition (WBE)
+* OWASP Benchmark Project
 *
 * This file is part of the Open Web Application Security Project (OWASP)
-* WebGoat Benchmark Edition (WBE) project. For details, please see
-* <a href="https://www.owasp.org/index.php/WBE">https://www.owasp.org/index.php/WBE</a>.
+* Benchmark Project. For details, please see
+* <a href="https://www.owasp.org/index.php/Benchmark">https://www.owasp.org/index.php/Benchmark</a>.
 *
-* The WBE is free software: you can redistribute it and/or modify it under the terms
+* The Benchmark is free software: you can redistribute it and/or modify it under the terms
 * of the GNU General Public License as published by the Free Software Foundation, version 2.
 *
-* The WBE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+* The Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
 * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details
 *
 * @author Nick Sanidas <a href="https://www.aspectsecurity.com">Aspect Security</a>
 * @created 2015
 */
 
-package org.owasp.webgoat.benchmark.helpers;
+package org.owasp.benchmark.helpers;
 
 public class Thing2 implements ThingInterface {
 

src/main/java/org/owasp/webgoat/benchmark/helpers/Thing2.java

@@ -1,22 +1,22 @@
 /**
-* OWASP WebGoat Benchmark Edition (WBE)
+* OWASP Benchmark Project
 *
 * This file is part of the Open Web Application Security Project (OWASP)
-* WebGoat Benchmark Edition (WBE) project. For details, please see
-* <a href="https://www.owasp.org/index.php/WBE">https://www.owasp.org/index.php/WBE</a>.
+* Benchmark Project. For details, please see
+* <a href="https://www.owasp.org/index.php/Benchmark">https://www.owasp.org/index.php/Benchmark</a>.
 *
-* The WBE is free software: you can redistribute it and/or modify it under the terms
+* The Benchmark is free software: you can redistribute it and/or modify it under the terms
 * of the GNU General Public License as published by the Free Software Foundation, version 2.
 *
-* The WBE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+* The Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
 * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details
 *
 * @author Nick Sanidas <a href="https://www.aspectsecurity.com">Aspect Security</a>
 * @created 2015
 */
 
-package org.owasp.webgoat.benchmark.helpers;
+package org.owasp.benchmark.helpers;
 
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
@@ -36,7 +36,7 @@ public static ThingInterface createThing() {
 				return new Thing2();
 			}
 			props.load(thingproperties);
-			String which = "org.owasp.webgoat.benchmark.helpers." + props.getProperty("thing");
+			String which = "org.owasp.benchmark.helpers." + props.getProperty("thing");
 
 			Class thing = Class.forName(which);
 			Constructor thingConstructor = thing.getConstructor();

src/main/java/org/owasp/webgoat/benchmark/helpers/ThingFactory.java

@@ -1,22 +1,22 @@
 /**
-* OWASP WebGoat Benchmark Edition (WBE)
+* OWASP Benchmark Project
 *
 * This file is part of the Open Web Application Security Project (OWASP)
-* WebGoat Benchmark Edition (WBE) project. For details, please see
-* <a href="https://www.owasp.org/index.php/WBE">https://www.owasp.org/index.php/WBE</a>.
+* Benchmark Project. For details, please see
+* <a href="https://www.owasp.org/index.php/Benchmark">https://www.owasp.org/index.php/Benchmark</a>.
 *
-* The WBE is free software: you can redistribute it and/or modify it under the terms
+* The Benchmark is free software: you can redistribute it and/or modify it under the terms
 * of the GNU General Public License as published by the Free Software Foundation, version 2.
 *
-* The WBE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+* The Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
 * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details
 *
 * @author Nick Sanidas <a href="https://www.aspectsecurity.com">Aspect Security</a>
 * @created 2015
 */
 
-package org.owasp.webgoat.benchmark.helpers;
+package org.owasp.benchmark.helpers;
 
 public interface ThingInterface {
 	public String doSomething( String i);