Merge pull request #3 from cedric-lamalle/master

New options
wakaleo · Jul 8, 2011 · 714a373 · 714a373
2 parents f90a64a + d788a7c
commit 714a373
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -102,12 +102,6 @@
             <version>5.1.13</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.13</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc</artifactId>
@@ -257,13 +251,13 @@
                                 <goals>
                                     <goal>test</goal>
                                 </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ExternalDatabaseTest.java</exclude>
-                                    </excludes>
-                                </configuration>
                             </execution>
                         </executions>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*ExternalDatabaseTest.java</exclude>
+                            </excludes>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>

diff --git a/src/main/java/com/wakaleo/schemaspy/SchemaSpyReport.java b/src/main/java/com/wakaleo/schemaspy/SchemaSpyReport.java
@@ -24,7 +24,7 @@
  * 
  *           SchemaSpy (http://schemaspy.sourceforge.net) does not need to be
  *           installed and accessible on your machine. However, SchemaSpy also
- *           needs the Graphvis tool (http://www.graphviz.org/) in order to
+ *           needs the Graphviz tool (http://www.graphviz.org/) in order to
  *           generate graphical representations of the table/view relationships,
  *           so this needs to be installed on your machine.
  * 
@@ -301,6 +301,20 @@ public class SchemaSpyReport extends AbstractMavenReport {
 	 */
 	private String connprops;
 
+	/**
+	 * Don't generate ads in reports
+	 * 
+	 * @parameter noAds
+	 */
+	private Boolean noAds;
+
+	/**
+	 * Don't generate sourceforge logos in reports
+	 * 
+	 * @parameter noLogo
+	 */
+	private Boolean noLogo;
+
 	/**
 	 * The SchemaSpy analyser that generates the actual report.
 	 * Can be overridden for testing purposes.
@@ -432,6 +446,8 @@ protected void executeReport(Locale locale) throws MavenReportException {
 		addFlagToArguments(argList, "-hq", highQuality);
 		addToArguments(argList, "connprops", connprops);
 		addFlagToArguments(argList, "-cid", commentsInitiallyDisplayed);
+		addFlagToArguments(argList, "-noads", noAds);
+		addFlagToArguments(argList, "-nologo", noLogo);
 		/*
 		addToArguments(argList, "-jdbcUrl", jdbcUrl);
 		*/