- Revision
- 1467
- Author
- mauro
- Date
- 2009-12-23 16:28:27 -0600 (Wed, 23 Dec 2009)
Log Message
JBEHAVE-221: Upgraded to latest version of jbehave-site-resources and SH to fix the capitalisation rendering issues with XML brushes.
Modified Paths
- trunk/core/distribution/pom.xml
- trunk/core/distribution/src/site/content/reports.html
- trunk/core/distribution/src/site/content/running-scenarios.html
- trunk/core/examples/trader/build.xml
- trunk/core/examples/trader/pom.xml
- trunk/core/jbehave-core/src/main/resources/ftl/jbehave-reports-index.ftl
- trunk/core/jbehave-core/src/main/resources/ftl/jbehave-reports-single.ftl
Diff
Modified: trunk/core/distribution/pom.xml (1466 => 1467)
--- trunk/core/distribution/pom.xml 2009-12-23 22:10:02 UTC (rev 1466) +++ trunk/core/distribution/pom.xml 2009-12-23 22:28:27 UTC (rev 1467) @@ -35,7 +35,7 @@ <plugin> <groupId>org.codehaus.xsite</groupId> <artifactId>xsite-maven-plugin</artifactId> - <version>1.1.1</version> + <version>1.1.2</version> <configuration> <sourceDirectoryPath>${basedir}/src/site/</sourceDirectoryPath> <sitemapPath>content/sitemap.xml</sitemapPath> @@ -131,7 +131,7 @@ <artifactItem> <groupId>org.jbehave.site</groupId> <artifactId>jbehave-site-resources</artifactId> - <version>2.0</version> + <version>2.0.1</version> <outputDirectory>${project.build.directory}/site</outputDirectory> </artifactItem> </artifactItems> @@ -150,7 +150,7 @@ <artifactItem> <groupId>org.jbehave.site</groupId> <artifactId>jbehave-site-templates</artifactId> - <version>2.0</version> + <version>2.0.1</version> <outputDirectory>${project.build.directory}/templates</outputDirectory> </artifactItem> </artifactItems>
Modified: trunk/core/distribution/src/site/content/reports.html (1466 => 1467)
--- trunk/core/distribution/src/site/content/reports.html 2009-12-23 22:10:02 UTC (rev 1466) +++ trunk/core/distribution/src/site/content/reports.html 2009-12-23 22:28:27 UTC (rev 1467) @@ -82,7 +82,7 @@ name resolution mechanism used for mapping Java classes and textual scenarios. So, e.g., if the scenario class is <b>com.example.MyScenario</b>, we'll end up with file report outputs of the form: <b>com.example.my_scenario.[format]</b> -(where <b>format</b> is any of <b>txt,html,xml,stats</b>in the example above).</p> +(where <b>format</b> is any of <b>txt,html,xml,stats</b> in the example above).</p> <h2>Report Rendering</h2>
Modified: trunk/core/distribution/src/site/content/running-scenarios.html (1466 => 1467)
--- trunk/core/distribution/src/site/content/running-scenarios.html 2009-12-23 22:10:02 UTC (rev 1466) +++ trunk/core/distribution/src/site/content/running-scenarios.html 2009-12-23 22:28:27 UTC (rev 1467) @@ -22,7 +22,7 @@ <h2>Running as Ant task</h2> -<pre class="brush: xml"> +<script type="syntaxhighlighter" class="brush: xml"><![CDATA[ <taskdef name="scenarioRunner" classname="org.jbehave.ant.ScenarioRunnerTask" classpathref="your.runtime.classpath" /> @@ -41,7 +41,7 @@ <renderReports outputDirectory="${basedir}/target/jbehave-reports" formats="txt,html,xml,stats" /> -</pre> +]]></script> <p>Remember to include <b>jbehave-ant</b> to your runtime classpath.</p> @@ -54,7 +54,7 @@ <h2>Running as Maven Plugin</h2> -<pre class="brush: xml"> +<script type="syntaxhighlighter" class="brush: xml"><![CDATA[ <plugin> <groupId>org.jbehave</groupId> <artifactId>jbehave-maven-plugin</artifactId> @@ -98,7 +98,7 @@ </execution> </executions> </plugin> -</pre> +]]></script> <p>Note: we are using as default scope <b>compile</b>, which means that the scenarios will be looked up in the POM source directory. If the
Modified: trunk/core/examples/trader/build.xml (1466 => 1467)
--- trunk/core/examples/trader/build.xml 2009-12-23 22:10:02 UTC (rev 1466) +++ trunk/core/examples/trader/build.xml 2009-12-23 22:28:27 UTC (rev 1467) @@ -76,7 +76,7 @@ <dependency groupId="org.jbehave" artifactId="jbehave-core" version="${version}" scope="compile" /> <dependency groupId="org.jbehave.site" artifactId="jbehave-site-resources" - version="2.0" scope="compile" /> + version="2.0.1" scope="compile" /> </artifact:dependencies> <copy todir="${basedir}/target/lib/reports"> <fileset refid="reports.dependency.fileset" /> @@ -89,7 +89,7 @@ <include name="**/*.js" /> </patternset> </unzip> - <unzip src="" dest="${basedir}/target/jbehave-reports/rendered/"> + <unzip src="" dest="${basedir}/target/jbehave-reports/rendered/"> </unzip> </target>
Modified: trunk/core/examples/trader/pom.xml (1466 => 1467)
--- trunk/core/examples/trader/pom.xml 2009-12-23 22:10:02 UTC (rev 1466) +++ trunk/core/examples/trader/pom.xml 2009-12-23 22:28:27 UTC (rev 1467) @@ -38,7 +38,7 @@ <artifactItem> <groupId>org.jbehave.site</groupId> <artifactId>jbehave-site-resources</artifactId> - <version>2.0</version> + <version>2.0.1</version> <outputDirectory>${project.build.directory}/jbehave-reports/rendered</outputDirectory> </artifactItem> </artifactItems>
Modified: trunk/core/jbehave-core/src/main/resources/ftl/jbehave-reports-index.ftl (1466 => 1467)
--- trunk/core/jbehave-core/src/main/resources/ftl/jbehave-reports-index.ftl 2009-12-23 22:10:02 UTC (rev 1466) +++ trunk/core/jbehave-core/src/main/resources/ftl/jbehave-reports-index.ftl 2009-12-23 22:28:27 UTC (rev 1467) @@ -53,16 +53,23 @@ </body> <!-- SyntaxHighlighter resources: should be included at end of body --> -<link rel="stylesheet" type="text/css" href="" -<link rel="stylesheet" type="text/css" href="" -<script language="_javascript_" src="" -<script language="_javascript_" src="" -<script language="_javascript_" src="" -<script language="_javascript_" src="" -<script language="_javascript_" src="" +<link rel="stylesheet" type="text/css" href="" +<link rel="stylesheet" type="text/css" href="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" <script language="_javascript_" src="" <script type="text/_javascript_"> - SyntaxHighlighter.config.clipboardSwf = './js/sh-2.0.320/clipboard.swf'; + SyntaxHighlighter.config.clipboardSwf = './js/sh-2.1.364/clipboard.swf'; SyntaxHighlighter.defaults['gutter'] = false; SyntaxHighlighter.defaults['toolbar'] = true; SyntaxHighlighter.all();
Modified: trunk/core/jbehave-core/src/main/resources/ftl/jbehave-reports-single.ftl (1466 => 1467)
--- trunk/core/jbehave-core/src/main/resources/ftl/jbehave-reports-single.ftl 2009-12-23 22:10:02 UTC (rev 1466) +++ trunk/core/jbehave-core/src/main/resources/ftl/jbehave-reports-single.ftl 2009-12-23 22:28:27 UTC (rev 1467) @@ -11,22 +11,29 @@ ${body} <#else> <#assign brushFormat = format> <#if format == "stats"><#assign brushFormat = "plain"> </#if> -<pre class="brush: ${brushFormat}"> +<script type="syntaxhighlighter" class="brush: ${brushFormat}"><![CDATA[ ${body} -</pre> +]]></script> </#if> </body> <!-- SyntaxHighlighter resources: should be included at end of body --> -<link rel="stylesheet" type="text/css" href="" -<link rel="stylesheet" type="text/css" href="" -<script language="_javascript_" src="" -<script language="_javascript_" src="" -<script language="_javascript_" src="" -<script language="_javascript_" src="" -<script language="_javascript_" src="" +<link rel="stylesheet" type="text/css" href="" +<link rel="stylesheet" type="text/css" href="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" +<script language="_javascript_" src="" <script language="_javascript_" src="" <script type="text/_javascript_"> - SyntaxHighlighter.config.clipboardSwf = './js/sh-2.0.320/clipboard.swf'; + SyntaxHighlighter.config.clipboardSwf = './js/sh-2.1.364/clipboard.swf'; SyntaxHighlighter.defaults['gutter'] = false; SyntaxHighlighter.defaults['toolbar'] = true; SyntaxHighlighter.all();
To unsubscribe from this list please visit:
