dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from nbaars/master

Browse Source 
Generate separate jar file to use in the lessons project
This commit is contained in:
mayhew64 2015-05-03 07:27:32 -04:00
commit 547fd36507
3 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pom.xml
View File

@ -37,6 +37,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration> <configuration>
<source>1.7</source> <source>1.7</source>
<target>1.7</target> <target>1.7</target>
@ -46,15 +47,15 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<configuration> <configuration>
<!-- archiving the classes breaks the admin screen loads in course.java <!-- archiving the classes breaks the admin screen loads in course.java
the legacy lesson loader does not look in jar files for lessons --> the legacy lesson loader does not look in jar files for lessons -->
<archiveClasses>false</archiveClasses> <archiveClasses>false</archiveClasses>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<archive> <archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries> <manifestEntries>
<Specification-Title>${project.name}</Specification-Title> <Specification-Title>${project.name}</Specification-Title>
<Specification-Version>${project.version}</Specification-Version> <Specification-Version>${project.version}</Specification-Version>
@ -64,15 +65,31 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
<artifactId>maven-jar-plugin</artifactId> <version>2.6</version>
<configuration>
<attachClasses>true</attachClasses>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>create-jar</id> <id>attach-artifacts</id>
<phase>compile</phase> <phase>package</phase>
<goals> <goals>
<goal>jar</goal> <goal>attach-artifact</goal>
</goals> </goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/WebGoat-Container-${project.version}-classes.jar</file>
<type>classes-jar</type>
</artifact>
</artifacts>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -94,7 +111,7 @@
<phase>package</phase> <phase>package</phase>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -190,7 +207,7 @@
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.17</version> <version>1.2.17</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>wsdl4j</groupId> <groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId> <artifactId>wsdl4j</artifactId>
@ -239,7 +256,7 @@
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<!-- Jackson --> <!-- Jackson -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
@ -354,8 +371,9 @@
<version>1.7.7</version> <version>1.7.7</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<!-- ************* END spring MVC and related dependencies ************** -->
</dependencies> </dependencies>
<!-- ************* END spring MVC and related dependencies ************** -->
</project> </project>

2
src/main/java/org/owasp/webgoat/plugins/Plugin.java
View File

@ -70,7 +70,7 @@ public class Plugin {
this.lesson = clazz; this.lesson = clazz;
} }
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
logger.error("Unable to load class {}", name); logger.error("Unable to load class {}", name, e);
} }
} }

2
src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
View File

@ -43,7 +43,7 @@ public class PluginsLoader implements Runnable {
plugins.add(plugin); plugins.add(plugin);
} }
} catch (Plugin.PluginLoadingFailure e) { } catch (Plugin.PluginLoadingFailure e) {
logger.error("Unable to load plugin, continue loading others..."); logger.error("Unable to load plugin, continue loading others...", e);
} }
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
} }