maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r843313 [14/15] - in /websites/production/maven/content/shared/maven-verifier: ./ apidocs/ apidocs/org/apache/maven/it/ apidocs/org/apache/maven/it/class-use/ apidocs/org/apache/maven/it/util/ apidocs/org/apache/maven/it/util/class-use/ api...
Date Fri, 21 Dec 2012 04:49:09 GMT
Modified: websites/production/maven/content/shared/maven-verifier/xref/org/apache/maven/it/Verifier.html
==============================================================================
--- websites/production/maven/content/shared/maven-verifier/xref/org/apache/maven/it/Verifier.html (original)
+++ websites/production/maven/content/shared/maven-verifier/xref/org/apache/maven/it/Verifier.html Fri Dec 21 04:49:06 2012
@@ -29,152 +29,152 @@
 <a class="jxr_linenumber" name="19" href="#19">19</a>  <em class="jxr_comment"> * under the License.</em>
 <a class="jxr_linenumber" name="20" href="#20">20</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="21" href="#21">21</a>  
-<a class="jxr_linenumber" name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> junit.framework.Assert;
-<a class="jxr_linenumber" name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.it.util.FileUtils;
-<a class="jxr_linenumber" name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.it.util.IOUtil;
-<a class="jxr_linenumber" name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.it.util.StringUtils;
-<a class="jxr_linenumber" name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.it.util.cli.CommandLineException;
-<a class="jxr_linenumber" name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.it.util.cli.CommandLineUtils;
-<a class="jxr_linenumber" name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.it.util.cli.Commandline;
-<a class="jxr_linenumber" name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.it.util.cli.StreamConsumer;
-<a class="jxr_linenumber" name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.it.util.cli.WriterStreamConsumer;
-<a class="jxr_linenumber" name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> org.xml.sax.InputSource;
-<a class="jxr_linenumber" name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> org.xml.sax.SAXException;
-<a class="jxr_linenumber" name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> org.xml.sax.SAXParseException;
-<a class="jxr_linenumber" name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> org.xml.sax.helpers.DefaultHandler;
-<a class="jxr_linenumber" name="35" href="#35">35</a>  
-<a class="jxr_linenumber" name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> javax.xml.parsers.ParserConfigurationException;
-<a class="jxr_linenumber" name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> javax.xml.parsers.SAXParser;
-<a class="jxr_linenumber" name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> javax.xml.parsers.SAXParserFactory;
-<a class="jxr_linenumber" name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> java.io.BufferedReader;
-<a class="jxr_linenumber" name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayOutputStream;
-<a class="jxr_linenumber" name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> java.io.FileInputStream;
-<a class="jxr_linenumber" name="43" href="#43">43</a>  <strong class="jxr_keyword">import</strong> java.io.FileNotFoundException;
-<a class="jxr_linenumber" name="44" href="#44">44</a>  <strong class="jxr_keyword">import</strong> java.io.FileReader;
-<a class="jxr_linenumber" name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> java.io.FileWriter;
-<a class="jxr_linenumber" name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> java.io.FilenameFilter;
-<a class="jxr_linenumber" name="47" href="#47">47</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="48" href="#48">48</a>  <strong class="jxr_keyword">import</strong> java.io.InputStream;
-<a class="jxr_linenumber" name="49" href="#49">49</a>  <strong class="jxr_keyword">import</strong> java.io.InputStreamReader;
-<a class="jxr_linenumber" name="50" href="#50">50</a>  <strong class="jxr_keyword">import</strong> java.io.PrintStream;
-<a class="jxr_linenumber" name="51" href="#51">51</a>  <strong class="jxr_keyword">import</strong> java.io.Writer;
-<a class="jxr_linenumber" name="52" href="#52">52</a>  <strong class="jxr_keyword">import</strong> java.net.MalformedURLException;
-<a class="jxr_linenumber" name="53" href="#53">53</a>  <strong class="jxr_keyword">import</strong> java.net.URL;
-<a class="jxr_linenumber" name="54" href="#54">54</a>  <strong class="jxr_keyword">import</strong> java.text.DecimalFormat;
-<a class="jxr_linenumber" name="55" href="#55">55</a>  <strong class="jxr_keyword">import</strong> java.text.NumberFormat;
-<a class="jxr_linenumber" name="56" href="#56">56</a>  <strong class="jxr_keyword">import</strong> java.util.ArrayList;
-<a class="jxr_linenumber" name="57" href="#57">57</a>  <strong class="jxr_keyword">import</strong> java.util.Arrays;
-<a class="jxr_linenumber" name="58" href="#58">58</a>  <strong class="jxr_keyword">import</strong> java.util.Collections;
-<a class="jxr_linenumber" name="59" href="#59">59</a>  <strong class="jxr_keyword">import</strong> java.util.Iterator;
-<a class="jxr_linenumber" name="60" href="#60">60</a>  <strong class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="61" href="#61">61</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="62" href="#62">62</a>  <strong class="jxr_keyword">import</strong> java.util.Properties;
-<a class="jxr_linenumber" name="63" href="#63">63</a>  <strong class="jxr_keyword">import</strong> java.util.StringTokenizer;
-<a class="jxr_linenumber" name="64" href="#64">64</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Matcher;
-<a class="jxr_linenumber" name="65" href="#65">65</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Pattern;
-<a class="jxr_linenumber" name="66" href="#66">66</a>  
-<a class="jxr_linenumber" name="67" href="#67">67</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="68" href="#68">68</a>  <em class="jxr_javadoccomment"> * @author Jason van Zyl</em>
-<a class="jxr_linenumber" name="69" href="#69">69</a>  <em class="jxr_javadoccomment"> * @author &lt;a href="<a href="mailto:brett@apache.org" target="alexandria_uri">mailto:brett@apache.org</a>"&gt;Brett Porter&lt;/a&gt;</em>
-<a class="jxr_linenumber" name="70" href="#70">70</a>  <em class="jxr_javadoccomment"> * @version $Id: Verifier.java 1134539 2011-06-11 07:47:41Z olamy $</em>
-<a class="jxr_linenumber" name="71" href="#71">71</a>  <em class="jxr_javadoccomment"> * @noinspection UseOfSystemOutOrSystemErr, RefusedBequest</em>
-<a class="jxr_linenumber" name="72" href="#72">72</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="73" href="#73">73</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a>  {
-<a class="jxr_linenumber" name="75" href="#75">75</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String LOG_FILENAME = <span class="jxr_string">"log.txt"</span>;
-<a class="jxr_linenumber" name="76" href="#76">76</a>  
-<a class="jxr_linenumber" name="77" href="#77">77</a>      <strong class="jxr_keyword">public</strong> String localRepo;
+<a class="jxr_linenumber" name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.io.BufferedReader;
+<a class="jxr_linenumber" name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayOutputStream;
+<a class="jxr_linenumber" name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> java.io.File;
+<a class="jxr_linenumber" name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> java.io.FileInputStream;
+<a class="jxr_linenumber" name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> java.io.FileNotFoundException;
+<a class="jxr_linenumber" name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> java.io.FileReader;
+<a class="jxr_linenumber" name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> java.io.FileWriter;
+<a class="jxr_linenumber" name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> java.io.FilenameFilter;
+<a class="jxr_linenumber" name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> java.io.InputStream;
+<a class="jxr_linenumber" name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> java.io.InputStreamReader;
+<a class="jxr_linenumber" name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> java.io.PrintStream;
+<a class="jxr_linenumber" name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> java.io.Writer;
+<a class="jxr_linenumber" name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> java.net.MalformedURLException;
+<a class="jxr_linenumber" name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> java.net.URL;
+<a class="jxr_linenumber" name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> java.text.DecimalFormat;
+<a class="jxr_linenumber" name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> java.text.NumberFormat;
+<a class="jxr_linenumber" name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> java.util.ArrayList;
+<a class="jxr_linenumber" name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<a class="jxr_linenumber" name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> java.util.Collections;
+<a class="jxr_linenumber" name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> java.util.Iterator;
+<a class="jxr_linenumber" name="43" href="#43">43</a>  <strong class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="44" href="#44">44</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> java.util.Properties;
+<a class="jxr_linenumber" name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> java.util.StringTokenizer;
+<a class="jxr_linenumber" name="47" href="#47">47</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Matcher;
+<a class="jxr_linenumber" name="48" href="#48">48</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Pattern;
+<a class="jxr_linenumber" name="49" href="#49">49</a>  
+<a class="jxr_linenumber" name="50" href="#50">50</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.StringUtils;
+<a class="jxr_linenumber" name="51" href="#51">51</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.cli.CommandLineException;
+<a class="jxr_linenumber" name="52" href="#52">52</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.cli.CommandLineUtils;
+<a class="jxr_linenumber" name="53" href="#53">53</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.cli.Commandline;
+<a class="jxr_linenumber" name="54" href="#54">54</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.cli.StreamConsumer;
+<a class="jxr_linenumber" name="55" href="#55">55</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.cli.WriterStreamConsumer;
+<a class="jxr_linenumber" name="56" href="#56">56</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.io.FileUtils;
+<a class="jxr_linenumber" name="57" href="#57">57</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.io.IOUtil;
+<a class="jxr_linenumber" name="58" href="#58">58</a>  
+<a class="jxr_linenumber" name="59" href="#59">59</a>  <strong class="jxr_keyword">import</strong> javax.xml.parsers.ParserConfigurationException;
+<a class="jxr_linenumber" name="60" href="#60">60</a>  <strong class="jxr_keyword">import</strong> javax.xml.parsers.SAXParser;
+<a class="jxr_linenumber" name="61" href="#61">61</a>  <strong class="jxr_keyword">import</strong> javax.xml.parsers.SAXParserFactory;
+<a class="jxr_linenumber" name="62" href="#62">62</a>  
+<a class="jxr_linenumber" name="63" href="#63">63</a>  <strong class="jxr_keyword">import</strong> junit.framework.Assert;
+<a class="jxr_linenumber" name="64" href="#64">64</a>  <strong class="jxr_keyword">import</strong> org.xml.sax.InputSource;
+<a class="jxr_linenumber" name="65" href="#65">65</a>  <strong class="jxr_keyword">import</strong> org.xml.sax.SAXException;
+<a class="jxr_linenumber" name="66" href="#66">66</a>  <strong class="jxr_keyword">import</strong> org.xml.sax.SAXParseException;
+<a class="jxr_linenumber" name="67" href="#67">67</a>  <strong class="jxr_keyword">import</strong> org.xml.sax.helpers.DefaultHandler;
+<a class="jxr_linenumber" name="68" href="#68">68</a>  
+<a class="jxr_linenumber" name="69" href="#69">69</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="70" href="#70">70</a>  <em class="jxr_javadoccomment"> * @author Jason van Zyl</em>
+<a class="jxr_linenumber" name="71" href="#71">71</a>  <em class="jxr_javadoccomment"> * @author &lt;a href="<a href="mailto:brett@apache.org" target="alexandria_uri">mailto:brett@apache.org</a>"&gt;Brett Porter&lt;/a&gt;</em>
+<a class="jxr_linenumber" name="72" href="#72">72</a>  <em class="jxr_javadoccomment"> * @version $Id: Verifier.java 1421845 2012-12-14 13:25:07Z krosenvold $</em>
+<a class="jxr_linenumber" name="73" href="#73">73</a>  <em class="jxr_javadoccomment"> * @noinspection UseOfSystemOutOrSystemErr, RefusedBequest, UnusedDeclaration</em>
+<a class="jxr_linenumber" name="74" href="#74">74</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="75" href="#75">75</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>
+<a class="jxr_linenumber" name="76" href="#76">76</a>  {
+<a class="jxr_linenumber" name="77" href="#77">77</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String LOG_FILENAME = <span class="jxr_string">"log.txt"</span>;
 <a class="jxr_linenumber" name="78" href="#78">78</a>  
-<a class="jxr_linenumber" name="79" href="#79">79</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String basedir;
+<a class="jxr_linenumber" name="79" href="#79">79</a>      <strong class="jxr_keyword">public</strong> String localRepo;
 <a class="jxr_linenumber" name="80" href="#80">80</a>  
-<a class="jxr_linenumber" name="81" href="#81">81</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> ByteArrayOutputStream outStream = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a class="jxr_linenumber" name="81" href="#81">81</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String basedir;
 <a class="jxr_linenumber" name="82" href="#82">82</a>  
-<a class="jxr_linenumber" name="83" href="#83">83</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> ByteArrayOutputStream errStream = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a class="jxr_linenumber" name="83" href="#83">83</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> ByteArrayOutputStream outStream = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
 <a class="jxr_linenumber" name="84" href="#84">84</a>  
-<a class="jxr_linenumber" name="85" href="#85">85</a>      <strong class="jxr_keyword">private</strong> PrintStream originalOut;
+<a class="jxr_linenumber" name="85" href="#85">85</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> ByteArrayOutputStream errStream = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
 <a class="jxr_linenumber" name="86" href="#86">86</a>  
-<a class="jxr_linenumber" name="87" href="#87">87</a>      <strong class="jxr_keyword">private</strong> PrintStream originalErr;
+<a class="jxr_linenumber" name="87" href="#87">87</a>      <strong class="jxr_keyword">private</strong> PrintStream originalOut;
 <a class="jxr_linenumber" name="88" href="#88">88</a>  
-<a class="jxr_linenumber" name="89" href="#89">89</a>      <strong class="jxr_keyword">private</strong> List cliOptions = <strong class="jxr_keyword">new</strong> ArrayList();
+<a class="jxr_linenumber" name="89" href="#89">89</a>      <strong class="jxr_keyword">private</strong> PrintStream originalErr;
 <a class="jxr_linenumber" name="90" href="#90">90</a>  
-<a class="jxr_linenumber" name="91" href="#91">91</a>      <strong class="jxr_keyword">private</strong> Properties systemProperties = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="91" href="#91">91</a>      <strong class="jxr_keyword">private</strong> List&lt;String&gt; cliOptions = <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;();
 <a class="jxr_linenumber" name="92" href="#92">92</a>  
-<a class="jxr_linenumber" name="93" href="#93">93</a>      <strong class="jxr_keyword">private</strong> Properties environmentVariables = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="93" href="#93">93</a>      <strong class="jxr_keyword">private</strong> Properties systemProperties = <strong class="jxr_keyword">new</strong> Properties();
 <a class="jxr_linenumber" name="94" href="#94">94</a>  
-<a class="jxr_linenumber" name="95" href="#95">95</a>      <strong class="jxr_keyword">private</strong> Properties verifierProperties = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="95" href="#95">95</a>      <strong class="jxr_keyword">private</strong> Properties environmentVariables = <strong class="jxr_keyword">new</strong> Properties();
 <a class="jxr_linenumber" name="96" href="#96">96</a>  
-<a class="jxr_linenumber" name="97" href="#97">97</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> autoclean = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="97" href="#97">97</a>      <strong class="jxr_keyword">private</strong> Properties verifierProperties = <strong class="jxr_keyword">new</strong> Properties();
 <a class="jxr_linenumber" name="98" href="#98">98</a>  
-<a class="jxr_linenumber" name="99" href="#99">99</a>      <strong class="jxr_keyword">private</strong> String localRepoLayout = <span class="jxr_string">"default"</span>;
+<a class="jxr_linenumber" name="99" href="#99">99</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> autoclean = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="100" href="#100">100</a> 
-<a class="jxr_linenumber" name="101" href="#101">101</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> debug;
+<a class="jxr_linenumber" name="101" href="#101">101</a>     <strong class="jxr_keyword">private</strong> String localRepoLayout = <span class="jxr_string">"default"</span>;
 <a class="jxr_linenumber" name="102" href="#102">102</a> 
-<a class="jxr_linenumber" name="103" href="#103">103</a>     <strong class="jxr_keyword">private</strong> Boolean forkJvm;
+<a class="jxr_linenumber" name="103" href="#103">103</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> debug;
 <a class="jxr_linenumber" name="104" href="#104">104</a> 
-<a class="jxr_linenumber" name="105" href="#105">105</a>     <strong class="jxr_keyword">private</strong> String logFileName = LOG_FILENAME;
+<a class="jxr_linenumber" name="105" href="#105">105</a>     <strong class="jxr_keyword">private</strong> Boolean forkJvm;
 <a class="jxr_linenumber" name="106" href="#106">106</a> 
-<a class="jxr_linenumber" name="107" href="#107">107</a>     <strong class="jxr_keyword">private</strong> String defaultMavenHome;
+<a class="jxr_linenumber" name="107" href="#107">107</a>     <strong class="jxr_keyword">private</strong> String logFileName = LOG_FILENAME;
 <a class="jxr_linenumber" name="108" href="#108">108</a> 
-<a class="jxr_linenumber" name="109" href="#109">109</a>     <em class="jxr_comment">// will launch mvn with --debug </em>
-<a class="jxr_linenumber" name="110" href="#110">110</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> mavenDebug = false;
-<a class="jxr_linenumber" name="111" href="#111">111</a> 
-<a class="jxr_linenumber" name="112" href="#112">112</a>     <strong class="jxr_keyword">private</strong> String forkMode;
+<a class="jxr_linenumber" name="109" href="#109">109</a>     <strong class="jxr_keyword">private</strong> String defaultMavenHome;
+<a class="jxr_linenumber" name="110" href="#110">110</a> 
+<a class="jxr_linenumber" name="111" href="#111">111</a>     <em class="jxr_comment">// will launch mvn with --debug </em>
+<a class="jxr_linenumber" name="112" href="#112">112</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> mavenDebug = false;
 <a class="jxr_linenumber" name="113" href="#113">113</a> 
-<a class="jxr_linenumber" name="114" href="#114">114</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> debugJvm = false;
+<a class="jxr_linenumber" name="114" href="#114">114</a>     <strong class="jxr_keyword">private</strong> String forkMode;
 <a class="jxr_linenumber" name="115" href="#115">115</a> 
-<a class="jxr_linenumber" name="116" href="#116">116</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <a href="../../../../org/apache/maven/it/MavenLauncher.html">MavenLauncher</a> embeddedLauncher;
+<a class="jxr_linenumber" name="116" href="#116">116</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> debugJvm = false;
 <a class="jxr_linenumber" name="117" href="#117">117</a> 
-<a class="jxr_linenumber" name="118" href="#118">118</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir )
-<a class="jxr_linenumber" name="119" href="#119">119</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="120" href="#120">120</a>     {
-<a class="jxr_linenumber" name="121" href="#121">121</a>         <strong class="jxr_keyword">this</strong>( basedir, <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="122" href="#122">122</a>     }
-<a class="jxr_linenumber" name="123" href="#123">123</a> 
-<a class="jxr_linenumber" name="124" href="#124">124</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, <strong class="jxr_keyword">boolean</strong> debug )
-<a class="jxr_linenumber" name="125" href="#125">125</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="126" href="#126">126</a>     {
-<a class="jxr_linenumber" name="127" href="#127">127</a>         <strong class="jxr_keyword">this</strong>( basedir, <strong class="jxr_keyword">null</strong>, debug );
-<a class="jxr_linenumber" name="128" href="#128">128</a>     }
-<a class="jxr_linenumber" name="129" href="#129">129</a> 
-<a class="jxr_linenumber" name="130" href="#130">130</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, String settingsFile )
-<a class="jxr_linenumber" name="131" href="#131">131</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="132" href="#132">132</a>     {
-<a class="jxr_linenumber" name="133" href="#133">133</a>         <strong class="jxr_keyword">this</strong>( basedir, settingsFile, false );
-<a class="jxr_linenumber" name="134" href="#134">134</a>     }
-<a class="jxr_linenumber" name="135" href="#135">135</a> 
-<a class="jxr_linenumber" name="136" href="#136">136</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, String settingsFile, <strong class="jxr_keyword">boolean</strong> debug )
-<a class="jxr_linenumber" name="137" href="#137">137</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="138" href="#138">138</a>     {
-<a class="jxr_linenumber" name="139" href="#139">139</a>         <strong class="jxr_keyword">this</strong>( basedir, settingsFile, debug, <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="140" href="#140">140</a>     }
-<a class="jxr_linenumber" name="141" href="#141">141</a> 
-<a class="jxr_linenumber" name="142" href="#142">142</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, String settingsFile, <strong class="jxr_keyword">boolean</strong> debug, <strong class="jxr_keyword">boolean</strong> forkJvm )
-<a class="jxr_linenumber" name="143" href="#143">143</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="144" href="#144">144</a>     {
-<a class="jxr_linenumber" name="145" href="#145">145</a>         <strong class="jxr_keyword">this</strong>( basedir, settingsFile, debug, Boolean.valueOf( forkJvm ) );
-<a class="jxr_linenumber" name="146" href="#146">146</a>     }
-<a class="jxr_linenumber" name="147" href="#147">147</a> 
-<a class="jxr_linenumber" name="148" href="#148">148</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, String settingsFile, <strong class="jxr_keyword">boolean</strong> debug, Boolean forkJvm )
-<a class="jxr_linenumber" name="149" href="#149">149</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="150" href="#150">150</a>     {
-<a class="jxr_linenumber" name="151" href="#151">151</a>         <strong class="jxr_keyword">this</strong>.basedir = basedir;
-<a class="jxr_linenumber" name="152" href="#152">152</a> 
-<a class="jxr_linenumber" name="153" href="#153">153</a>         <strong class="jxr_keyword">this</strong>.debug = debug;
+<a class="jxr_linenumber" name="118" href="#118">118</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <a href="../../../../org/apache/maven/it/MavenLauncher.html">MavenLauncher</a> embeddedLauncher;
+<a class="jxr_linenumber" name="119" href="#119">119</a> 
+<a class="jxr_linenumber" name="120" href="#120">120</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir )
+<a class="jxr_linenumber" name="121" href="#121">121</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="122" href="#122">122</a>     {
+<a class="jxr_linenumber" name="123" href="#123">123</a>         <strong class="jxr_keyword">this</strong>( basedir, <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="124" href="#124">124</a>     }
+<a class="jxr_linenumber" name="125" href="#125">125</a> 
+<a class="jxr_linenumber" name="126" href="#126">126</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, <strong class="jxr_keyword">boolean</strong> debug )
+<a class="jxr_linenumber" name="127" href="#127">127</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="128" href="#128">128</a>     {
+<a class="jxr_linenumber" name="129" href="#129">129</a>         <strong class="jxr_keyword">this</strong>( basedir, <strong class="jxr_keyword">null</strong>, debug );
+<a class="jxr_linenumber" name="130" href="#130">130</a>     }
+<a class="jxr_linenumber" name="131" href="#131">131</a> 
+<a class="jxr_linenumber" name="132" href="#132">132</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, String settingsFile )
+<a class="jxr_linenumber" name="133" href="#133">133</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="134" href="#134">134</a>     {
+<a class="jxr_linenumber" name="135" href="#135">135</a>         <strong class="jxr_keyword">this</strong>( basedir, settingsFile, false );
+<a class="jxr_linenumber" name="136" href="#136">136</a>     }
+<a class="jxr_linenumber" name="137" href="#137">137</a> 
+<a class="jxr_linenumber" name="138" href="#138">138</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, String settingsFile, <strong class="jxr_keyword">boolean</strong> debug )
+<a class="jxr_linenumber" name="139" href="#139">139</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="140" href="#140">140</a>     {
+<a class="jxr_linenumber" name="141" href="#141">141</a>         <strong class="jxr_keyword">this</strong>( basedir, settingsFile, debug, <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="142" href="#142">142</a>     }
+<a class="jxr_linenumber" name="143" href="#143">143</a> 
+<a class="jxr_linenumber" name="144" href="#144">144</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, String settingsFile, <strong class="jxr_keyword">boolean</strong> debug, <strong class="jxr_keyword">boolean</strong> forkJvm )
+<a class="jxr_linenumber" name="145" href="#145">145</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="146" href="#146">146</a>     {
+<a class="jxr_linenumber" name="147" href="#147">147</a>         <strong class="jxr_keyword">this</strong>( basedir, settingsFile, debug, Boolean.valueOf( forkJvm ) );
+<a class="jxr_linenumber" name="148" href="#148">148</a>     }
+<a class="jxr_linenumber" name="149" href="#149">149</a> 
+<a class="jxr_linenumber" name="150" href="#150">150</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/maven/it/Verifier.html">Verifier</a>( String basedir, String settingsFile, <strong class="jxr_keyword">boolean</strong> debug, Boolean forkJvm )
+<a class="jxr_linenumber" name="151" href="#151">151</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="152" href="#152">152</a>     {
+<a class="jxr_linenumber" name="153" href="#153">153</a>         <strong class="jxr_keyword">this</strong>.basedir = basedir;
 <a class="jxr_linenumber" name="154" href="#154">154</a> 
 <a class="jxr_linenumber" name="155" href="#155">155</a>         <strong class="jxr_keyword">this</strong>.forkJvm = forkJvm;
-<a class="jxr_linenumber" name="156" href="#156">156</a>         <strong class="jxr_keyword">this</strong>.forkMode = System.getProperty( <span class="jxr_string">"verifier.forkMode"</span> );
+<a class="jxr_linenumber" name="156" href="#156">156</a>         <strong class="jxr_keyword">this</strong>.
 <a class="jxr_linenumber" name="157" href="#157">157</a> 
-<a class="jxr_linenumber" name="158" href="#158">158</a>         <strong class="jxr_keyword">if</strong> ( !debug )
-<a class="jxr_linenumber" name="159" href="#159">159</a>         {
-<a class="jxr_linenumber" name="160" href="#160">160</a>             originalOut = System.out;
-<a class="jxr_linenumber" name="161" href="#161">161</a> 
-<a class="jxr_linenumber" name="162" href="#162">162</a>             System.setOut( <strong class="jxr_keyword">new</strong> PrintStream( outStream ) );
+<a class="jxr_linenumber" name="158" href="#158">158</a>             forkMode = System.getProperty( <span class="jxr_string">"verifier.forkMode"</span> );
+<a class="jxr_linenumber" name="159" href="#159">159</a> 
+<a class="jxr_linenumber" name="160" href="#160">160</a>         <strong class="jxr_keyword">if</strong> ( !debug )
+<a class="jxr_linenumber" name="161" href="#161">161</a>         {
+<a class="jxr_linenumber" name="162" href="#162">162</a>             originalOut = System.out;
 <a class="jxr_linenumber" name="163" href="#163">163</a> 
 <a class="jxr_linenumber" name="164" href="#164">164</a>             originalErr = System.err;
-<a class="jxr_linenumber" name="165" href="#165">165</a> 
-<a class="jxr_linenumber" name="166" href="#166">166</a>             System.setErr( <strong class="jxr_keyword">new</strong> PrintStream( errStream ) );
-<a class="jxr_linenumber" name="167" href="#167">167</a>         }
+<a class="jxr_linenumber" name="165" href="#165">165</a>         }
+<a class="jxr_linenumber" name="166" href="#166">166</a> 
+<a class="jxr_linenumber" name="167" href="#167">167</a>         setDebug( debug );
 <a class="jxr_linenumber" name="168" href="#168">168</a> 
 <a class="jxr_linenumber" name="169" href="#169">169</a>         findLocalRepo( settingsFile );
 <a class="jxr_linenumber" name="170" href="#170">170</a>         findDefaultMavenHome();
@@ -258,9 +258,9 @@
 <a class="jxr_linenumber" name="248" href="#248">248</a>     {
 <a class="jxr_linenumber" name="249" href="#249">249</a>         List lines = loadFile( getBasedir(), <span class="jxr_string">"expected-results.txt"</span>, false );
 <a class="jxr_linenumber" name="250" href="#250">250</a> 
-<a class="jxr_linenumber" name="251" href="#251">251</a>         <strong class="jxr_keyword">for</strong> ( Iterator i = lines.iterator(); i.hasNext(); )
+<a class="jxr_linenumber" name="251" href="#251">251</a>         <strong class="jxr_keyword">for</strong> ( Object line1 : lines )
 <a class="jxr_linenumber" name="252" href="#252">252</a>         {
-<a class="jxr_linenumber" name="253" href="#253">253</a>             String line = (String) i.next();
+<a class="jxr_linenumber" name="253" href="#253">253</a>             String line = (String) line1;
 <a class="jxr_linenumber" name="254" href="#254">254</a> 
 <a class="jxr_linenumber" name="255" href="#255">255</a>             verifyExpectedResult( line );
 <a class="jxr_linenumber" name="256" href="#256">256</a>         }
@@ -274,1803 +274,1792 @@
 <a class="jxr_linenumber" name="264" href="#264">264</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> verifyErrorFreeLog()
 <a class="jxr_linenumber" name="265" href="#265">265</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
 <a class="jxr_linenumber" name="266" href="#266">266</a>     {
-<a class="jxr_linenumber" name="267" href="#267">267</a>         List lines;
-<a class="jxr_linenumber" name="268" href="#268">268</a>         lines = loadFile( getBasedir(), getLogFileName(), false );
-<a class="jxr_linenumber" name="269" href="#269">269</a> 
-<a class="jxr_linenumber" name="270" href="#270">270</a>         <strong class="jxr_keyword">for</strong> ( Iterator i = lines.iterator(); i.hasNext(); )
-<a class="jxr_linenumber" name="271" href="#271">271</a>         {
-<a class="jxr_linenumber" name="272" href="#272">272</a>             String line = (String) i.next();
-<a class="jxr_linenumber" name="273" href="#273">273</a> 
-<a class="jxr_linenumber" name="274" href="#274">274</a>             <em class="jxr_comment">// A hack to keep stupid velocity resource loader errors from triggering failure</em>
-<a class="jxr_linenumber" name="275" href="#275">275</a>             <strong class="jxr_keyword">if</strong> ( line.indexOf( <span class="jxr_string">"[ERROR]"</span> ) &gt;= 0 &amp;&amp; !isVelocityError( line ) )
-<a class="jxr_linenumber" name="276" href="#276">276</a>             {
-<a class="jxr_linenumber" name="277" href="#277">277</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( <span class="jxr_string">"Error in execution: "</span> + line );
-<a class="jxr_linenumber" name="278" href="#278">278</a>             }
-<a class="jxr_linenumber" name="279" href="#279">279</a>         }
-<a class="jxr_linenumber" name="280" href="#280">280</a>     }
-<a class="jxr_linenumber" name="281" href="#281">281</a> 
-<a class="jxr_linenumber" name="282" href="#282">282</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_javadoccomment">     * Checks whether the specified line is just an error message from Velocity. Especially old versions of Doxia employ</em>
-<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_javadoccomment">     * a very noisy Velocity instance.</em>
-<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="286" href="#286">286</a> <em class="jxr_javadoccomment">     * @param line The log line to check, must not be &lt;code&gt;null&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="287" href="#287">287</a> <em class="jxr_javadoccomment">     * @return &lt;code&gt;true&lt;/code&gt; if the line appears to be a Velocity error, &lt;code&gt;false&lt;/code&gt; otherwise.</em>
-<a class="jxr_linenumber" name="288" href="#288">288</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="289" href="#289">289</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> isVelocityError( String line )
-<a class="jxr_linenumber" name="290" href="#290">290</a>     {
-<a class="jxr_linenumber" name="291" href="#291">291</a>         <strong class="jxr_keyword">if</strong> ( line.indexOf( <span class="jxr_string">"VM_global_library.vm"</span> ) &gt;= 0 )
-<a class="jxr_linenumber" name="292" href="#292">292</a>         {
-<a class="jxr_linenumber" name="293" href="#293">293</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="294" href="#294">294</a>         }
-<a class="jxr_linenumber" name="295" href="#295">295</a>         <strong class="jxr_keyword">if</strong> ( line.indexOf( <span class="jxr_string">"VM #"</span> ) &gt;= 0 &amp;&amp; line.indexOf( <span class="jxr_string">"macro"</span> ) &gt;= 0 )
-<a class="jxr_linenumber" name="296" href="#296">296</a>         {
-<a class="jxr_linenumber" name="297" href="#297">297</a>             <em class="jxr_comment">// [ERROR] VM #displayTree: error : too few arguments to macro. Wanted 2 got 0</em>
-<a class="jxr_linenumber" name="298" href="#298">298</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="299" href="#299">299</a>         }
-<a class="jxr_linenumber" name="300" href="#300">300</a>         <strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="301" href="#301">301</a>     }
-<a class="jxr_linenumber" name="302" href="#302">302</a> 
-<a class="jxr_linenumber" name="303" href="#303">303</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="304" href="#304">304</a> <em class="jxr_javadoccomment">     * Throws an exception if the text is not present in the log.</em>
-<a class="jxr_linenumber" name="305" href="#305">305</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="306" href="#306">306</a> <em class="jxr_javadoccomment">     * @param text</em>
-<a class="jxr_linenumber" name="307" href="#307">307</a> <em class="jxr_javadoccomment">     * @throws VerificationException</em>
-<a class="jxr_linenumber" name="308" href="#308">308</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="309" href="#309">309</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> verifyTextInLog( String text )
-<a class="jxr_linenumber" name="310" href="#310">310</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="311" href="#311">311</a>     {
-<a class="jxr_linenumber" name="312" href="#312">312</a>         List lines;
-<a class="jxr_linenumber" name="313" href="#313">313</a>         lines = loadFile( getBasedir(), getLogFileName(), false );
-<a class="jxr_linenumber" name="314" href="#314">314</a> 
-<a class="jxr_linenumber" name="315" href="#315">315</a>         <strong class="jxr_keyword">boolean</strong> result = false;
-<a class="jxr_linenumber" name="316" href="#316">316</a>         <strong class="jxr_keyword">for</strong> ( Iterator i = lines.iterator(); i.hasNext(); )
-<a class="jxr_linenumber" name="317" href="#317">317</a>         {
-<a class="jxr_linenumber" name="318" href="#318">318</a>             String line = (String) i.next();
-<a class="jxr_linenumber" name="319" href="#319">319</a>             <strong class="jxr_keyword">if</strong> ( line.indexOf( text ) &gt;= 0 )
-<a class="jxr_linenumber" name="320" href="#320">320</a>             {
-<a class="jxr_linenumber" name="321" href="#321">321</a>                 result = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="322" href="#322">322</a>                 <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="323" href="#323">323</a>             }
-<a class="jxr_linenumber" name="324" href="#324">324</a>         }
-<a class="jxr_linenumber" name="325" href="#325">325</a>         <strong class="jxr_keyword">if</strong> ( !result )
-<a class="jxr_linenumber" name="326" href="#326">326</a>         {
-<a class="jxr_linenumber" name="327" href="#327">327</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( <span class="jxr_string">"Text not found in log: "</span> + text );
-<a class="jxr_linenumber" name="328" href="#328">328</a>         }
-<a class="jxr_linenumber" name="329" href="#329">329</a>     }
-<a class="jxr_linenumber" name="330" href="#330">330</a> 
-<a class="jxr_linenumber" name="331" href="#331">331</a>     <strong class="jxr_keyword">public</strong> Properties loadProperties( String filename )
-<a class="jxr_linenumber" name="332" href="#332">332</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="333" href="#333">333</a>     {
-<a class="jxr_linenumber" name="334" href="#334">334</a>         Properties properties = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="335" href="#335">335</a> 
-<a class="jxr_linenumber" name="336" href="#336">336</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="337" href="#337">337</a>         {
-<a class="jxr_linenumber" name="338" href="#338">338</a>             File propertiesFile = <strong class="jxr_keyword">new</strong> File( getBasedir(), filename );
-<a class="jxr_linenumber" name="339" href="#339">339</a>             <strong class="jxr_keyword">if</strong> ( propertiesFile.exists() )
-<a class="jxr_linenumber" name="340" href="#340">340</a>             {
-<a class="jxr_linenumber" name="341" href="#341">341</a>                 FileInputStream fis = <strong class="jxr_keyword">new</strong> FileInputStream( propertiesFile );
-<a class="jxr_linenumber" name="342" href="#342">342</a>                 <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="343" href="#343">343</a>                 {
-<a class="jxr_linenumber" name="344" href="#344">344</a>                     properties.load( fis );
-<a class="jxr_linenumber" name="345" href="#345">345</a>                 }
-<a class="jxr_linenumber" name="346" href="#346">346</a>                 <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="347" href="#347">347</a>                 {
-<a class="jxr_linenumber" name="348" href="#348">348</a>                     fis.close();
-<a class="jxr_linenumber" name="349" href="#349">349</a>                 }
-<a class="jxr_linenumber" name="350" href="#350">350</a>             }
-<a class="jxr_linenumber" name="351" href="#351">351</a>         }
-<a class="jxr_linenumber" name="352" href="#352">352</a>         <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e )
-<a class="jxr_linenumber" name="353" href="#353">353</a>         {
-<a class="jxr_linenumber" name="354" href="#354">354</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( <span class="jxr_string">"Error reading properties file"</span>, e );
-<a class="jxr_linenumber" name="355" href="#355">355</a>         }
-<a class="jxr_linenumber" name="356" href="#356">356</a>         <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="357" href="#357">357</a>         {
-<a class="jxr_linenumber" name="358" href="#358">358</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( <span class="jxr_string">"Error reading properties file"</span>, e );
-<a class="jxr_linenumber" name="359" href="#359">359</a>         }
-<a class="jxr_linenumber" name="360" href="#360">360</a> 
-<a class="jxr_linenumber" name="361" href="#361">361</a>         <strong class="jxr_keyword">return</strong> properties;
-<a class="jxr_linenumber" name="362" href="#362">362</a>     }
-<a class="jxr_linenumber" name="363" href="#363">363</a> 
-<a class="jxr_linenumber" name="364" href="#364">364</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="365" href="#365">365</a> <em class="jxr_javadoccomment">     * Loads the (non-empty) lines of the specified text file.</em>
-<a class="jxr_linenumber" name="366" href="#366">366</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="367" href="#367">367</a> <em class="jxr_javadoccomment">     * @param filename The path to the text file to load, relative to the base directory, must not be &lt;code&gt;null&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="368" href="#368">368</a> <em class="jxr_javadoccomment">     * @param encoding The character encoding of the file, may be &lt;code&gt;null&lt;/code&gt; or empty to use the platform default</em>
-<a class="jxr_linenumber" name="369" href="#369">369</a> <em class="jxr_javadoccomment">     *                 encoding.</em>
-<a class="jxr_linenumber" name="370" href="#370">370</a> <em class="jxr_javadoccomment">     * @return The list of (non-empty) lines from the text file, can be empty but never &lt;code&gt;null&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="371" href="#371">371</a> <em class="jxr_javadoccomment">     * @throws IOException If the file could not be loaded.</em>
-<a class="jxr_linenumber" name="372" href="#372">372</a> <em class="jxr_javadoccomment">     * @since 1.2</em>
-<a class="jxr_linenumber" name="373" href="#373">373</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="374" href="#374">374</a>     <strong class="jxr_keyword">public</strong> List loadLines( String filename, String encoding )
-<a class="jxr_linenumber" name="375" href="#375">375</a>         <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="376" href="#376">376</a>     {
-<a class="jxr_linenumber" name="377" href="#377">377</a>         List lines = <strong class="jxr_keyword">new</strong> ArrayList();
+<a class="jxr_linenumber" name="267" href="#267">267</a>         List&lt;String&gt; lines = loadFile( getBasedir(), getLogFileName(), false );
+<a class="jxr_linenumber" name="268" href="#268">268</a> 
+<a class="jxr_linenumber" name="269" href="#269">269</a>         <strong class="jxr_keyword">for</strong> ( String line : lines )
+<a class="jxr_linenumber" name="270" href="#270">270</a>         {
+<a class="jxr_linenumber" name="271" href="#271">271</a>             <em class="jxr_comment">// A hack to keep stupid velocity resource loader errors from triggering failure</em>
+<a class="jxr_linenumber" name="272" href="#272">272</a>             <strong class="jxr_keyword">if</strong> ( line.contains( <span class="jxr_string">"[ERROR]"</span> ) &amp;&amp; !isVelocityError( line ) )
+<a class="jxr_linenumber" name="273" href="#273">273</a>             {
+<a class="jxr_linenumber" name="274" href="#274">274</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( <span class="jxr_string">"Error in execution: "</span> + line );
+<a class="jxr_linenumber" name="275" href="#275">275</a>             }
+<a class="jxr_linenumber" name="276" href="#276">276</a>         }
+<a class="jxr_linenumber" name="277" href="#277">277</a>     }
+<a class="jxr_linenumber" name="278" href="#278">278</a> 
+<a class="jxr_linenumber" name="279" href="#279">279</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="280" href="#280">280</a> <em class="jxr_javadoccomment">     * Checks whether the specified line is just an error message from Velocity. Especially old versions of Doxia employ</em>
+<a class="jxr_linenumber" name="281" href="#281">281</a> <em class="jxr_javadoccomment">     * a very noisy Velocity instance.</em>
+<a class="jxr_linenumber" name="282" href="#282">282</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_javadoccomment">     * @param line The log line to check, must not be &lt;code&gt;null&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_javadoccomment">     * @return &lt;code&gt;true&lt;/code&gt; if the line appears to be a Velocity error, &lt;code&gt;false&lt;/code&gt; otherwise.</em>
+<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="286" href="#286">286</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> isVelocityError( String line )
+<a class="jxr_linenumber" name="287" href="#287">287</a>     {
+<a class="jxr_linenumber" name="288" href="#288">288</a>         <strong class="jxr_keyword">return</strong> line.contains( <span class="jxr_string">"VM_global_library.vm"</span> ) || line.contains( <span class="jxr_string">"VM #"</span> ) &amp;&amp; line.contains( <span class="jxr_string">"macro"</span> );
+<a class="jxr_linenumber" name="289" href="#289">289</a>     }
+<a class="jxr_linenumber" name="290" href="#290">290</a> 
+<a class="jxr_linenumber" name="291" href="#291">291</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="292" href="#292">292</a> <em class="jxr_javadoccomment">     * Throws an exception if the text is not present in the log.</em>
+<a class="jxr_linenumber" name="293" href="#293">293</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="294" href="#294">294</a> <em class="jxr_javadoccomment">     * @param text the text to assert present</em>
+<a class="jxr_linenumber" name="295" href="#295">295</a> <em class="jxr_javadoccomment">     * @throws VerificationException</em>
+<a class="jxr_linenumber" name="296" href="#296">296</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="297" href="#297">297</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> verifyTextInLog( String text )
+<a class="jxr_linenumber" name="298" href="#298">298</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="299" href="#299">299</a>     {
+<a class="jxr_linenumber" name="300" href="#300">300</a>         List&lt;String&gt; lines = loadFile( getBasedir(), getLogFileName(), false );
+<a class="jxr_linenumber" name="301" href="#301">301</a> 
+<a class="jxr_linenumber" name="302" href="#302">302</a>         <strong class="jxr_keyword">boolean</strong> result = false;
+<a class="jxr_linenumber" name="303" href="#303">303</a>         <strong class="jxr_keyword">for</strong> ( String line : lines )
+<a class="jxr_linenumber" name="304" href="#304">304</a>         {
+<a class="jxr_linenumber" name="305" href="#305">305</a>             <strong class="jxr_keyword">if</strong> ( line.contains( text ) )
+<a class="jxr_linenumber" name="306" href="#306">306</a>             {
+<a class="jxr_linenumber" name="307" href="#307">307</a>                 result = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="308" href="#308">308</a>                 <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="309" href="#309">309</a>             }
+<a class="jxr_linenumber" name="310" href="#310">310</a>         }
+<a class="jxr_linenumber" name="311" href="#311">311</a>         <strong class="jxr_keyword">if</strong> ( !result )
+<a class="jxr_linenumber" name="312" href="#312">312</a>         {
+<a class="jxr_linenumber" name="313" href="#313">313</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( <span class="jxr_string">"Text not found in log: "</span> + text );
+<a class="jxr_linenumber" name="314" href="#314">314</a>         }
+<a class="jxr_linenumber" name="315" href="#315">315</a>     }
+<a class="jxr_linenumber" name="316" href="#316">316</a> 
+<a class="jxr_linenumber" name="317" href="#317">317</a>     <strong class="jxr_keyword">public</strong> Properties loadProperties( String filename )
+<a class="jxr_linenumber" name="318" href="#318">318</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="319" href="#319">319</a>     {
+<a class="jxr_linenumber" name="320" href="#320">320</a>         Properties properties = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="321" href="#321">321</a> 
+<a class="jxr_linenumber" name="322" href="#322">322</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="323" href="#323">323</a>         {
+<a class="jxr_linenumber" name="324" href="#324">324</a>             File propertiesFile = <strong class="jxr_keyword">new</strong> File( getBasedir(), filename );
+<a class="jxr_linenumber" name="325" href="#325">325</a>             <strong class="jxr_keyword">if</strong> ( propertiesFile.exists() )
+<a class="jxr_linenumber" name="326" href="#326">326</a>             {
+<a class="jxr_linenumber" name="327" href="#327">327</a>                 FileInputStream fis = <strong class="jxr_keyword">new</strong> FileInputStream( propertiesFile );
+<a class="jxr_linenumber" name="328" href="#328">328</a>                 <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="329" href="#329">329</a>                 {
+<a class="jxr_linenumber" name="330" href="#330">330</a>                     properties.load( fis );
+<a class="jxr_linenumber" name="331" href="#331">331</a>                 }
+<a class="jxr_linenumber" name="332" href="#332">332</a>                 <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="333" href="#333">333</a>                 {
+<a class="jxr_linenumber" name="334" href="#334">334</a>                     fis.close();
+<a class="jxr_linenumber" name="335" href="#335">335</a>                 }
+<a class="jxr_linenumber" name="336" href="#336">336</a>             }
+<a class="jxr_linenumber" name="337" href="#337">337</a>         }
+<a class="jxr_linenumber" name="338" href="#338">338</a>         <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e )
+<a class="jxr_linenumber" name="339" href="#339">339</a>         {
+<a class="jxr_linenumber" name="340" href="#340">340</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( <span class="jxr_string">"Error reading properties file"</span>, e );
+<a class="jxr_linenumber" name="341" href="#341">341</a>         }
+<a class="jxr_linenumber" name="342" href="#342">342</a>         <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="343" href="#343">343</a>         {
+<a class="jxr_linenumber" name="344" href="#344">344</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( <span class="jxr_string">"Error reading properties file"</span>, e );
+<a class="jxr_linenumber" name="345" href="#345">345</a>         }
+<a class="jxr_linenumber" name="346" href="#346">346</a> 
+<a class="jxr_linenumber" name="347" href="#347">347</a>         <strong class="jxr_keyword">return</strong> properties;
+<a class="jxr_linenumber" name="348" href="#348">348</a>     }
+<a class="jxr_linenumber" name="349" href="#349">349</a> 
+<a class="jxr_linenumber" name="350" href="#350">350</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="351" href="#351">351</a> <em class="jxr_javadoccomment">     * Loads the (non-empty) lines of the specified text file.</em>
+<a class="jxr_linenumber" name="352" href="#352">352</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="353" href="#353">353</a> <em class="jxr_javadoccomment">     * @param filename The path to the text file to load, relative to the base directory, must not be &lt;code&gt;null&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="354" href="#354">354</a> <em class="jxr_javadoccomment">     * @param encoding The character encoding of the file, may be &lt;code&gt;null&lt;/code&gt; or empty to use the platform default</em>
+<a class="jxr_linenumber" name="355" href="#355">355</a> <em class="jxr_javadoccomment">     *                 encoding.</em>
+<a class="jxr_linenumber" name="356" href="#356">356</a> <em class="jxr_javadoccomment">     * @return The list of (non-empty) lines from the text file, can be empty but never &lt;code&gt;null&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="357" href="#357">357</a> <em class="jxr_javadoccomment">     * @throws IOException If the file could not be loaded.</em>
+<a class="jxr_linenumber" name="358" href="#358">358</a> <em class="jxr_javadoccomment">     * @since 1.2</em>
+<a class="jxr_linenumber" name="359" href="#359">359</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="360" href="#360">360</a>     <strong class="jxr_keyword">public</strong> List&lt;String&gt; loadLines( String filename, String encoding )
+<a class="jxr_linenumber" name="361" href="#361">361</a>         <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="362" href="#362">362</a>     {
+<a class="jxr_linenumber" name="363" href="#363">363</a>         List&lt;String&gt; lines = <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;();
+<a class="jxr_linenumber" name="364" href="#364">364</a> 
+<a class="jxr_linenumber" name="365" href="#365">365</a>         File file = <strong class="jxr_keyword">new</strong> File( getBasedir(), filename );
+<a class="jxr_linenumber" name="366" href="#366">366</a> 
+<a class="jxr_linenumber" name="367" href="#367">367</a>         BufferedReader reader = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="368" href="#368">368</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="369" href="#369">369</a>         {
+<a class="jxr_linenumber" name="370" href="#370">370</a>             <strong class="jxr_keyword">if</strong> ( StringUtils.isNotEmpty( encoding ) )
+<a class="jxr_linenumber" name="371" href="#371">371</a>             {
+<a class="jxr_linenumber" name="372" href="#372">372</a>                 reader = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> InputStreamReader( <strong class="jxr_keyword">new</strong> FileInputStream( file ), encoding ) );
+<a class="jxr_linenumber" name="373" href="#373">373</a>             }
+<a class="jxr_linenumber" name="374" href="#374">374</a>             <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="375" href="#375">375</a>             {
+<a class="jxr_linenumber" name="376" href="#376">376</a>                 reader = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> FileReader( file ) );
+<a class="jxr_linenumber" name="377" href="#377">377</a>             }
 <a class="jxr_linenumber" name="378" href="#378">378</a> 
-<a class="jxr_linenumber" name="379" href="#379">379</a>         File file = <strong class="jxr_keyword">new</strong> File( getBasedir(), filename );
-<a class="jxr_linenumber" name="380" href="#380">380</a> 
-<a class="jxr_linenumber" name="381" href="#381">381</a>         BufferedReader reader = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="382" href="#382">382</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="383" href="#383">383</a>         {
-<a class="jxr_linenumber" name="384" href="#384">384</a>             <strong class="jxr_keyword">if</strong> ( StringUtils.isNotEmpty( encoding ) )
-<a class="jxr_linenumber" name="385" href="#385">385</a>             {
-<a class="jxr_linenumber" name="386" href="#386">386</a>                 reader = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> InputStreamReader( <strong class="jxr_keyword">new</strong> FileInputStream( file ), encoding ) );
-<a class="jxr_linenumber" name="387" href="#387">387</a>             }
-<a class="jxr_linenumber" name="388" href="#388">388</a>             <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="389" href="#389">389</a>             {
-<a class="jxr_linenumber" name="390" href="#390">390</a>                 reader = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> FileReader( file ) );
-<a class="jxr_linenumber" name="391" href="#391">391</a>             }
+<a class="jxr_linenumber" name="379" href="#379">379</a>             String line;
+<a class="jxr_linenumber" name="380" href="#380">380</a>             <strong class="jxr_keyword">while</strong> ( ( line = reader.readLine() ) != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="381" href="#381">381</a>             {
+<a class="jxr_linenumber" name="382" href="#382">382</a>                 <strong class="jxr_keyword">if</strong> ( line.length() &gt; 0 )
+<a class="jxr_linenumber" name="383" href="#383">383</a>                 {
+<a class="jxr_linenumber" name="384" href="#384">384</a>                     lines.add( line );
+<a class="jxr_linenumber" name="385" href="#385">385</a>                 }
+<a class="jxr_linenumber" name="386" href="#386">386</a>             }
+<a class="jxr_linenumber" name="387" href="#387">387</a>         }
+<a class="jxr_linenumber" name="388" href="#388">388</a>         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="389" href="#389">389</a>         {
+<a class="jxr_linenumber" name="390" href="#390">390</a>             IOUtil.close( reader );
+<a class="jxr_linenumber" name="391" href="#391">391</a>         }
 <a class="jxr_linenumber" name="392" href="#392">392</a> 
-<a class="jxr_linenumber" name="393" href="#393">393</a>             String line;
-<a class="jxr_linenumber" name="394" href="#394">394</a>             <strong class="jxr_keyword">while</strong> ( ( line = reader.readLine() ) != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="395" href="#395">395</a>             {
-<a class="jxr_linenumber" name="396" href="#396">396</a>                 <strong class="jxr_keyword">if</strong> ( line.length() &gt; 0 )
-<a class="jxr_linenumber" name="397" href="#397">397</a>                 {
-<a class="jxr_linenumber" name="398" href="#398">398</a>                     lines.add( line );
-<a class="jxr_linenumber" name="399" href="#399">399</a>                 }
-<a class="jxr_linenumber" name="400" href="#400">400</a>             }
-<a class="jxr_linenumber" name="401" href="#401">401</a>         }
-<a class="jxr_linenumber" name="402" href="#402">402</a>         <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="403" href="#403">403</a>         {
-<a class="jxr_linenumber" name="404" href="#404">404</a>             IOUtil.close( reader );
-<a class="jxr_linenumber" name="405" href="#405">405</a>         }
+<a class="jxr_linenumber" name="393" href="#393">393</a>         <strong class="jxr_keyword">return</strong> lines;
+<a class="jxr_linenumber" name="394" href="#394">394</a>     }
+<a class="jxr_linenumber" name="395" href="#395">395</a> 
+<a class="jxr_linenumber" name="396" href="#396">396</a>     <strong class="jxr_keyword">public</strong> List&lt;String&gt; loadFile( String basedir, String filename, <strong class="jxr_keyword">boolean</strong> hasCommand )
+<a class="jxr_linenumber" name="397" href="#397">397</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="398" href="#398">398</a>     {
+<a class="jxr_linenumber" name="399" href="#399">399</a>         <strong class="jxr_keyword">return</strong> loadFile( <strong class="jxr_keyword">new</strong> File( basedir, filename ), hasCommand );
+<a class="jxr_linenumber" name="400" href="#400">400</a>     }
+<a class="jxr_linenumber" name="401" href="#401">401</a> 
+<a class="jxr_linenumber" name="402" href="#402">402</a>     <strong class="jxr_keyword">public</strong> List&lt;String&gt; loadFile( File file, <strong class="jxr_keyword">boolean</strong> hasCommand )
+<a class="jxr_linenumber" name="403" href="#403">403</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
+<a class="jxr_linenumber" name="404" href="#404">404</a>     {
+<a class="jxr_linenumber" name="405" href="#405">405</a>         List&lt;String&gt; lines = <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;();
 <a class="jxr_linenumber" name="406" href="#406">406</a> 
-<a class="jxr_linenumber" name="407" href="#407">407</a>         <strong class="jxr_keyword">return</strong> lines;
-<a class="jxr_linenumber" name="408" href="#408">408</a>     }
-<a class="jxr_linenumber" name="409" href="#409">409</a> 
-<a class="jxr_linenumber" name="410" href="#410">410</a>     <strong class="jxr_keyword">public</strong> List loadFile( String basedir, String filename, <strong class="jxr_keyword">boolean</strong> hasCommand )
-<a class="jxr_linenumber" name="411" href="#411">411</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="412" href="#412">412</a>     {
-<a class="jxr_linenumber" name="413" href="#413">413</a>         <strong class="jxr_keyword">return</strong> loadFile( <strong class="jxr_keyword">new</strong> File( basedir, filename ), hasCommand );
-<a class="jxr_linenumber" name="414" href="#414">414</a>     }
-<a class="jxr_linenumber" name="415" href="#415">415</a> 
-<a class="jxr_linenumber" name="416" href="#416">416</a>     <strong class="jxr_keyword">public</strong> List loadFile( File file, <strong class="jxr_keyword">boolean</strong> hasCommand )
-<a class="jxr_linenumber" name="417" href="#417">417</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>
-<a class="jxr_linenumber" name="418" href="#418">418</a>     {
-<a class="jxr_linenumber" name="419" href="#419">419</a>         List lines = <strong class="jxr_keyword">new</strong> ArrayList();
+<a class="jxr_linenumber" name="407" href="#407">407</a>         BufferedReader reader = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="408" href="#408">408</a> 
+<a class="jxr_linenumber" name="409" href="#409">409</a>         <strong class="jxr_keyword">if</strong> ( file.exists() )
+<a class="jxr_linenumber" name="410" href="#410">410</a>         {
+<a class="jxr_linenumber" name="411" href="#411">411</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="412" href="#412">412</a>             {
+<a class="jxr_linenumber" name="413" href="#413">413</a>                 reader = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> FileReader( file ) );
+<a class="jxr_linenumber" name="414" href="#414">414</a> 
+<a class="jxr_linenumber" name="415" href="#415">415</a>                 String line = reader.readLine();
+<a class="jxr_linenumber" name="416" href="#416">416</a> 
+<a class="jxr_linenumber" name="417" href="#417">417</a>                 <strong class="jxr_keyword">while</strong> ( line != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="418" href="#418">418</a>                 {
+<a class="jxr_linenumber" name="419" href="#419">419</a>                     line = line.trim();
 <a class="jxr_linenumber" name="420" href="#420">420</a> 
-<a class="jxr_linenumber" name="421" href="#421">421</a>         BufferedReader reader = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="422" href="#422">422</a> 
-<a class="jxr_linenumber" name="423" href="#423">423</a>         <strong class="jxr_keyword">if</strong> ( file.exists() )
-<a class="jxr_linenumber" name="424" href="#424">424</a>         {
-<a class="jxr_linenumber" name="425" href="#425">425</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="426" href="#426">426</a>             {
-<a class="jxr_linenumber" name="427" href="#427">427</a>                 reader = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> FileReader( file ) );
-<a class="jxr_linenumber" name="428" href="#428">428</a> 
-<a class="jxr_linenumber" name="429" href="#429">429</a>                 String line = reader.readLine();
-<a class="jxr_linenumber" name="430" href="#430">430</a> 
-<a class="jxr_linenumber" name="431" href="#431">431</a>                 <strong class="jxr_keyword">while</strong> ( line != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="432" href="#432">432</a>                 {
-<a class="jxr_linenumber" name="433" href="#433">433</a>                     line = line.trim();
-<a class="jxr_linenumber" name="434" href="#434">434</a> 
-<a class="jxr_linenumber" name="435" href="#435">435</a>                     <strong class="jxr_keyword">if</strong> ( !line.startsWith( <span class="jxr_string">"#"</span> ) &amp;&amp; line.length() != 0 )
-<a class="jxr_linenumber" name="436" href="#436">436</a>                     {
-<a class="jxr_linenumber" name="437" href="#437">437</a>                         lines.addAll( replaceArtifacts( line, hasCommand ) );
-<a class="jxr_linenumber" name="438" href="#438">438</a>                     }
-<a class="jxr_linenumber" name="439" href="#439">439</a>                     line = reader.readLine();
-<a class="jxr_linenumber" name="440" href="#440">440</a>                 }
-<a class="jxr_linenumber" name="441" href="#441">441</a> 
-<a class="jxr_linenumber" name="442" href="#442">442</a>                 reader.close();
-<a class="jxr_linenumber" name="443" href="#443">443</a>             }
-<a class="jxr_linenumber" name="444" href="#444">444</a>             <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e )
-<a class="jxr_linenumber" name="445" href="#445">445</a>             {
-<a class="jxr_linenumber" name="446" href="#446">446</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( e );
-<a class="jxr_linenumber" name="447" href="#447">447</a>             }
-<a class="jxr_linenumber" name="448" href="#448">448</a>             <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="449" href="#449">449</a>             {
-<a class="jxr_linenumber" name="450" href="#450">450</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( e );
-<a class="jxr_linenumber" name="451" href="#451">451</a>             }
-<a class="jxr_linenumber" name="452" href="#452">452</a>             <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="453" href="#453">453</a>             {
-<a class="jxr_linenumber" name="454" href="#454">454</a>                 IOUtil.close( reader );
-<a class="jxr_linenumber" name="455" href="#455">455</a>             }
-<a class="jxr_linenumber" name="456" href="#456">456</a>         }
-<a class="jxr_linenumber" name="457" href="#457">457</a> 
-<a class="jxr_linenumber" name="458" href="#458">458</a>         <strong class="jxr_keyword">return</strong> lines;
-<a class="jxr_linenumber" name="459" href="#459">459</a>     }
+<a class="jxr_linenumber" name="421" href="#421">421</a>                     <strong class="jxr_keyword">if</strong> ( !line.startsWith( <span class="jxr_string">"#"</span> ) &amp;&amp; line.length() != 0 )
+<a class="jxr_linenumber" name="422" href="#422">422</a>                     {
+<a class="jxr_linenumber" name="423" href="#423">423</a>                         lines.addAll( replaceArtifacts( line, hasCommand ) );
+<a class="jxr_linenumber" name="424" href="#424">424</a>                     }
+<a class="jxr_linenumber" name="425" href="#425">425</a>                     line = reader.readLine();
+<a class="jxr_linenumber" name="426" href="#426">426</a>                 }
+<a class="jxr_linenumber" name="427" href="#427">427</a> 
+<a class="jxr_linenumber" name="428" href="#428">428</a>                 reader.close();
+<a class="jxr_linenumber" name="429" href="#429">429</a>             }
+<a class="jxr_linenumber" name="430" href="#430">430</a>             <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e )
+<a class="jxr_linenumber" name="431" href="#431">431</a>             {
+<a class="jxr_linenumber" name="432" href="#432">432</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( e );
+<a class="jxr_linenumber" name="433" href="#433">433</a>             }
+<a class="jxr_linenumber" name="434" href="#434">434</a>             <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="435" href="#435">435</a>             {
+<a class="jxr_linenumber" name="436" href="#436">436</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/maven/it/VerificationException.html">VerificationException</a>( e );
+<a class="jxr_linenumber" name="437" href="#437">437</a>             }
+<a class="jxr_linenumber" name="438" href="#438">438</a>             <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="439" href="#439">439</a>             {
+<a class="jxr_linenumber" name="440" href="#440">440</a>                 IOUtil.close( reader );
+<a class="jxr_linenumber" name="441" href="#441">441</a>             }
+<a class="jxr_linenumber" name="442" href="#442">442</a>         }
+<a class="jxr_linenumber" name="443" href="#443">443</a> 
+<a class="jxr_linenumber" name="444" href="#444">444</a>         <strong class="jxr_keyword">return</strong> lines;
+<a class="jxr_linenumber" name="445" href="#445">445</a>     }
+<a class="jxr_linenumber" name="446" href="#446">446</a> 
+<a class="jxr_linenumber" name="447" href="#447">447</a>     <strong class="jxr_keyword">private</strong> List&lt;String&gt; replaceArtifacts( String line, <strong class="jxr_keyword">boolean</strong> hasCommand )
+<a class="jxr_linenumber" name="448" href="#448">448</a>     {
+<a class="jxr_linenumber" name="449" href="#449">449</a>         String MARKER = <span class="jxr_string">"${artifact:"</span>;
+<a class="jxr_linenumber" name="450" href="#450">450</a>         <strong class="jxr_keyword">int</strong> index = line.indexOf( MARKER );
+<a class="jxr_linenumber" name="451" href="#451">451</a>         <strong class="jxr_keyword">if</strong> ( index &gt;= 0 )
+<a class="jxr_linenumber" name="452" href="#452">452</a>         {
+<a class="jxr_linenumber" name="453" href="#453">453</a>             String newLine = line.substring( 0, index );
+<a class="jxr_linenumber" name="454" href="#454">454</a>             index = line.indexOf( <span class="jxr_string">"}"</span>, index );
+<a class="jxr_linenumber" name="455" href="#455">455</a>             <strong class="jxr_keyword">if</strong> ( index &lt; 0 )
+<a class="jxr_linenumber" name="456" href="#456">456</a>             {
+<a class="jxr_linenumber" name="457" href="#457">457</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException( <span class="jxr_string">"line does not contain ending artifact marker: '"</span> + line + <span class="jxr_string">"'"</span> );
+<a class="jxr_linenumber" name="458" href="#458">458</a>             }
+<a class="jxr_linenumber" name="459" href="#459">459</a>             String artifact = line.substring( newLine.length() + MARKER.length(), index );
 <a class="jxr_linenumber" name="460" href="#460">460</a> 
-<a class="jxr_linenumber" name="461" href="#461">461</a>     <strong class="jxr_keyword">private</strong> List replaceArtifacts( String line, <strong class="jxr_keyword">boolean</strong> hasCommand )
-<a class="jxr_linenumber" name="462" href="#462">462</a>     {
-<a class="jxr_linenumber" name="463" href="#463">463</a>         String MARKER = <span class="jxr_string">"${artifact:"</span>;
-<a class="jxr_linenumber" name="464" href="#464">464</a>         <strong class="jxr_keyword">int</strong> index = line.indexOf( MARKER );
-<a class="jxr_linenumber" name="465" href="#465">465</a>         <strong class="jxr_keyword">if</strong> ( index &gt;= 0 )
-<a class="jxr_linenumber" name="466" href="#466">466</a>         {
-<a class="jxr_linenumber" name="467" href="#467">467</a>             String newLine = line.substring( 0, index );
-<a class="jxr_linenumber" name="468" href="#468">468</a>             index = line.indexOf( <span class="jxr_string">"}"</span>, index );
-<a class="jxr_linenumber" name="469" href="#469">469</a>             <strong class="jxr_keyword">if</strong> ( index &lt; 0 )
-<a class="jxr_linenumber" name="470" href="#470">470</a>             {
-<a class="jxr_linenumber" name="471" href="#471">471</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException( <span class="jxr_string">"line does not contain ending artifact marker: '"</span> + line + <span class="jxr_string">"'"</span> );
-<a class="jxr_linenumber" name="472" href="#472">472</a>             }
-<a class="jxr_linenumber" name="473" href="#473">473</a>             String artifact = line.substring( newLine.length() + MARKER.length(), index );
+<a class="jxr_linenumber" name="461" href="#461">461</a>             newLine += getArtifactPath( artifact );
+<a class="jxr_linenumber" name="462" href="#462">462</a>             newLine += line.substring( index + 1 );
+<a class="jxr_linenumber" name="463" href="#463">463</a> 
+<a class="jxr_linenumber" name="464" href="#464">464</a>             List&lt;String&gt; l = <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;();
+<a class="jxr_linenumber" name="465" href="#465">465</a>             l.add( newLine );
+<a class="jxr_linenumber" name="466" href="#466">466</a> 
+<a class="jxr_linenumber" name="467" href="#467">467</a>             <strong class="jxr_keyword">int</strong> endIndex = newLine.lastIndexOf( '/' );
+<a class="jxr_linenumber" name="468" href="#468">468</a> 
+<a class="jxr_linenumber" name="469" href="#469">469</a>             String command = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="470" href="#470">470</a>             String filespec;
+<a class="jxr_linenumber" name="471" href="#471">471</a>             <strong class="jxr_keyword">if</strong> ( hasCommand )
+<a class="jxr_linenumber" name="472" href="#472">472</a>             {
+<a class="jxr_linenumber" name="473" href="#473">473</a>                 <strong class="jxr_keyword">int</strong> startIndex = newLine.indexOf( ' ' );
 <a class="jxr_linenumber" name="474" href="#474">474</a> 
-<a class="jxr_linenumber" name="475" href="#475">475</a>             newLine += getArtifactPath( artifact );
-<a class="jxr_linenumber" name="476" href="#476">476</a>             newLine += line.substring( index + 1 );
-<a class="jxr_linenumber" name="477" href="#477">477</a> 
-<a class="jxr_linenumber" name="478" href="#478">478</a>             List l = <strong class="jxr_keyword">new</strong> ArrayList();
-<a class="jxr_linenumber" name="479" href="#479">479</a>             l.add( newLine );
-<a class="jxr_linenumber" name="480" href="#480">480</a> 
-<a class="jxr_linenumber" name="481" href="#481">481</a>             <strong class="jxr_keyword">int</strong> endIndex = newLine.lastIndexOf( '/' );
-<a class="jxr_linenumber" name="482" href="#482">482</a> 
-<a class="jxr_linenumber" name="483" href="#483">483</a>             String command = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="484" href="#484">484</a>             String filespec;
-<a class="jxr_linenumber" name="485" href="#485">485</a>             <strong class="jxr_keyword">if</strong> ( hasCommand )
-<a class="jxr_linenumber" name="486" href="#486">486</a>             {
-<a class="jxr_linenumber" name="487" href="#487">487</a>                 <strong class="jxr_keyword">int</strong> startIndex = newLine.indexOf( ' ' );
-<a class="jxr_linenumber" name="488" href="#488">488</a> 
-<a class="jxr_linenumber" name="489" href="#489">489</a>                 command = newLine.substring( 0, startIndex );
-<a class="jxr_linenumber" name="490" href="#490">490</a> 
-<a class="jxr_linenumber" name="491" href="#491">491</a>                 filespec = newLine.substring( startIndex + 1, endIndex );
-<a class="jxr_linenumber" name="492" href="#492">492</a>             }
-<a class="jxr_linenumber" name="493" href="#493">493</a>             <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="494" href="#494">494</a>             {
-<a class="jxr_linenumber" name="495" href="#495">495</a>                 filespec = newLine;
-<a class="jxr_linenumber" name="496" href="#496">496</a>             }
-<a class="jxr_linenumber" name="497" href="#497">497</a> 
-<a class="jxr_linenumber" name="498" href="#498">498</a>             File dir = <strong class="jxr_keyword">new</strong> File( filespec );
-<a class="jxr_linenumber" name="499" href="#499">499</a>             addMetadataToList( dir, hasCommand, l, command );
-<a class="jxr_linenumber" name="500" href="#500">500</a>             addMetadataToList( dir.getParentFile(), hasCommand, l, command );
-<a class="jxr_linenumber" name="501" href="#501">501</a> 
-<a class="jxr_linenumber" name="502" href="#502">502</a>             <strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="503" href="#503">503</a>         }
-<a class="jxr_linenumber" name="504" href="#504">504</a>         <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="505" href="#505">505</a>         {
-<a class="jxr_linenumber" name="506" href="#506">506</a>             <strong class="jxr_keyword">return</strong> Collections.singletonList( line );
-<a class="jxr_linenumber" name="507" href="#507">507</a>         }
-<a class="jxr_linenumber" name="508" href="#508">508</a>     }
-<a class="jxr_linenumber" name="509" href="#509">509</a> 
-<a class="jxr_linenumber" name="510" href="#510">510</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> addMetadataToList( File dir, <strong class="jxr_keyword">boolean</strong> hasCommand, List l, String command )
-<a class="jxr_linenumber" name="511" href="#511">511</a>     {
-<a class="jxr_linenumber" name="512" href="#512">512</a>         <strong class="jxr_keyword">if</strong> ( dir.exists() &amp;&amp; dir.isDirectory() )
-<a class="jxr_linenumber" name="513" href="#513">513</a>         {
-<a class="jxr_linenumber" name="514" href="#514">514</a>             String[] files = dir.list( <strong class="jxr_keyword">new</strong> FilenameFilter()
-<a class="jxr_linenumber" name="515" href="#515">515</a>             {
-<a class="jxr_linenumber" name="516" href="#516">516</a>                 <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> accept( File dir, String name )
-<a class="jxr_linenumber" name="517" href="#517">517</a>                 {
-<a class="jxr_linenumber" name="518" href="#518">518</a>                     <strong class="jxr_keyword">return</strong> name.startsWith( <span class="jxr_string">"maven-metadata"</span> ) &amp;&amp; name.endsWith( <span class="jxr_string">".xml"</span> );
-<a class="jxr_linenumber" name="519" href="#519">519</a> 
-<a class="jxr_linenumber" name="520" href="#520">520</a>                 }
-<a class="jxr_linenumber" name="521" href="#521">521</a>             } );
+<a class="jxr_linenumber" name="475" href="#475">475</a>                 command = newLine.substring( 0, startIndex );
+<a class="jxr_linenumber" name="476" href="#476">476</a> 
+<a class="jxr_linenumber" name="477" href="#477">477</a>                 filespec = newLine.substring( startIndex + 1, endIndex );
+<a class="jxr_linenumber" name="478" href="#478">478</a>             }
+<a class="jxr_linenumber" name="479" href="#479">479</a>             <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="480" href="#480">480</a>             {
+<a class="jxr_linenumber" name="481" href="#481">481</a>                 filespec = newLine;

[... 3019 lines stripped ...]


Mime
View raw message