Modified: maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/OverlayManagerTest.html ============================================================================== --- maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/OverlayManagerTest.html (original) +++ maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/OverlayManagerTest.html Sat Jun 6 06:56:04 2020 @@ -32,212 +32,208 @@ <a class="jxr_linenumber" name="L24" href="#L24">24</a> <a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugin.testing.stubs.ArtifactStub; <a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.war.Overlay; -<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.war.overlay.DefaultOverlay; -<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.war.overlay.InvalidOverlayConfigurationException; -<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.war.overlay.OverlayManager; -<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub; -<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.war.stub.WarArtifactStub; -<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.PlexusTestCase; +<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub; +<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.war.stub.WarArtifactStub; +<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.PlexusTestCase; +<a class="jxr_linenumber" name="L30" href="#L30">30</a> +<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList; +<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> java.util.List; <a class="jxr_linenumber" name="L33" href="#L33">33</a> -<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList; -<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> java.util.List; -<a class="jxr_linenumber" name="L36" href="#L36">36</a> -<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * @author Stephane Nicoll</em> -<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> * @version $Id$</em> -<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugins/war/overlay/OverlayManagerTest.html">OverlayManagerTest</a> -<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">extends</strong> PlexusTestCase -<a class="jxr_linenumber" name="L43" href="#L43">43</a> { -<a class="jxr_linenumber" name="L44" href="#L44">44</a> -<a class="jxr_linenumber" name="L45" href="#L45">45</a> -<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmptyProject() -<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">throws</strong> Exception -<a class="jxr_linenumber" name="L48" href="#L48">48</a> { -<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); -<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<Overlay>(); -<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L52" href="#L52">52</a> { -<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOVerlay = Overlay.createInstance(); -<a class="jxr_linenumber" name="L54" href="#L54">54</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, -<a class="jxr_linenumber" name="L55" href="#L55">55</a> currentProjectOVerlay ); -<a class="jxr_linenumber" name="L56" href="#L56">56</a> assertNotNull( manager.getOverlays() ); -<a class="jxr_linenumber" name="L57" href="#L57">57</a> assertEquals( 1, manager.getOverlays().size() ); -<a class="jxr_linenumber" name="L58" href="#L58">58</a> assertEquals( currentProjectOVerlay, manager.getOverlays().get( 0 ) ); -<a class="jxr_linenumber" name="L59" href="#L59">59</a> } -<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) -<a class="jxr_linenumber" name="L61" href="#L61">61</a> { -<a class="jxr_linenumber" name="L62" href="#L62">62</a> e.printStackTrace(); -<a class="jxr_linenumber" name="L63" href="#L63">63</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overly config "</span> + e.getMessage() ); -<a class="jxr_linenumber" name="L64" href="#L64">64</a> } -<a class="jxr_linenumber" name="L65" href="#L65">65</a> } +<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment">/**</em> +<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> * @author Stephane Nicoll</em> +<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugins/war/overlay/OverlayManagerTest.html">OverlayManagerTest</a> +<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">extends</strong> PlexusTestCase +<a class="jxr_linenumber" name="L39" href="#L39">39</a> { +<a class="jxr_linenumber" name="L40" href="#L40">40</a> +<a class="jxr_linenumber" name="L41" href="#L41">41</a> +<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmptyProject() +<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">throws</strong> Exception +<a class="jxr_linenumber" name="L44" href="#L44">44</a> { +<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); +<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L48" href="#L48">48</a> { +<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOverlay = Overlay.createInstance(); +<a class="jxr_linenumber" name="L50" href="#L50">50</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, +<a class="jxr_linenumber" name="L51" href="#L51">51</a> currentProjectOverlay ); +<a class="jxr_linenumber" name="L52" href="#L52">52</a> assertNotNull( manager.getOverlays() ); +<a class="jxr_linenumber" name="L53" href="#L53">53</a> assertEquals( 1, manager.getOverlays().size() ); +<a class="jxr_linenumber" name="L54" href="#L54">54</a> assertEquals( currentProjectOverlay, manager.getOverlays().get( 0 ) ); +<a class="jxr_linenumber" name="L55" href="#L55">55</a> } +<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) +<a class="jxr_linenumber" name="L57" href="#L57">57</a> { +<a class="jxr_linenumber" name="L58" href="#L58">58</a> e.printStackTrace(); +<a class="jxr_linenumber" name="L59" href="#L59">59</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overly config "</span> + e.getMessage() ); +<a class="jxr_linenumber" name="L60" href="#L60">60</a> } +<a class="jxr_linenumber" name="L61" href="#L61">61</a> } +<a class="jxr_linenumber" name="L62" href="#L62">62</a> +<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAutodetectSimpleOverlay( Overlay currentProjectOverlay ) +<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">throws</strong> Exception +<a class="jxr_linenumber" name="L65" href="#L65">65</a> { <a class="jxr_linenumber" name="L66" href="#L66">66</a> -<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAutodetectSimpleOverlay( Overlay currentProjectOverlay ) -<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">throws</strong> Exception -<a class="jxr_linenumber" name="L69" href="#L69">69</a> { +<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); +<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); +<a class="jxr_linenumber" name="L69" href="#L69">69</a> project.addArtifact( first ); <a class="jxr_linenumber" name="L70" href="#L70">70</a> -<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); -<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); -<a class="jxr_linenumber" name="L73" href="#L73">73</a> project.addArtifact( first ); -<a class="jxr_linenumber" name="L74" href="#L74">74</a> -<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<Overlay>(); -<a class="jxr_linenumber" name="L76" href="#L76">76</a> -<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L78" href="#L78">78</a> { -<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">final</strong> Overlay overlay = currentProjectOverlay; -<a class="jxr_linenumber" name="L80" href="#L80">80</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, -<a class="jxr_linenumber" name="L81" href="#L81">81</a> overlay ); -<a class="jxr_linenumber" name="L82" href="#L82">82</a> assertNotNull( manager.getOverlays() ); -<a class="jxr_linenumber" name="L83" href="#L83">83</a> assertEquals( 2, manager.getOverlays().size() ); -<a class="jxr_linenumber" name="L84" href="#L84">84</a> assertEquals( overlay, manager.getOverlays().get( 0 ) ); -<a class="jxr_linenumber" name="L85" href="#L85">85</a> assertEquals( <strong class="jxr_keyword">new</strong> DefaultOverlay( first ), manager.getOverlays().get( 1 ) ); -<a class="jxr_linenumber" name="L86" href="#L86">86</a> } -<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) -<a class="jxr_linenumber" name="L88" href="#L88">88</a> { -<a class="jxr_linenumber" name="L89" href="#L89">89</a> e.printStackTrace(); -<a class="jxr_linenumber" name="L90" href="#L90">90</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overlay config "</span> + e.getMessage() ); -<a class="jxr_linenumber" name="L91" href="#L91">91</a> } -<a class="jxr_linenumber" name="L92" href="#L92">92</a> } +<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L72" href="#L72">72</a> +<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L74" href="#L74">74</a> { +<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">final</strong> Overlay overlay = currentProjectOverlay; +<a class="jxr_linenumber" name="L76" href="#L76">76</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, +<a class="jxr_linenumber" name="L77" href="#L77">77</a> overlay ); +<a class="jxr_linenumber" name="L78" href="#L78">78</a> assertNotNull( manager.getOverlays() ); +<a class="jxr_linenumber" name="L79" href="#L79">79</a> assertEquals( 2, manager.getOverlays().size() ); +<a class="jxr_linenumber" name="L80" href="#L80">80</a> assertEquals( overlay, manager.getOverlays().get( 0 ) ); +<a class="jxr_linenumber" name="L81" href="#L81">81</a> assertEquals( <strong class="jxr_keyword">new</strong> DefaultOverlay( first ), manager.getOverlays().get( 1 ) ); +<a class="jxr_linenumber" name="L82" href="#L82">82</a> } +<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) +<a class="jxr_linenumber" name="L84" href="#L84">84</a> { +<a class="jxr_linenumber" name="L85" href="#L85">85</a> e.printStackTrace(); +<a class="jxr_linenumber" name="L86" href="#L86">86</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overlay config "</span> + e.getMessage() ); +<a class="jxr_linenumber" name="L87" href="#L87">87</a> } +<a class="jxr_linenumber" name="L88" href="#L88">88</a> } +<a class="jxr_linenumber" name="L89" href="#L89">89</a> +<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSimpleOverlay() +<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">throws</strong> Exception +<a class="jxr_linenumber" name="L92" href="#L92">92</a> { <a class="jxr_linenumber" name="L93" href="#L93">93</a> -<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSimpleOverlay() -<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">throws</strong> Exception -<a class="jxr_linenumber" name="L96" href="#L96">96</a> { +<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); +<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); +<a class="jxr_linenumber" name="L96" href="#L96">96</a> project.addArtifact( first ); <a class="jxr_linenumber" name="L97" href="#L97">97</a> -<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); -<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); -<a class="jxr_linenumber" name="L100" href="#L100">100</a> project.addArtifact( first ); -<a class="jxr_linenumber" name="L101" href="#L101">101</a> -<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<Overlay>(); -<a class="jxr_linenumber" name="L103" href="#L103">103</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( first ) ); -<a class="jxr_linenumber" name="L104" href="#L104">104</a> -<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L106" href="#L106">106</a> { -<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOverlay = Overlay.createInstance(); -<a class="jxr_linenumber" name="L108" href="#L108">108</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, -<a class="jxr_linenumber" name="L109" href="#L109">109</a> currentProjectOverlay ); -<a class="jxr_linenumber" name="L110" href="#L110">110</a> assertNotNull( manager.getOverlays() ); -<a class="jxr_linenumber" name="L111" href="#L111">111</a> assertEquals( 2, manager.getOverlays().size() ); -<a class="jxr_linenumber" name="L112" href="#L112">112</a> assertEquals( Overlay.createInstance(), manager.getOverlays().get( 0 ) ); -<a class="jxr_linenumber" name="L113" href="#L113">113</a> assertEquals( overlays.get( 0 ), manager.getOverlays().get( 1 ) ); -<a class="jxr_linenumber" name="L114" href="#L114">114</a> } -<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) -<a class="jxr_linenumber" name="L116" href="#L116">116</a> { -<a class="jxr_linenumber" name="L117" href="#L117">117</a> e.printStackTrace(); -<a class="jxr_linenumber" name="L118" href="#L118">118</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overlay config "</span> + e.getMessage() ); -<a class="jxr_linenumber" name="L119" href="#L119">119</a> } -<a class="jxr_linenumber" name="L120" href="#L120">120</a> } +<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L99" href="#L99">99</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( first ) ); +<a class="jxr_linenumber" name="L100" href="#L100">100</a> +<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L102" href="#L102">102</a> { +<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOverlay = Overlay.createInstance(); +<a class="jxr_linenumber" name="L104" href="#L104">104</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, +<a class="jxr_linenumber" name="L105" href="#L105">105</a> currentProjectOverlay ); +<a class="jxr_linenumber" name="L106" href="#L106">106</a> assertNotNull( manager.getOverlays() ); +<a class="jxr_linenumber" name="L107" href="#L107">107</a> assertEquals( 2, manager.getOverlays().size() ); +<a class="jxr_linenumber" name="L108" href="#L108">108</a> assertEquals( Overlay.createInstance(), manager.getOverlays().get( 0 ) ); +<a class="jxr_linenumber" name="L109" href="#L109">109</a> assertEquals( overlays.get( 0 ), manager.getOverlays().get( 1 ) ); +<a class="jxr_linenumber" name="L110" href="#L110">110</a> } +<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) +<a class="jxr_linenumber" name="L112" href="#L112">112</a> { +<a class="jxr_linenumber" name="L113" href="#L113">113</a> e.printStackTrace(); +<a class="jxr_linenumber" name="L114" href="#L114">114</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overlay config "</span> + e.getMessage() ); +<a class="jxr_linenumber" name="L115" href="#L115">115</a> } +<a class="jxr_linenumber" name="L116" href="#L116">116</a> } +<a class="jxr_linenumber" name="L117" href="#L117">117</a> +<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUnknownOverlay() +<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">throws</strong> Exception +<a class="jxr_linenumber" name="L120" href="#L120">120</a> { <a class="jxr_linenumber" name="L121" href="#L121">121</a> -<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUnknonwnOverlay() -<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">throws</strong> Exception -<a class="jxr_linenumber" name="L124" href="#L124">124</a> { +<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); +<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); +<a class="jxr_linenumber" name="L124" href="#L124">124</a> project.addArtifact( first ); <a class="jxr_linenumber" name="L125" href="#L125">125</a> -<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); -<a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); -<a class="jxr_linenumber" name="L128" href="#L128">128</a> project.addArtifact( first ); -<a class="jxr_linenumber" name="L129" href="#L129">129</a> -<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<Overlay>(); -<a class="jxr_linenumber" name="L131" href="#L131">131</a> overlays.add( <strong class="jxr_keyword">new</strong> Overlay( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp-2"</span> ) ); -<a class="jxr_linenumber" name="L132" href="#L132">132</a> -<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L134" href="#L134">134</a> { -<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOVerlay = Overlay.createInstance(); -<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, currentProjectOVerlay ); -<a class="jxr_linenumber" name="L137" href="#L137">137</a> fail( <span class="jxr_string">"Should have failed to validate an unknown overlay"</span> ); +<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L127" href="#L127">127</a> overlays.add( <strong class="jxr_keyword">new</strong> Overlay( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp-2"</span> ) ); +<a class="jxr_linenumber" name="L128" href="#L128">128</a> +<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L130" href="#L130">130</a> { +<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOverlay = Overlay.createInstance(); +<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, currentProjectOverlay ); +<a class="jxr_linenumber" name="L133" href="#L133">133</a> fail( <span class="jxr_string">"Should have failed to validate an unknown overlay"</span> ); +<a class="jxr_linenumber" name="L134" href="#L134">134</a> } +<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) +<a class="jxr_linenumber" name="L136" href="#L136">136</a> { +<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_comment">// OK</em> <a class="jxr_linenumber" name="L138" href="#L138">138</a> } -<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) -<a class="jxr_linenumber" name="L140" href="#L140">140</a> { -<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_comment">// OK</em> -<a class="jxr_linenumber" name="L142" href="#L142">142</a> } -<a class="jxr_linenumber" name="L143" href="#L143">143</a> } +<a class="jxr_linenumber" name="L139" href="#L139">139</a> } +<a class="jxr_linenumber" name="L140" href="#L140">140</a> +<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCustomCurrentProject() +<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">throws</strong> Exception +<a class="jxr_linenumber" name="L143" href="#L143">143</a> { <a class="jxr_linenumber" name="L144" href="#L144">144</a> -<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCustomCurrentProject() -<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">throws</strong> Exception -<a class="jxr_linenumber" name="L147" href="#L147">147</a> { -<a class="jxr_linenumber" name="L148" href="#L148">148</a> -<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); -<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); -<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">final</strong> ArtifactStub second = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp-2"</span> ); -<a class="jxr_linenumber" name="L152" href="#L152">152</a> project.addArtifact( first ); -<a class="jxr_linenumber" name="L153" href="#L153">153</a> project.addArtifact( second ); -<a class="jxr_linenumber" name="L154" href="#L154">154</a> -<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<Overlay>(); -<a class="jxr_linenumber" name="L156" href="#L156">156</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( first ) ); -<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOverlay = Overlay.createInstance(); -<a class="jxr_linenumber" name="L158" href="#L158">158</a> overlays.add( currentProjectOverlay ); -<a class="jxr_linenumber" name="L159" href="#L159">159</a> -<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L161" href="#L161">161</a> { -<a class="jxr_linenumber" name="L162" href="#L162">162</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, -<a class="jxr_linenumber" name="L163" href="#L163">163</a> currentProjectOverlay ); -<a class="jxr_linenumber" name="L164" href="#L164">164</a> assertNotNull( manager.getOverlays() ); -<a class="jxr_linenumber" name="L165" href="#L165">165</a> assertEquals( 3, manager.getOverlays().size() ); -<a class="jxr_linenumber" name="L166" href="#L166">166</a> assertEquals( overlays.get( 0 ), manager.getOverlays().get( 0 ) ); -<a class="jxr_linenumber" name="L167" href="#L167">167</a> assertEquals( currentProjectOverlay, manager.getOverlays().get( 1 ) ); -<a class="jxr_linenumber" name="L168" href="#L168">168</a> assertEquals( <strong class="jxr_keyword">new</strong> DefaultOverlay( second ), manager.getOverlays().get( 2 ) ); -<a class="jxr_linenumber" name="L169" href="#L169">169</a> -<a class="jxr_linenumber" name="L170" href="#L170">170</a> } -<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) -<a class="jxr_linenumber" name="L172" href="#L172">172</a> { -<a class="jxr_linenumber" name="L173" href="#L173">173</a> e.printStackTrace(); -<a class="jxr_linenumber" name="L174" href="#L174">174</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overlay config "</span> + e.getMessage() ); -<a class="jxr_linenumber" name="L175" href="#L175">175</a> } -<a class="jxr_linenumber" name="L176" href="#L176">176</a> } +<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); +<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); +<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">final</strong> ArtifactStub second = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp-2"</span> ); +<a class="jxr_linenumber" name="L148" href="#L148">148</a> project.addArtifact( first ); +<a class="jxr_linenumber" name="L149" href="#L149">149</a> project.addArtifact( second ); +<a class="jxr_linenumber" name="L150" href="#L150">150</a> +<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L152" href="#L152">152</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( first ) ); +<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOverlay = Overlay.createInstance(); +<a class="jxr_linenumber" name="L154" href="#L154">154</a> overlays.add( currentProjectOverlay ); +<a class="jxr_linenumber" name="L155" href="#L155">155</a> +<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L157" href="#L157">157</a> { +<a class="jxr_linenumber" name="L158" href="#L158">158</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, +<a class="jxr_linenumber" name="L159" href="#L159">159</a> currentProjectOverlay ); +<a class="jxr_linenumber" name="L160" href="#L160">160</a> assertNotNull( manager.getOverlays() ); +<a class="jxr_linenumber" name="L161" href="#L161">161</a> assertEquals( 3, manager.getOverlays().size() ); +<a class="jxr_linenumber" name="L162" href="#L162">162</a> assertEquals( overlays.get( 0 ), manager.getOverlays().get( 0 ) ); +<a class="jxr_linenumber" name="L163" href="#L163">163</a> assertEquals( currentProjectOverlay, manager.getOverlays().get( 1 ) ); +<a class="jxr_linenumber" name="L164" href="#L164">164</a> assertEquals( <strong class="jxr_keyword">new</strong> DefaultOverlay( second ), manager.getOverlays().get( 2 ) ); +<a class="jxr_linenumber" name="L165" href="#L165">165</a> +<a class="jxr_linenumber" name="L166" href="#L166">166</a> } +<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) +<a class="jxr_linenumber" name="L168" href="#L168">168</a> { +<a class="jxr_linenumber" name="L169" href="#L169">169</a> e.printStackTrace(); +<a class="jxr_linenumber" name="L170" href="#L170">170</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overlay config "</span> + e.getMessage() ); +<a class="jxr_linenumber" name="L171" href="#L171">171</a> } +<a class="jxr_linenumber" name="L172" href="#L172">172</a> } +<a class="jxr_linenumber" name="L173" href="#L173">173</a> +<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOverlaysWithSameArtifactAndGroupId() +<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong class="jxr_keyword">throws</strong> Exception +<a class="jxr_linenumber" name="L176" href="#L176">176</a> { <a class="jxr_linenumber" name="L177" href="#L177">177</a> -<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOverlaysWithSameArtifactAndGroupId() -<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">throws</strong> Exception -<a class="jxr_linenumber" name="L180" href="#L180">180</a> { +<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); +<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); +<a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong class="jxr_keyword">final</strong> ArtifactStub second = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span>, <span class="jxr_string">"my-classifier"</span> ); <a class="jxr_linenumber" name="L181" href="#L181">181</a> -<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.html">MavenProjectArtifactsStub</a>(); -<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">final</strong> ArtifactStub first = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span> ); -<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">final</strong> ArtifactStub second = newWarArtifact( <span class="jxr_string">"test"</span>, <span class="jxr_string">"test-webapp"</span>, <span class="jxr_string">"my-classifier"</span> ); -<a class="jxr_linenumber" name="L185" href="#L185">185</a> -<a class="jxr_linenumber" name="L186" href="#L186">186</a> project.addArtifact( first ); -<a class="jxr_linenumber" name="L187" href="#L187">187</a> project.addArtifact( second ); +<a class="jxr_linenumber" name="L182" href="#L182">182</a> project.addArtifact( first ); +<a class="jxr_linenumber" name="L183" href="#L183">183</a> project.addArtifact( second ); +<a class="jxr_linenumber" name="L184" href="#L184">184</a> +<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L186" href="#L186">186</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( first ) ); +<a class="jxr_linenumber" name="L187" href="#L187">187</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( second ) ); <a class="jxr_linenumber" name="L188" href="#L188">188</a> -<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<Overlay>(); -<a class="jxr_linenumber" name="L190" href="#L190">190</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( first ) ); -<a class="jxr_linenumber" name="L191" href="#L191">191</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( second ) ); -<a class="jxr_linenumber" name="L192" href="#L192">192</a> -<a class="jxr_linenumber" name="L193" href="#L193">193</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L194" href="#L194">194</a> { -<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOverlay = Overlay.createInstance(); -<a class="jxr_linenumber" name="L196" href="#L196">196</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, -<a class="jxr_linenumber" name="L197" href="#L197">197</a> currentProjectOverlay ); -<a class="jxr_linenumber" name="L198" href="#L198">198</a> assertNotNull( manager.getOverlays() ); -<a class="jxr_linenumber" name="L199" href="#L199">199</a> assertEquals( 3, manager.getOverlays().size() ); -<a class="jxr_linenumber" name="L200" href="#L200">200</a> assertEquals( currentProjectOverlay, manager.getOverlays().get( 0 ) ); -<a class="jxr_linenumber" name="L201" href="#L201">201</a> assertEquals( overlays.get( 0 ), manager.getOverlays().get( 1 ) ); -<a class="jxr_linenumber" name="L202" href="#L202">202</a> assertEquals( overlays.get( 1 ), manager.getOverlays().get( 2 ) ); -<a class="jxr_linenumber" name="L203" href="#L203">203</a> -<a class="jxr_linenumber" name="L204" href="#L204">204</a> } -<a class="jxr_linenumber" name="L205" href="#L205">205</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) -<a class="jxr_linenumber" name="L206" href="#L206">206</a> { -<a class="jxr_linenumber" name="L207" href="#L207">207</a> e.printStackTrace(); -<a class="jxr_linenumber" name="L208" href="#L208">208</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overlay config "</span> + e.getMessage() ); -<a class="jxr_linenumber" name="L209" href="#L209">209</a> } -<a class="jxr_linenumber" name="L210" href="#L210">210</a> } -<a class="jxr_linenumber" name="L211" href="#L211">211</a> -<a class="jxr_linenumber" name="L212" href="#L212">212</a> -<a class="jxr_linenumber" name="L213" href="#L213">213</a> <strong class="jxr_keyword">protected</strong> ArtifactStub newWarArtifact( String groupId, String artifactId, String classifier ) -<a class="jxr_linenumber" name="L214" href="#L214">214</a> { -<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/WarArtifactStub.html">WarArtifactStub</a> a = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/WarArtifactStub.html">WarArtifactStub</a>( getBasedir() ); -<a class="jxr_linenumber" name="L216" href="#L216">216</a> a.setGroupId( groupId ); -<a class="jxr_linenumber" name="L217" href="#L217">217</a> a.setArtifactId( artifactId ); -<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">if</strong> ( classifier != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L219" href="#L219">219</a> { -<a class="jxr_linenumber" name="L220" href="#L220">220</a> a.setClassifier( classifier ); -<a class="jxr_linenumber" name="L221" href="#L221">221</a> } -<a class="jxr_linenumber" name="L222" href="#L222">222</a> <strong class="jxr_keyword">return</strong> a; -<a class="jxr_linenumber" name="L223" href="#L223">223</a> } +<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L190" href="#L190">190</a> { +<a class="jxr_linenumber" name="L191" href="#L191">191</a> <strong class="jxr_keyword">final</strong> Overlay currentProjectOverlay = Overlay.createInstance(); +<a class="jxr_linenumber" name="L192" href="#L192">192</a> OverlayManager manager = <strong class="jxr_keyword">new</strong> OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, +<a class="jxr_linenumber" name="L193" href="#L193">193</a> currentProjectOverlay ); +<a class="jxr_linenumber" name="L194" href="#L194">194</a> assertNotNull( manager.getOverlays() ); +<a class="jxr_linenumber" name="L195" href="#L195">195</a> assertEquals( 3, manager.getOverlays().size() ); +<a class="jxr_linenumber" name="L196" href="#L196">196</a> assertEquals( currentProjectOverlay, manager.getOverlays().get( 0 ) ); +<a class="jxr_linenumber" name="L197" href="#L197">197</a> assertEquals( overlays.get( 0 ), manager.getOverlays().get( 1 ) ); +<a class="jxr_linenumber" name="L198" href="#L198">198</a> assertEquals( overlays.get( 1 ), manager.getOverlays().get( 2 ) ); +<a class="jxr_linenumber" name="L199" href="#L199">199</a> +<a class="jxr_linenumber" name="L200" href="#L200">200</a> } +<a class="jxr_linenumber" name="L201" href="#L201">201</a> <strong class="jxr_keyword">catch</strong> ( InvalidOverlayConfigurationException e ) +<a class="jxr_linenumber" name="L202" href="#L202">202</a> { +<a class="jxr_linenumber" name="L203" href="#L203">203</a> e.printStackTrace(); +<a class="jxr_linenumber" name="L204" href="#L204">204</a> fail( <span class="jxr_string">"Should not have failed to validate a valid overlay config "</span> + e.getMessage() ); +<a class="jxr_linenumber" name="L205" href="#L205">205</a> } +<a class="jxr_linenumber" name="L206" href="#L206">206</a> } +<a class="jxr_linenumber" name="L207" href="#L207">207</a> +<a class="jxr_linenumber" name="L208" href="#L208">208</a> +<a class="jxr_linenumber" name="L209" href="#L209">209</a> <strong class="jxr_keyword">protected</strong> ArtifactStub newWarArtifact( String groupId, String artifactId, String classifier ) +<a class="jxr_linenumber" name="L210" href="#L210">210</a> { +<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/WarArtifactStub.html">WarArtifactStub</a> a = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/WarArtifactStub.html">WarArtifactStub</a>( getBasedir() ); +<a class="jxr_linenumber" name="L212" href="#L212">212</a> a.setGroupId( groupId ); +<a class="jxr_linenumber" name="L213" href="#L213">213</a> a.setArtifactId( artifactId ); +<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">if</strong> ( classifier != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L215" href="#L215">215</a> { +<a class="jxr_linenumber" name="L216" href="#L216">216</a> a.setClassifier( classifier ); +<a class="jxr_linenumber" name="L217" href="#L217">217</a> } +<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">return</strong> a; +<a class="jxr_linenumber" name="L219" href="#L219">219</a> } +<a class="jxr_linenumber" name="L220" href="#L220">220</a> +<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">protected</strong> ArtifactStub newWarArtifact( String groupId, String artifactId ) +<a class="jxr_linenumber" name="L222" href="#L222">222</a> { +<a class="jxr_linenumber" name="L223" href="#L223">223</a> <strong class="jxr_keyword">return</strong> newWarArtifact( groupId, artifactId, <strong class="jxr_keyword">null</strong> ); <a class="jxr_linenumber" name="L224" href="#L224">224</a> -<a class="jxr_linenumber" name="L225" href="#L225">225</a> <strong class="jxr_keyword">protected</strong> ArtifactStub newWarArtifact( String groupId, String artifactId ) -<a class="jxr_linenumber" name="L226" href="#L226">226</a> { -<a class="jxr_linenumber" name="L227" href="#L227">227</a> <strong class="jxr_keyword">return</strong> newWarArtifact( groupId, artifactId, <strong class="jxr_keyword">null</strong> ); -<a class="jxr_linenumber" name="L228" href="#L228">228</a> -<a class="jxr_linenumber" name="L229" href="#L229">229</a> } -<a class="jxr_linenumber" name="L230" href="#L230">230</a> } +<a class="jxr_linenumber" name="L225" href="#L225">225</a> } +<a class="jxr_linenumber" name="L226" href="#L226">226</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file
Modified: maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/package-frame.html ============================================================================== --- maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/package-frame.html (original) +++ maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/package-frame.html Sat Jun 6 06:56:04 2020 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven WAR Plugin 3.2.3 Reference Package org.apache.maven.plugins.war.overlay</title> + <title>Apache Maven WAR Plugin 3.3.0 Reference Package org.apache.maven.plugins.war.overlay</title> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" /> </head> <body> Modified: maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/package-summary.html ============================================================================== --- maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/package-summary.html (original) +++ maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/overlay/package-summary.html Sat Jun 6 06:56:04 2020 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven WAR Plugin 3.2.3 Reference Package org.apache.maven.plugins.war.overlay</title> + <title>Apache Maven WAR Plugin 3.3.0 Reference Package org.apache.maven.plugins.war.overlay</title> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" /> </head> <body> @@ -63,7 +63,7 @@ </div> <hr /> <div id="footer"> - Copyright © 2002–2019 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. </div> </body> </html> \ No newline at end of file Modified: maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/package-frame.html ============================================================================== --- maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/package-frame.html (original) +++ maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/package-frame.html Sat Jun 6 06:56:04 2020 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven WAR Plugin 3.2.3 Reference Package org.apache.maven.plugins.war</title> + <title>Apache Maven WAR Plugin 3.3.0 Reference Package org.apache.maven.plugins.war</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" /> </head> <body> @@ -25,9 +25,6 @@ <a href="AbstractWarExplodedMojoTest.html" target="classFrame">FileFilterImpl</a> </li> <li> - <a href="WarDependenciesAnalysisTest.html" target="classFrame">WarDependenciesAnalysisTest</a> - </li> - <li> <a href="WarExplodedMojoFilteringTest.html" target="classFrame">WarExplodedMojoFilteringTest</a> </li> <li> Modified: maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/package-summary.html ============================================================================== --- maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/package-summary.html (original) +++ maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/package-summary.html Sat Jun 6 06:56:04 2020 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven WAR Plugin 3.2.3 Reference Package org.apache.maven.plugins.war</title> + <title>Apache Maven WAR Plugin 3.3.0 Reference Package org.apache.maven.plugins.war</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" /> </head> <body> @@ -52,11 +52,6 @@ </tr> <tr> <td> - <a href="WarDependenciesAnalysisTest.html" target="classFrame">WarDependenciesAnalysisTest</a> - </td> - </tr> - <tr> - <td> <a href="WarExplodedMojoFilteringTest.html" target="classFrame">WarExplodedMojoFilteringTest</a> </td> </tr> @@ -108,7 +103,7 @@ </div> <hr /> <div id="footer"> - Copyright © 2002–2019 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. </div> </body> </html> \ No newline at end of file Modified: maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/stub/AarArtifactStub.html ============================================================================== --- maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/stub/AarArtifactStub.html (original) +++ maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/stub/AarArtifactStub.html Sat Jun 6 06:56:04 2020 @@ -34,60 +34,59 @@ <a class="jxr_linenumber" name="L26" href="#L26">26</a> <a class="jxr_linenumber" name="L27" href="#L27">27</a> <em class="jxr_javadoccomment">/**</em> <a class="jxr_linenumber" name="L28" href="#L28">28</a> <em class="jxr_javadoccomment"> * @author Stephane Nicoll</em> -<a class="jxr_linenumber" name="L29" href="#L29">29</a> <em class="jxr_javadoccomment"> * @version $Id$</em> -<a class="jxr_linenumber" name="L30" href="#L30">30</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/AarArtifactStub.html">AarArtifactStub</a> -<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/AbstractArtifactStub.html">AbstractArtifactStub</a> -<a class="jxr_linenumber" name="L33" href="#L33">33</a> { -<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">protected</strong> String groupId; -<a class="jxr_linenumber" name="L35" href="#L35">35</a> -<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">private</strong> ArtifactHandler artifactHandler; -<a class="jxr_linenumber" name="L37" href="#L37">37</a> -<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/AarArtifactStub.html">AarArtifactStub</a>( String basedir, ArtifactHandler artifactHandler ) -<a class="jxr_linenumber" name="L39" href="#L39">39</a> { -<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">super</strong>( basedir ); -<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">this</strong>.artifactHandler = artifactHandler; -<a class="jxr_linenumber" name="L42" href="#L42">42</a> } -<a class="jxr_linenumber" name="L43" href="#L43">43</a> -<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setGroupId( String id ) -<a class="jxr_linenumber" name="L45" href="#L45">45</a> { -<a class="jxr_linenumber" name="L46" href="#L46">46</a> groupId = id; -<a class="jxr_linenumber" name="L47" href="#L47">47</a> } -<a class="jxr_linenumber" name="L48" href="#L48">48</a> -<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">public</strong> String getGroupId() -<a class="jxr_linenumber" name="L50" href="#L50">50</a> { -<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">if</strong> ( groupId != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L52" href="#L52">52</a> { -<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">return</strong> groupId; -<a class="jxr_linenumber" name="L54" href="#L54">54</a> } -<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L56" href="#L56">56</a> { -<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">return</strong> <span class="jxr_string">"org.sample.aar"</span>; -<a class="jxr_linenumber" name="L58" href="#L58">58</a> } -<a class="jxr_linenumber" name="L59" href="#L59">59</a> } -<a class="jxr_linenumber" name="L60" href="#L60">60</a> -<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">public</strong> String getType() -<a class="jxr_linenumber" name="L62" href="#L62">62</a> { -<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">return</strong> <span class="jxr_string">"aar"</span>; -<a class="jxr_linenumber" name="L64" href="#L64">64</a> } -<a class="jxr_linenumber" name="L65" href="#L65">65</a> -<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">public</strong> String getArtifactId() -<a class="jxr_linenumber" name="L67" href="#L67">67</a> { -<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">return</strong> <span class="jxr_string">"aarartifact"</span>; -<a class="jxr_linenumber" name="L69" href="#L69">69</a> } -<a class="jxr_linenumber" name="L70" href="#L70">70</a> -<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">public</strong> File getFile() -<a class="jxr_linenumber" name="L72" href="#L72">72</a> { -<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> File( basedir, <span class="jxr_string">"/target/test-classes/unit/sample_wars/simple.aar"</span> ); -<a class="jxr_linenumber" name="L74" href="#L74">74</a> } -<a class="jxr_linenumber" name="L75" href="#L75">75</a> -<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">public</strong> ArtifactHandler getArtifactHandler() -<a class="jxr_linenumber" name="L77" href="#L77">77</a> { -<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">return</strong> artifactHandler; -<a class="jxr_linenumber" name="L79" href="#L79">79</a> } -<a class="jxr_linenumber" name="L80" href="#L80">80</a> } +<a class="jxr_linenumber" name="L29" href="#L29">29</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/AarArtifactStub.html">AarArtifactStub</a> +<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/AbstractArtifactStub.html">AbstractArtifactStub</a> +<a class="jxr_linenumber" name="L32" href="#L32">32</a> { +<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">protected</strong> String groupId; +<a class="jxr_linenumber" name="L34" href="#L34">34</a> +<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">private</strong> ArtifactHandler artifactHandler; +<a class="jxr_linenumber" name="L36" href="#L36">36</a> +<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/maven/plugins/war/stub/AarArtifactStub.html">AarArtifactStub</a>( String basedir, ArtifactHandler artifactHandler ) +<a class="jxr_linenumber" name="L38" href="#L38">38</a> { +<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">super</strong>( basedir ); +<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">this</strong>.artifactHandler = artifactHandler; +<a class="jxr_linenumber" name="L41" href="#L41">41</a> } +<a class="jxr_linenumber" name="L42" href="#L42">42</a> +<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setGroupId( String id ) +<a class="jxr_linenumber" name="L44" href="#L44">44</a> { +<a class="jxr_linenumber" name="L45" href="#L45">45</a> groupId = id; +<a class="jxr_linenumber" name="L46" href="#L46">46</a> } +<a class="jxr_linenumber" name="L47" href="#L47">47</a> +<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">public</strong> String getGroupId() +<a class="jxr_linenumber" name="L49" href="#L49">49</a> { +<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">if</strong> ( groupId != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L51" href="#L51">51</a> { +<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">return</strong> groupId; +<a class="jxr_linenumber" name="L53" href="#L53">53</a> } +<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L55" href="#L55">55</a> { +<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">return</strong> <span class="jxr_string">"org.sample.aar"</span>; +<a class="jxr_linenumber" name="L57" href="#L57">57</a> } +<a class="jxr_linenumber" name="L58" href="#L58">58</a> } +<a class="jxr_linenumber" name="L59" href="#L59">59</a> +<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">public</strong> String getType() +<a class="jxr_linenumber" name="L61" href="#L61">61</a> { +<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">return</strong> <span class="jxr_string">"aar"</span>; +<a class="jxr_linenumber" name="L63" href="#L63">63</a> } +<a class="jxr_linenumber" name="L64" href="#L64">64</a> +<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">public</strong> String getArtifactId() +<a class="jxr_linenumber" name="L66" href="#L66">66</a> { +<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">return</strong> <span class="jxr_string">"aarartifact"</span>; +<a class="jxr_linenumber" name="L68" href="#L68">68</a> } +<a class="jxr_linenumber" name="L69" href="#L69">69</a> +<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong class="jxr_keyword">public</strong> File getFile() +<a class="jxr_linenumber" name="L71" href="#L71">71</a> { +<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> File( basedir, <span class="jxr_string">"/target/test-classes/unit/sample_wars/simple.aar"</span> ); +<a class="jxr_linenumber" name="L73" href="#L73">73</a> } +<a class="jxr_linenumber" name="L74" href="#L74">74</a> +<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">public</strong> ArtifactHandler getArtifactHandler() +<a class="jxr_linenumber" name="L76" href="#L76">76</a> { +<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">return</strong> artifactHandler; +<a class="jxr_linenumber" name="L78" href="#L78">78</a> } +<a class="jxr_linenumber" name="L79" href="#L79">79</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file