You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/07/08 11:44:14 UTC
svn commit: r1144218 - in /maven/surefire/trunk:
maven-failsafe-plugin/src/site/ maven-failsafe-plugin/src/site/fml/
maven-surefire-plugin/src/site/ maven-surefire-plugin/src/site/apt/
maven-surefire-plugin/src/site/apt/examples/ maven-surefire-plugin/...
Author: stephenc
Date: Fri Jul 8 09:44:14 2011
New Revision: 1144218
URL: http://svn.apache.org/viewvc?rev=1144218&view=rev
Log:
[SUREFIRE-752] Fix formatting differences between surefire and failsafe site source docs
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/site/fml/faq.fml
maven/surefire/trunk/maven-failsafe-plugin/src/site/site.xml
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml
maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/site/fml/faq.fml?rev=1144218&r1=1144217&r2=1144218&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/site/fml/faq.fml (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/site/fml/faq.fml Fri Jul 8 09:44:14 2011
@@ -24,7 +24,8 @@
<question>What is the difference between maven-failsafe-plugin and maven-surefire-plugin?</question>
<answer>
<p>
- <a href="http://maven.apache.org/plugins/maven-surefire-plugin">maven-surefire-plugin</a> is designed for
+ <a href="http://maven.apache.org/plugins/maven-surefire-plugin">maven-surefire-plugin</a>
+ is designed for
running unit tests and if any of the tests fail then it will fail the build immediately.
</p>
<p>
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/site/site.xml?rev=1144218&r1=1144217&r2=1144218&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/site/site.xml (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/site/site.xml Fri Jul 8 09:44:14 2011
@@ -19,23 +19,31 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Goals" href="plugin-info.html"/>
<item name="Usage" href="usage.html"/>
+ <item name="API" href="api.html"/>
<item name="FAQ" href="faq.html"/>
</menu>
<menu name="Examples">
<item name="Using TestNG" href="examples/testng.html"/>
+ <item name="Using JUnit" href="examples/junit.html"/>
<item name="Skipping Tests" href="examples/skipping-test.html"/>
<item name="Inclusions and Exclusions of Tests" href="examples/inclusion-exclusion.html"/>
<item name="Running a Single Test" href="examples/single-test.html"/>
<item name="Class Loading Issues" href="examples/class-loading.html"/>
<item name="Debugging Tests" href="examples/debugging.html"/>
<item name="System Properties" href="examples/system-properties.html"/>
- <item name="Additional Classpath Elements" href="examples/additional-classpath.html"/>
+ <item name="Configuring the Classpath" href="examples/configuring-classpath.html"/>
+ <item name="Selecting providers" href="examples/providers.html"/>
+ </menu>
+ <menu name="Developer Center">
+ <item name="Developing" href="developing.html"/>
</menu>
</body>
</project>
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm?rev=1144218&r1=1144217&r2=1144218&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm Fri Jul 8 09:44:14 2011
@@ -25,7 +25,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
Running a Single Test
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm?rev=1144218&r1=1144217&r2=1144218&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm Fri Jul 8 09:44:14 2011
@@ -25,7 +25,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
Using System Properties
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm?rev=1144218&r1=1144217&r2=1144218&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm Fri Jul 8 09:44:14 2011
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
Using TestNG
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt.vm?rev=1144218&r1=1144217&r2=1144218&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt.vm (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt.vm Fri Jul 8 09:44:14 2011
@@ -105,7 +105,7 @@ mvn verify
General instructions on how to use the ${thisPlugin} Plugin can be found on the {{{./usage.html}usage page}}. Some more
specific use cases are described in the examples given below.
#{if}(${project.artifactId}=="maven-surefire-plugin") Last but not least, users occasionally contribute
- additional examples, tips or errata to the
+ additional examples, tips or errata to the
{{{http://docs.codehaus.org/display/MAVENUSER/Surefire+Plugin}plugin's wiki page}}.#{end}
In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel
@@ -146,5 +146,5 @@ mvn verify
* {{{./examples/configuring-classpath.html}Configuring the Classpath}}
* {{{./examples/providers.html}Selecting providers}}
-
+
[]
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml?rev=1144218&r1=1144217&r2=1144218&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml Fri Jul 8 09:44:14 2011
@@ -21,9 +21,9 @@ under the License.
<faqs xmlns="http://maven.apache.org/FML/1.0.1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- id="FAQ" title="Frequently Asked Questions">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
+ id="FAQ" title="Frequently Asked Questions">
<part id="General">
<faq id="reuse-test-code">
<question>How can I reuse my test code in other modules?</question>
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml?rev=1144218&r1=1144217&r2=1144218&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml Fri Jul 8 09:44:14 2011
@@ -17,11 +17,11 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
--->
+ -->
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>