- Revision
- 1636
- Author
- mauro
- Date
- 2010-05-08 06:43:13 -0500 (Sat, 08 May 2010)
Log Message
JBEHAVE-283: Added skip flags to Ant and Maven entry points. Updated trader example pom to run Ant or Maven executions via profiles.
Modified Paths
Diff
Modified: trunk/core/examples/trader/pom.xml (1635 => 1636)
--- trunk/core/examples/trader/pom.xml 2010-05-07 18:11:40 UTC (rev 1635) +++ trunk/core/examples/trader/pom.xml 2010-05-08 11:43:13 UTC (rev 1636) @@ -93,7 +93,7 @@ <scenarioExcludes> <scenarioExclude>**/i18n/scenarios/*.java</scenarioExclude> </scenarioExcludes> - <skip>false</skip> + <skip>${skip.mvn}</skip> <batch>false</batch> <ignoreFailure>true</ignoreFailure> <classLoaderInjected>false</classLoaderInjected> @@ -112,7 +112,7 @@ <scenarioExcludes> <scenarioExclude>**/i18n/scenarios/*.java</scenarioExclude> </scenarioExcludes> - <skip>false</skip> + <skip>${skip.mvn}</skip> <batch>true</batch> <ignoreFailure>true</ignoreFailure> <classLoaderInjected>false</classLoaderInjected> @@ -128,7 +128,7 @@ <scenarioIncludes> <scenarioInclude>**/i18n/scenarios/*.java</scenarioInclude> </scenarioIncludes> - <skip>false</skip> + <skip>${skip.mvn}</skip> <classLoaderInjected>true</classLoaderInjected> </configuration> <goals> @@ -171,7 +171,8 @@ <value>rendered</value> </property> </templateProperties> - <ignoreFailure>true</ignoreFailure> + <skip>${skip.mvn}</skip> + <ignoreFailure>${ignore.failure.reports}</ignoreFailure> </configuration> <goals> <goal>render-reports</goal> @@ -193,18 +194,18 @@ classpathref="maven.runtime.classpath"/> <scenarioRunner scenarioIncludes="**/scenarios/*.java" scenarioExcludes="**/i18n/scenarios/*.java" - classLoaderInjected="false" skip="${skip.ant.scenarios}" + classLoaderInjected="false" skip="${skip.ant}" ignoreFailure="true" /> <scenarioRunner scenarioIncludes="**/i18n/scenarios/*.java" scenarioExcludes="" - classLoaderInjected="false" skip="${skip.ant.scenarios}" + classLoaderInjected="false" skip="${skip.ant}" ignoreFailure="false" /> <taskdef name="reportRenderer" classname="org.jbehave.ant.ReportRendererTask" classpathref="maven.runtime.classpath" /> <reportRenderer outputDirectory="${basedir}/target/jbehave-reports" formats="txt,html,xml" templateProperties="defaultFormats=stats" - ignoreFailure="true" /> + skip="${skip.ant}" ignoreFailure="${ignore.failure.reports}" /> </tasks> </configuration> <goals> @@ -220,7 +221,7 @@ classpathref="maven.runtime.classpath" /> <stepdoc scenarioIncludes="**/scenarios/*.java" scenarioExcludes="**/i18n/scenarios/*.java" - classLoaderInjected="false" skip="${skip.ant.stepdoc}" /> + classLoaderInjected="false" skip="${skip.stepdoc}" /> </tasks> </configuration> <goals> @@ -253,11 +254,17 @@ <profile> <id>ant</id> <properties> - <skip.ant.scenarios>false</skip.ant.scenarios> - <skip.ant.stepdoc>false</skip.ant.stepdoc> + <skip.ant>false</skip.ant> + <skip.mvn>true</skip.mvn> </properties> </profile> <profile> + <id>reports-failure</id> + <properties> + <ignore.failure.reports>false</ignore.failure.reports> + </properties> + </profile> + <profile> <id>stepdoc</id> <properties> <skip.stepdoc>false</skip.stepdoc> @@ -265,8 +272,9 @@ </profile> </profiles> <properties> - <skip.ant.scenarios>true</skip.ant.scenarios> - <skip.ant.stepdoc>true</skip.ant.stepdoc> + <ignore.failure.reports>true</ignore.failure.reports> + <skip.ant>true</skip.ant> + <skip.mvn>false</skip.mvn> <skip.stepdoc>true</skip.stepdoc> </properties> </project> \ No newline at end of file
Modified: trunk/core/jbehave-ant/src/main/java/org/jbehave/ant/ReportRendererTask.java (1635 => 1636)
--- trunk/core/jbehave-ant/src/main/java/org/jbehave/ant/ReportRendererTask.java 2010-05-07 18:11:40 UTC (rev 1635) +++ trunk/core/jbehave-ant/src/main/java/org/jbehave/ant/ReportRendererTask.java 2010-05-08 11:43:13 UTC (rev 1636) @@ -31,6 +31,11 @@ private List<String> formats = asList(); /** + * The flag to skip + */ + private boolean skip = false; + + /** * The flag to ignore failures */ private boolean ignoreFailure = false; @@ -41,6 +46,10 @@ private Properties templateProperties = new Properties(); public void execute() throws BuildException { + if (skip) { + log("Skipped rendering reports", MSG_INFO); + return; + } ReportRenderer renderer = new FreemarkerReportRenderer(templateProperties); try { log("Rendering reports in '" + outputDirectory + "' using formats '" + formats + "'" @@ -79,8 +88,12 @@ log(message, MSG_WARN); } } + + public void setSkip(boolean skip) { + this.skip = skip; + } - public void setIgnoreFailure(boolean ignoreFailure){ + public void setIgnoreFailure(boolean ignoreFailure){ this.ignoreFailure = ignoreFailure; } }
Modified: trunk/core/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ReportRendererMojo.java (1635 => 1636)
--- trunk/core/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ReportRendererMojo.java 2010-05-07 18:11:40 UTC (rev 1635) +++ trunk/core/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ReportRendererMojo.java 2010-05-08 11:43:13 UTC (rev 1636) @@ -47,6 +47,13 @@ private Properties templateProperties = new Properties(); /** + * The flag to skip rendering + * + * @parameter + */ + private boolean skip = false; + + /** * The flag to ignore failures * * @parameter @@ -98,6 +105,10 @@ } protected void executeReport(Locale locale) throws MavenReportException { + if (skip) { + getLog().info("Skipped rendering reports"); + return; + } ReportRenderer renderer = new FreemarkerReportRenderer(templateProperties); try { getLog().info("Rendering reports in '" + outputDirectory + "' using formats '" + formats + "'"
To unsubscribe from this list please visit:
