Author: simonetripodi
Date: Tue Nov 29 17:33:23 2011
New Revision: 1207988
URL: http://svn.apache.org/viewvc?rev=1207988&view=rev
Log:
plugged the fluido skin, added enhancements to prevent Google code prettifier
does not render correctly the XML snippets, fixed some render mistakes,
enhanced code parts
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/api.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.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/site.xml
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/api.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/api.apt.vm?rev=1207988&r1=1207987&r2=1207988&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/api.apt.vm
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/api.apt.vm Tue Nov
29 17:33:23 2011
@@ -42,14 +42,14 @@ Maven Surefire Provider API
There are three things any provider must fulfill:
- * A provider must implement the
org.apache.maven.surefire.providerapi.SurefireProvider interface.
+ * A provider must implement the
<<<org.apache.maven.surefire.providerapi.SurefireProvider>>> interface.
- * A provider contains a META-INF/services file entry named
org.apache.maven.surefire.providerapi.SurefireProvider
+ * A provider contains a <<<META-INF/services>>> file entry named
<<<org.apache.maven.surefire.providerapi.SurefireProvider>>>
( as per
{{{http://download.oracle.com/javase/6/docs/api/java/util/ServiceLoader.html}ServiceLoader}}).
This file
contains the name of the actual provider class.
* The actual provider class contains a one-arg constructor that accepts an
instance of
- org.apache.maven.surefire.providerapi.ProviderParameters. This interface
delivers all the surefire feature
+ <<<org.apache.maven.surefire.providerapi.ProviderParameters>>>. This
interface delivers all the surefire feature
to the provider implementation, please see the javadoc of this interface for
options.
There are 4 well-known providers within surefire that are also implemented
this way, so
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm?rev=1207988&r1=1207987&r2=1207988&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
Tue Nov 29 17:33:23 2011
@@ -48,11 +48,11 @@ java -classpath foo.jar:bar.jar MyApp
on different versions of Windows; in some versions only a few hundred
characters are allowed, in others
a few thousand, but the limit can be pretty severe in either case.
- * Update for Maven Surefire 2.8.2
+* Update for Maven Surefire 2.8.2
-It turns out setting the CLASSPATH as an environment variable may remove most
of the
-practical length limitations, as documented in
http://jira.codehaus.org/browse/SUREFIRE-727. This means
-most of the length-related problems in this article may be outdated.
+ It turns out setting the <<<CLASSPATH>>> as an environment variable may
remove most of the
+ practical length limitations, as documented in
{{{http://jira.codehaus.org/browse/SUREFIRE-727}SUREFIRE-727}}.
+ This means most of the length-related problems in this article may be
outdated.
* How do people solve this problem in general?
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm?rev=1207988&r1=1207987&r2=1207988&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
Tue Nov 29 17:33:23 2011
@@ -34,23 +34,23 @@ Inclusions and Exclusions of Tests
with the following wildcard patterns:
#{if}(${project.artifactId}=="maven-surefire-plugin")
- * <"**/Test*.java"> - includes all of its subdirectories and all java
+ * <<<"**/Test*.java">>> - includes all of its subdirectories and all java
filenames that start with "Test".
- * <"**/*Test.java"> - includes all of its subdirectories and all java
+ * <<<"**/*Test.java">>> - includes all of its subdirectories and all java
filenames that end with "Test".
- * <"**/*TestCase.java"> - includes all of its subdirectories and all java
+ * <<<"**/*TestCase.java">>> - includes all of its subdirectories and all
java
filenames that end with "TestCase".
#{else}
- * <"**/IT*.java"> - includes all of its subdirectories and all java
+ * <<<"**/IT*.java">>> - includes all of its subdirectories and all java
filenames that start with "IT".
- * <"**/*IT.java"> - includes all of its subdirectories and all java
+ * <<<"**/*IT.java">>> - includes all of its subdirectories and all java
filenames that end with "IT".
- * <"**/*ITCase.java"> - includes all of its subdirectories and all java
+ * <<<"**/*ITCase.java">>> - includes all of its subdirectories and all java
filenames that end with "ITCase".
#{end}
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm?rev=1207988&r1=1207987&r2=1207988&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
Tue Nov 29 17:33:23 2011
@@ -33,6 +33,7 @@ Using JUnit
To get started with JUnit, you need to add the required version of JUnit to
your project:
+---+
+<dependencies>
[...]
<dependency>
<groupId>junit</groupId>
@@ -41,6 +42,7 @@ Using JUnit
<scope>test</scope>
</dependency>
[...]
+</dependencies>
+---+
@@ -90,6 +92,7 @@ else
You can also manually force a specific provider by adding it as a
dependency to ${thisPlugin} itself:
+---+
+<plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -102,7 +105,9 @@ else
<version>${project.version}</version>
</dependency>
</dependencies>
+ </plugin>
[...]
+</plugins>
+---+
When using this technique there is no check that the proper test-frameworks
are present on your project's
@@ -115,6 +120,7 @@ else
For example:
+---+
+<plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -126,6 +132,7 @@ else
</configuration>
</plugin>
[...]
+</plugins>
+---+
@@ -143,6 +150,7 @@ else
You can configure multiple custom listeners like this:
+---+
+<plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -157,6 +165,7 @@ else
</configuration>
</plugin>
[...]
+</plugins>
+---+
* Using a security manager (JUnit3 only)
@@ -168,6 +177,7 @@ else
by surefire.
+---+
+<plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -180,6 +190,7 @@ else
</configuration>
</plugin>
[...]
+</plugins>
+---+
* Using a security manager (All providers)
@@ -188,6 +199,7 @@ else
and send them using the argLine parameter and two system properties;
+---+
+<plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -198,6 +210,7 @@ else
</configuration>
</plugin>
[...]
+</plugins>
+---+
The disadvantage of this solution is that the policy changes will affect the
tests too, which make the
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm?rev=1207988&r1=1207987&r2=1207988&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
Tue Nov 29 17:33:23 2011
@@ -38,20 +38,22 @@ Selecting providers
The following example shows how to force the junit 4.7 provider:
+---+
+<plugins>
[...]
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
[...]
+</plugins>
+---+
The providers supplied with surefire are surefire-junit3, surefire-junit4,
surefire-junit47 and surefire-testng.
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=1207988&r1=1207987&r2=1207988&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
Tue Nov 29 17:33:23 2011
@@ -33,28 +33,32 @@ Using TestNG
To get started with TestNG, include the following dependency in your project
(replacing the version with the one you wish to use):
+---+
+<dependencies>
[...]
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.12.1</version>
+ <version>6.3.1</version>
<scope>test</scope>
</dependency>
[...]
+</dependencies>
+---+
If you are using an older version of TestNG (\<= 5.11), the dependency would
instead look like this:
+---+
+<dependencies>
[...]
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.8</version>
+ <version>6.3.1</version>
<scope>test</scope>
<classifier>jdk15</classifier>
</dependency>
[...]
+</dependencies>
+---+
<<Note:>> if you are using JDK 1.4 Javadoc annotations for your TestNG
tests, replace the classifier <<<jdk15>>> with <<<jdk14>>> above.
@@ -78,6 +82,7 @@ Using TestNG
These files are created in the normal way, and then added to the
${thisPlugin} Plugin configuration:
+---+
+<plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -90,6 +95,7 @@ Using TestNG
</configuration>
</plugin>
[...]
+</plugins>
+---+
This configuration will override the includes and excludes patterns and run
all tests in the suite files.
@@ -100,6 +106,7 @@ Using TestNG
into your TestNG test, by specifying them as system properties, like this:
+---+
+<plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -112,6 +119,7 @@ Using TestNG
</configuration>
</plugin>
[...]
+</plugins>
+---+
For more information about setting system properties in ${thisPlugin} tests,
see {{{./system-properties.html}System Properties}}.
@@ -122,6 +130,7 @@ Using TestNG
use the <<<groups>>> parameter, for example:
+---+
+<plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -132,6 +141,7 @@ Using TestNG
</configuration>
</plugin>
[...]
+</plugins>
+---+
Likewise, the <<<excludedGroups>>> parameter can be used to run all but a
certain set of groups.
@@ -143,6 +153,7 @@ Using TestNG
For example:
+---+
+</plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -154,6 +165,7 @@ Using TestNG
</configuration>
</plugin>
[...]
+</plugins>
+---+
This is particularly useful for slow tests that can have high concurrency,
or to quickly and roughly assess the independance
@@ -167,6 +179,7 @@ Using TestNG
You can configure multiple custom listeners like this:
+---+
+</plugins>
[...]
<plugin>
<groupId>${project.groupId}</groupId>
@@ -190,6 +203,7 @@ Using TestNG
</configuration>
</plugin>
[...]
+</plugins>
+---+
For more information on TestNG, see the {{{http://www.testng.org}TestNG web
site}}.
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=1207988&r1=1207987&r2=1207988&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 Tue
Nov 29 17:33:23 2011
@@ -70,9 +70,10 @@ mvn verify
The Failsafe Plugin generates reports in 2 different file formats:
#{end}
- * Plain text files (*.txt)
- * XML files (*.xml)
+ * Plain text files (<<<*.txt>>>)
+
+ * XML files (<<<*.xml>>>)
[]
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=1207988&r1=1207987&r2=1207988&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml Tue Nov 29
17:33:23 2011
@@ -22,6 +22,13 @@
<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";>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.0</version>
+ </skin>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
