You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/22 15:47:53 UTC

svn commit: r640004 - in /maven/plugins/trunk/maven-ant-plugin/src: it/single-test-it/ it/single-test-it/src/ it/single-test-it/src/test/ it/single-test-it/src/test/java/ it/single-test-it/src/test/java/it/ main/java/org/apache/maven/plugin/ant/ site/ ...

Author: bentmann
Date: Sat Mar 22 07:47:51 2008
New Revision: 640004

URL: http://svn.apache.org/viewvc?rev=640004&view=rev
Log:
[MANT-7] "test" target should support running a single test - just like mvn test does

Added:
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/BadTest.java   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/GoodTest.java   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/verify.bsh   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/customize.apt
      - copied, changed from r639990, maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt
    maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/run-single-test.apt   (with props)
Removed:
    maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt
Modified:
    maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
    maven/plugins/trunk/maven-ant-plugin/src/site/apt/index.apt
    maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt
    maven/plugins/trunk/maven-ant-plugin/src/site/fml/faq.fml
    maven/plugins/trunk/maven-ant-plugin/src/site/site.xml

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 22 07:47:51 2008
@@ -0,0 +1,5 @@
+target
+build.xml
+maven-build.properties
+maven-build.xml
+build.log

Added: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt?rev=640004&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt Sat Mar 22 07:47:51 2008
@@ -0,0 +1,2 @@
+ant:ant
+initialize

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml?rev=640004&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml Sat Mar 22 07:47:51 2008
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.maven-ant-plugin.it</groupId>
+  <artifactId>single-test-it</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-ant-plugin</artifactId>
+        <version>@pom.version@</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.1</version>
+        <executions>
+          <execution>
+            <phase>initialize</phase>
+            <configuration>
+              <tasks>
+              	<property name="test" value="GoodTest" />
+                <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant-junit</artifactId>
+            <version>1.6.5</version>
+          </dependency>
+          <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.2</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <properties>
+    <build.compiler>extJavac</build.compiler>
+  </properties>
+
+</project>

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/BadTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/BadTest.java?rev=640004&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/BadTest.java (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/BadTest.java Sat Mar 22 07:47:51 2008
@@ -0,0 +1,37 @@
+package it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Id$
+ */
+public class BadTest
+    extends TestCase
+{
+
+    public void testFail()
+        throws Exception
+    {
+        fail( "This test should have been excluded." );
+    }
+
+}

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/BadTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/BadTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/GoodTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/GoodTest.java?rev=640004&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/GoodTest.java (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/GoodTest.java Sat Mar 22 07:47:51 2008
@@ -0,0 +1,37 @@
+package it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Id$
+ */
+public class GoodTest
+    extends TestCase
+{
+
+    public void testPass()
+        throws Exception
+    {
+        assertTrue( true );
+    }
+
+}

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/GoodTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/src/test/java/it/GoodTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/verify.bsh?rev=640004&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/verify.bsh (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/verify.bsh Sat Mar 22 07:47:51 2008
@@ -0,0 +1,23 @@
+import java.io.*;
+import java.util.*;
+
+try
+{
+    File reportDir = new File( basedir, "target/test-reports" );
+
+    {
+        File file = new File( reportDir, "TEST-it.GoodTest.xml" );
+        if ( !file.isFile() )
+        {
+            System.err.println( "Report file does not exist: " + file );
+            return false;
+        }
+    }
+}
+catch( Throwable t )
+{
+    t.printStackTrace();
+    return false;
+}
+
+return true;

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/verify.bsh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/verify.bsh
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=640004&r1=640003&r2=640004&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java Sat Mar 22 07:47:51 2008
@@ -43,6 +43,8 @@
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XMLWriter;
 
+import sun.security.action.GetIntegerAction;
+
 /**
  * Write Ant build files from <code>Maven Project</code> for <a href="http://ant.apache.org">Ant</a> 1.6.2 or above:
  * <ul>
@@ -814,30 +816,23 @@
 
                 writer.startElement( "batchtest" );
                 writer.addAttribute( "todir", "${maven.test.reports}" );
+                writer.addAttribute( "unless", "test" );
 
-                List includes =
-                    getSelectorList( AntBuildWriterUtil.getMavenSurefirePluginOptions( project, "includes", null ) );
-                if ( includes == null || includes.isEmpty() )
-                {
-                    includes = Arrays.asList( new String[] { "**/Test*.java", "**/*Test.java", "**/*TestCase.java" } );
-                }
+                List includes = getTestIncludes();
+                List excludes = getTestExcludes();
 
-                List excludes =
-                    getSelectorList( AntBuildWriterUtil.getMavenSurefirePluginOptions( project, "excludes", null ) );
-                if ( excludes == null || excludes.isEmpty() )
-                {
-                    excludes = Arrays.asList( new String[] { "**/*Abstract*Test.java" } );
-                }
+                writeTestFilesets( writer, testCompileSourceRoots, includes, excludes );
+
+                writer.endElement(); // batchtest
+
+                writer.startElement( "batchtest" );
+                writer.addAttribute( "todir", "${maven.test.reports}" );
+                writer.addAttribute( "if", "test" );
+
+                includes = Arrays.asList( new String[] { "**/${test}.java" } );
+
+                writeTestFilesets( writer, testCompileSourceRoots, includes, excludes );
 
-                String[] compileSourceRoots = (String[]) testCompileSourceRoots.toArray( new String[0] );
-                for ( int i = 0; i < compileSourceRoots.length; i++ )
-                {
-                    writer.startElement( "fileset" );
-                    writer.addAttribute( "dir", "${maven.build.testDir." + i + "}" );
-                    // TODO: m1 allows additional test exclusions via maven.ant.excludeTests
-                    AntBuildWriterUtil.writeIncludesExcludes( writer, includes, excludes );
-                    writer.endElement(); // fileset
-                }
                 writer.endElement(); // batchtest
 
                 writer.endElement(); // junit
@@ -879,6 +874,58 @@
         }
 
         AntBuildWriterUtil.writeLineBreak( writer );
+    }
+
+    /**
+     * Gets the include patterns for the unit tests.
+     * 
+     * @return A list of strings with include patterns, might be empty but never <code>null</code>.
+     */
+    private List getTestIncludes()
+        throws IOException
+    {
+        List includes = getSelectorList( AntBuildWriterUtil.getMavenSurefirePluginOptions( project, "includes", null ) );
+        if ( includes == null || includes.isEmpty() )
+        {
+            includes = Arrays.asList( new String[] { "**/Test*.java", "**/*Test.java", "**/*TestCase.java" } );
+        }
+        return includes;
+    }
+
+    /**
+     * Gets the exclude patterns for the unit tests.
+     * 
+     * @return A list of strings with exclude patterns, might be empty but never <code>null</code>.
+     */
+    private List getTestExcludes()
+        throws IOException
+    {
+        List excludes = getSelectorList( AntBuildWriterUtil.getMavenSurefirePluginOptions( project, "excludes", null ) );
+        if ( excludes == null || excludes.isEmpty() )
+        {
+            excludes = Arrays.asList( new String[] { "**/*Abstract*Test.java" } );
+        }
+        return excludes;
+    }
+
+    /**
+     * Write the <code>&lt;fileset&gt;</code> elements for the test compile source roots.
+     * 
+     * @param writer
+     * @param testCompileSourceRoots
+     * @param includes
+     * @param excludes
+     */
+    private void writeTestFilesets( XMLWriter writer, List testCompileSourceRoots, List includes, List excludes )
+    {
+        for ( int i = 0; i < testCompileSourceRoots.size(); i++ )
+        {
+            writer.startElement( "fileset" );
+            writer.addAttribute( "dir", "${maven.build.testDir." + i + "}" );
+            // TODO: m1 allows additional test exclusions via maven.ant.excludeTests
+            AntBuildWriterUtil.writeIncludesExcludes( writer, includes, excludes );
+            writer.endElement(); // fileset
+        }
     }
 
     /**

Copied: maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/customize.apt (from r639990, maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/customize.apt?p2=maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/customize.apt&p1=maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt&r1=639990&r2=640004&rev=640004&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/customize.apt Sat Mar 22 07:47:51 2008
@@ -1,5 +1,5 @@
  ------
- Grammar Inheritance
+ Customizing Generated Ant Build Files
  ------
  Vincent Siveton
  ------
@@ -24,9 +24,9 @@
  ~~ http://maven.apache.org/guides/mini/guide-apt-format.html
 
 
-Using generated Ant build files
+Customizing Generated Ant Build Files
 
- <<Note>>: If you want to add your own Ant targets, you should add them to <<<build.xml>>> and <<NOT>> <<<maven-build.xml>>>.
+ <<Warning>>: If you want to add your own Ant targets, you should add them to <<<build.xml>>> and <not> to <<<maven-build.xml>>>.
 
  The <<<build.xml>>> file uses the {{{http://ant.apache.org/manual/CoreTasks/import.html}import task}} of Ant.
  So, you can override the generated targets in the <<<build.xml>>> file. For instance:

Added: maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/run-single-test.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/run-single-test.apt?rev=640004&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/run-single-test.apt (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/run-single-test.apt Sat Mar 22 07:47:51 2008
@@ -0,0 +1,43 @@
+ ------
+ Running Individual Unit Tests
+ ------
+ Benjamin Bentmann
+ ------
+ March 2008
+ ------
+
+ ~~ Copyright 2006 The Apache Software Foundation.
+ ~~
+ ~~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~~ you may not use this file except in compliance with the License.
+ ~~ You may obtain a copy of the License at
+ ~~
+ ~~      http://www.apache.org/licenses/LICENSE-2.0
+ ~~
+ ~~ Unless required by applicable law or agreed to in writing, software
+ ~~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~~ See the License for the specific language governing permissions and
+ ~~ limitations under the License.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+
+Running Individual Unit Tests
+
+ Since version 2.1 of the Ant Plugin, the generated Ant build files allow to run individual unit tests. You merely need
+ to specify the simple name of the desired test class via the system property <<<test>>> as illustrated below:
+
++-----+
+ant test -Dtest=MyFavoriteTest
++-----+
+
+ This will run a test matching the pattern <<<**/MyFavoriteTest.java>>>. You can also employ a simple pattern to select
+ multiple tests:
+ 
++-----+
+ant test -Dtest=*FavoriteTest
++-----+
+
+ <<Note>>: Unlike the Surefire Plugin, the Ant scripts do not support a comma-separated value for the <<<test>>> property.

Propchange: maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/run-single-test.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/run-single-test.apt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-ant-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/apt/index.apt?rev=640004&r1=640003&r2=640004&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/apt/index.apt Sat Mar 22 07:47:51 2008
@@ -26,7 +26,7 @@
 
 Maven 2 Ant Plugin
 
- The Ant Plugin generates {{{http://ant.apache.org/}Ant}} build files for Ant 1.6.2 or above.
+ The Ant Plugin generates build files for {{{http://ant.apache.org/}Ant}} 1.6.2 or above from the POM.
 
 * Goals Overview
 
@@ -38,10 +38,12 @@
 
 * Usage
 
-   Instructions on how to use the Ant Plugin can be found {{{usage.html}here}}.
+   Instructions on how to use the Ant Plugin can be found on the {{{usage.html}usage page}}.
 
 * Examples
 
    The following examples show how to use the Ant Plugin in more advanced usecases:
 
-   * {{{examples/using.html}Using generated Ant build files}}
+   * {{{examples/customize.html}Customizing Generated Ant Build Files}}
+
+   * {{{examples/run-single-test.html}Running Individual Unit Tests}}

Modified: maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt?rev=640004&r1=640003&r2=640004&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt Sat Mar 22 07:47:51 2008
@@ -26,7 +26,7 @@
 
 Usage
 
- The Ant Plugin generates Ant build files. The following example describe the basic
+ The Ant Plugin generates Ant build files from POMs. The following example describe the basic
  usage of the Plugin.
 
 * Generate Ant build files
@@ -93,10 +93,10 @@
 ant -projecthelp
 +-----+
 
- <<Note>>: <<DO NOT EDIT maven-build.xml!>> It will be overwritten when calling <<<mvn ant:ant>>>.
+ <<Warning>>: Do not edit <<<maven-build.xml>>>! It will be overwritten when calling <<<mvn ant:ant>>>.
 
 ** maven-build.properties
 
  The <<<maven-build.properties>>> file contains several properties used by the <<<maven-build.xml>>> build file.
 
- <<Note>>: <<DO NOT EDIT maven-build.properties!>> It will be overwritten when calling <<<mvn ant:ant>>>.
+ <<Warning>>: Do not edit <<<maven-build.properties>>>! It will be overwritten when calling <<<mvn ant:ant>>>.

Modified: maven/plugins/trunk/maven-ant-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/fml/faq.fml?rev=640004&r1=640003&r2=640004&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/fml/faq.fml Sat Mar 22 07:47:51 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!--
   ~ Copyright 2006 The Apache Software Foundation.
@@ -35,4 +35,4 @@
       </answer>
     </faq>
   </part>
-</faqs>
\ No newline at end of file
+</faqs>

Modified: maven/plugins/trunk/maven-ant-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/site.xml?rev=640004&r1=640003&r2=640004&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/site.xml Sat Mar 22 07:47:51 2008
@@ -32,7 +32,8 @@
       <item name="FAQ" href="faq.html"/>
     </menu>
     <menu name="Examples">
-      <item name="Using Ant build files" href="/examples/using.html"/>
+      <item name="Customizing Ant Build Files" href="/examples/customize.html"/>
+      <item name="Running Individual Unit Tests" href="/examples/run-single-test.html"/>
     </menu>
   </body>
 </project>