You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by kh...@apache.org on 2015/01/08 21:15:50 UTC
svn commit: r935522 [21/25] - in
/websites/production/maven/content/plugins-archives/maven-war-plugin-LATEST:
./ apidocs/ apidocs/org/apache/maven/plugin/war/
apidocs/org/apache/maven/plugin/war/class-use/
apidocs/org/apache/maven/plugin/war/overlay/ a...
Modified: websites/production/maven/content/plugins-archives/maven-war-plugin-LATEST/xref/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.html
==============================================================================
--- websites/production/maven/content/plugins-archives/maven-war-plugin-LATEST/xref/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.html (original)
+++ websites/production/maven/content/plugins-archives/maven-war-plugin-LATEST/xref/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.html Thu Jan 8 20:15:45 2015
@@ -45,192 +45,203 @@
<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.html">AbstractWarPackagingTask</a>
<a class="jxr_linenumber" name="L38" href="#L38">38</a> {
<a class="jxr_linenumber" name="L39" href="#L39">39</a>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> performPackaging( <strong class="jxr_keyword">final</strong> WarPackagingContext context )
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException, MojoFailureException
-<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> context.getWebappStructure().analyseDependencies( <strong class="jxr_keyword">new</strong> DependenciesAnalysisCallbackImpl( context ) );
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>
-<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">protected</strong> <strong class="jxr_keyword">void</strong> handleDependency( WarPackagingContext context, Dependency dependency, String notBundledMessage,
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> String warOrZipMessage, String standardMessage, <strong class="jxr_keyword">boolean</strong> removeFile )
-<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> ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() )
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> || Artifact.SCOPE_TEST.equals( dependency.getScope() ) || dependency.isOptional() )
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> {
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> context.getLog().debug( notBundledMessage );
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> }
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> {
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> handleDependencyScope( context, dependency, warOrZipMessage, standardMessage, removeFile );
-<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>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> handleDependencyScope( WarPackagingContext context, Dependency dependency, String warOrZipMessage,
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> String standardMessage, <strong class="jxr_keyword">boolean</strong> removeFile )
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"war"</span>.equals( dependency.getType() ) || <span class="jxr_string">"zip"</span>.equals( dependency.getType() ) )
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> context.getLog().warn( warOrZipMessage );
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> }
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"tld"</span>.equals( dependency.getType() ) || <span class="jxr_string">"aar"</span>.equals( dependency.getType() )
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> || <span class="jxr_string">"mar"</span>.equals( dependency.getType() ) || <span class="jxr_string">"xar"</span>.equals( dependency.getType() )
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> || <span class="jxr_string">"jar"</span>.equals( dependency.getType() ) || <span class="jxr_string">"ejb"</span>.equals( dependency.getType() )
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> || <span class="jxr_string">"ejb-client"</span>.equals( dependency.getType() ) || <span class="jxr_string">"test-jar"</span>.equals( dependency.getType() )
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> || <span class="jxr_string">"par"</span>.equals( dependency.getType() ) )
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> {
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> context.getLog().info( standardMessage );
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">if</strong> ( removeFile )
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> {
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> removeDependency( context, dependency );
-<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="L81" href="#L81">81</a> }
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> removeDependency( WarPackagingContext context, Dependency dependency )
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> {
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">final</strong> String targetFileName = context.getWebappStructure().getCachedTargetFileName( dependency );
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">if</strong> ( targetFileName != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> {
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">final</strong> String type = dependency.getType();
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> File targetFile = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"tld"</span>.equals( type ) )
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> {
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> targetFile = <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), ArtifactsPackagingTask.TLD_PATH + targetFileName );
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> }
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"aar"</span>.equals( type ) )
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> {
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> targetFile =
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), ArtifactsPackagingTask.SERVICES_PATH + targetFileName );
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> }
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"mar"</span>.equals( type ) )
+<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> <em class="jxr_javadoccomment"> * {@inheritDoc}</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> performPackaging( <strong class="jxr_keyword">final</strong> WarPackagingContext context )
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException, MojoFailureException
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> {
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> context.getWebappStructure().analyseDependencies( <strong class="jxr_keyword">new</strong> DependenciesAnalysisCallbackImpl( context ) );
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> }
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment"> * {@inheritDoc}</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> handleDependency( WarPackagingContext context, Dependency dependency, String notBundledMessage,
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> String warOrZipMessage, String standardMessage, <strong class="jxr_keyword">boolean</strong> removeFile )
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> {
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">if</strong> ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() )
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> || Artifact.SCOPE_TEST.equals( dependency.getScope() ) || dependency.isOptional() )
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> {
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> context.getLog().debug( notBundledMessage );
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> }
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> {
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> handleDependencyScope( context, dependency, warOrZipMessage, standardMessage, removeFile );
+<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>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em class="jxr_javadoccomment"> * {@inheritDoc}</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> handleDependencyScope( WarPackagingContext context, Dependency dependency, String warOrZipMessage,
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> String standardMessage, <strong class="jxr_keyword">boolean</strong> removeFile )
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> {
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"war"</span>.equals( dependency.getType() ) || <span class="jxr_string">"zip"</span>.equals( dependency.getType() ) )
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> {
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> context.getLog().warn( warOrZipMessage );
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"tld"</span>.equals( dependency.getType() ) || <span class="jxr_string">"aar"</span>.equals( dependency.getType() )
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> || <span class="jxr_string">"mar"</span>.equals( dependency.getType() ) || <span class="jxr_string">"xar"</span>.equals( dependency.getType() )
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> || <span class="jxr_string">"jar"</span>.equals( dependency.getType() ) || <span class="jxr_string">"ejb"</span>.equals( dependency.getType() )
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> || <span class="jxr_string">"ejb-client"</span>.equals( dependency.getType() ) || <span class="jxr_string">"test-jar"</span>.equals( dependency.getType() )
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> || <span class="jxr_string">"par"</span>.equals( dependency.getType() ) )
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> {
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> context.getLog().info( standardMessage );
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">if</strong> ( removeFile )
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> removeDependency( context, dependency );
+<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> }
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> removeDependency( WarPackagingContext context, Dependency dependency )
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> {
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">final</strong> String targetFileName = context.getWebappStructure().getCachedTargetFileName( dependency );
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">if</strong> ( targetFileName != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> {
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">final</strong> String type = dependency.getType();
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> File targetFile = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"tld"</span>.equals( type ) )
<a class="jxr_linenumber" name="L100" href="#L100">100</a> {
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> targetFile =
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), ArtifactsPackagingTask.MODULES_PATH + targetFileName );
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> }
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"xar"</span>.equals( type ) )
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> targetFile =
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), ArtifactsPackagingTask.EXTENSIONS_PATH + targetFileName );
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> }
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"jar"</span>.equals( type ) || <span class="jxr_string">"ejb"</span>.equals( type ) || <span class="jxr_string">"ejb-client"</span>.equals( type )
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> || <span class="jxr_string">"test-jar"</span>.equals( type ) )
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> {
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> targetFile = <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), LIB_PATH + targetFileName );
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> }
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"par"</span>.equals( type ) )
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> {
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> String targetFileName2 = targetFileName.substring( 0, targetFileName.lastIndexOf( '.' ) ) + <span class="jxr_string">".jar"</span>;
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> targetFile = <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), LIB_PATH + targetFileName2 );
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> }
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_comment">// now remove</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">if</strong> ( targetFile == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> {
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> context.getLog().error( <span class="jxr_string">"Could not get file from dependency ["</span> + dependency + <span class="jxr_string">"]"</span> );
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> }
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( targetFile.exists() )
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> {
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> context.getLog().debug( <span class="jxr_string">"Removing file ["</span> + targetFile.getAbsolutePath() + <span class="jxr_string">"]"</span> );
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> targetFile.delete();
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> }
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> targetFile = <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), ArtifactsPackagingTask.TLD_PATH + targetFileName );
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> }
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"aar"</span>.equals( type ) )
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> {
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> targetFile =
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), ArtifactsPackagingTask.SERVICES_PATH + targetFileName );
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> }
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"mar"</span>.equals( type ) )
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> {
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> targetFile =
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), ArtifactsPackagingTask.MODULES_PATH + targetFileName );
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> }
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"xar"</span>.equals( type ) )
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> {
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> targetFile =
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), ArtifactsPackagingTask.EXTENSIONS_PATH + targetFileName );
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> }
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"jar"</span>.equals( type ) || <span class="jxr_string">"ejb"</span>.equals( type ) || <span class="jxr_string">"ejb-client"</span>.equals( type )
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> || <span class="jxr_string">"test-jar"</span>.equals( type ) )
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> {
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> targetFile = <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), LIB_PATH + targetFileName );
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> }
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"par"</span>.equals( type ) )
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> {
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> String targetFileName2 = targetFileName.substring( 0, targetFileName.lastIndexOf( '.' ) ) + <span class="jxr_string">".jar"</span>;
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> targetFile = <strong class="jxr_keyword">new</strong> File( context.getWebappDirectory(), LIB_PATH + targetFileName2 );
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> }
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_comment">// now remove</em>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">if</strong> ( targetFile == <strong class="jxr_keyword">null</strong> )
<a class="jxr_linenumber" name="L131" href="#L131">131</a> {
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> context.getLog().warn( <span class="jxr_string">"File to remove ["</span> + targetFile.getAbsolutePath() + <span class="jxr_string">"] has not been found"</span> );
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> context.getLog().error( <span class="jxr_string">"Could not get file from dependency ["</span> + dependency + <span class="jxr_string">"]"</span> );
<a class="jxr_linenumber" name="L133" href="#L133">133</a> }
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> }
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> {
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> context.getLog().warn( <span class="jxr_string">"Could not retrieve the target file name of dependency ["</span> + dependency + <span class="jxr_string">"]"</span> );
-<a class="jxr_linenumber" name="L138" href="#L138">138</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">class</strong> <a href="../../../../../../org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.html">DependenciesAnalysisCallbackImpl</a>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">implements</strong> WebappStructure.DependenciesAnalysisCallback
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> {
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugin/war/packaging/WarPackagingContext.html">WarPackagingContext</a> context;
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <a href="../../../../../../org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.html">DependenciesAnalysisCallbackImpl</a>( WarPackagingContext context )
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> {
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">this</strong>.context = context;
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> }
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> unchangedDependency( Dependency dependency )
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> {
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> context.getLog().debug( <span class="jxr_string">"Dependency ["</span> + dependency + <span class="jxr_string">"] has not changed since last build."</span> );
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> }
-<a class="jxr_linenumber" name="L155" href="#L155">155</a>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> newDependency( Dependency dependency )
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> {
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> context.getLog().debug( <span class="jxr_string">"New dependency ["</span> + dependency + <span class="jxr_string">"]."</span> );
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> }
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> removedDependency( Dependency dependency )
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> {
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> handleDependency( context, dependency, <span class="jxr_string">"Dependency ["</span> + dependency
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> + <span class="jxr_string">"] has been removed from the project but it was not bundled anyway."</span>, <span class="jxr_string">"Dependency ["</span> + dependency
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> + <span class="jxr_string">"] has been removed from the project. If it was included in the build as an overlay, "</span>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> + <span class="jxr_string">"consider cleaning the target directory of the project (mvn clean)"</span>, <span class="jxr_string">"Dependency ["</span> + dependency
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> + <span class="jxr_string">"] has been removed from the project."</span>, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( targetFile.exists() )
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> {
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> context.getLog().debug( <span class="jxr_string">"Removing file ["</span> + targetFile.getAbsolutePath() + <span class="jxr_string">"]"</span> );
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> targetFile.delete();
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> }
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> {
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> context.getLog().warn( <span class="jxr_string">"File to remove ["</span> + targetFile.getAbsolutePath() + <span class="jxr_string">"] has not been found"</span> );
+<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="L144" href="#L144">144</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> {
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> context.getLog().warn( <span class="jxr_string">"Could not retrieve the target file name of dependency ["</span> + dependency + <span class="jxr_string">"]"</span> );
+<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>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.html">DependenciesAnalysisCallbackImpl</a>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">implements</strong> WebappStructure.DependenciesAnalysisCallback
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> {
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugin/war/packaging/WarPackagingContext.html">WarPackagingContext</a> context;
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <a href="../../../../../../org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.html">DependenciesAnalysisCallbackImpl</a>( WarPackagingContext context )
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> {
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">this</strong>.context = context;
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> }
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> unchangedDependency( Dependency dependency )
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> {
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> context.getLog().debug( <span class="jxr_string">"Dependency ["</span> + dependency + <span class="jxr_string">"] has not changed since last build."</span> );
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> }
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> newDependency( Dependency dependency )
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> {
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> context.getLog().debug( <span class="jxr_string">"New dependency ["</span> + dependency + <span class="jxr_string">"]."</span> );
<a class="jxr_linenumber" name="L168" href="#L168">168</a> }
<a class="jxr_linenumber" name="L169" href="#L169">169</a>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> updatedVersion( Dependency dependency, String previousVersion )
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> removedDependency( Dependency dependency )
<a class="jxr_linenumber" name="L171" href="#L171">171</a> {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> handleDependency( context, dependency, <span class="jxr_string">"Version of dependency ["</span> + dependency + <span class="jxr_string">"] has changed ("</span>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> + previousVersion + <span class="jxr_string">" -> "</span> + dependency.getVersion()
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> + <span class="jxr_string">") but it was not bundled anyway."</span>,
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <span class="jxr_string">"Version of dependency ["</span> + dependency + <span class="jxr_string">"] has changed ("</span> + previousVersion + <span class="jxr_string">" -> "</span>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> + dependency.getVersion() + <span class="jxr_string">"). If it was included in the build as an overlay, "</span>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> + <span class="jxr_string">"consider "</span> + <span class="jxr_string">"cleaning the target directory of the project (mvn clean)"</span>,
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <span class="jxr_string">"Version of dependency ["</span> + dependency + <span class="jxr_string">"] has changed ("</span> + previousVersion + <span class="jxr_string">" -> "</span>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> + dependency.getVersion() + <span class="jxr_string">")."</span>, <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> }
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> updatedScope( Dependency dependency, String previousScope )
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> {
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">if</strong> ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() )
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> || Artifact.SCOPE_TEST.equals( dependency.getScope() )
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> && ( !Artifact.SCOPE_PROVIDED.equals( previousScope ) && !Artifact.SCOPE_TEST.equals( previousScope ) ) )
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> {
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_comment">// It's now provided or test so it should be removed</em>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> handleDependencyScope( context, dependency, <span class="jxr_string">"Scope of dependency ["</span> + dependency + <span class="jxr_string">"] has changed ("</span>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> + previousScope + <span class="jxr_string">" -> "</span> + dependency.getScope()
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> + <span class="jxr_string">"). If it was included in the build as an overlay, "</span>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> + <span class="jxr_string">"consider cleaning the target directory of the project (mvn clean)"</span>, <span class="jxr_string">"Scope of dependency ["</span>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> + dependency + <span class="jxr_string">"] has changed ("</span> + previousScope + <span class="jxr_string">" -> "</span> + dependency.getScope() + <span class="jxr_string">")."</span>, <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> }
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> }
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> updatedOptionalFlag( Dependency dependency, <strong class="jxr_keyword">boolean</strong> previousOptional )
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> {
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> <strong class="jxr_keyword">if</strong> ( !previousOptional && dependency.isOptional() )
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> {
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_comment">// It wasn't optional but now it is anymore</em>
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> handleDependency( context, dependency, <span class="jxr_string">"Dependency ["</span> + dependency
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> + <span class="jxr_string">"] is now optional but it was not bundled anyway."</span>, <span class="jxr_string">"Dependency ["</span> + dependency
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> + <span class="jxr_string">"] is now optional. If it was included in the build as an overlay, "</span>
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> + <span class="jxr_string">"consider cleaning the target directory of the project (mvn clean)"</span>, <span class="jxr_string">"Dependency ["</span> + dependency
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> + <span class="jxr_string">"] is now optional"</span>, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> handleDependency( context, dependency, <span class="jxr_string">"Dependency ["</span> + dependency
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> + <span class="jxr_string">"] has been removed from the project but it was not bundled anyway."</span>, <span class="jxr_string">"Dependency ["</span> + dependency
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> + <span class="jxr_string">"] has been removed from the project. If it was included in the build as an overlay, "</span>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> + <span class="jxr_string">"consider cleaning the target directory of the project (mvn clean)"</span>, <span class="jxr_string">"Dependency ["</span> + dependency
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> + <span class="jxr_string">"] has been removed from the project."</span>, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> }
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> updatedVersion( Dependency dependency, String previousVersion )
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> {
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> handleDependency( context, dependency, <span class="jxr_string">"Version of dependency ["</span> + dependency + <span class="jxr_string">"] has changed ("</span>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> + previousVersion + <span class="jxr_string">" -> "</span> + dependency.getVersion()
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> + <span class="jxr_string">") but it was not bundled anyway."</span>,
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> <span class="jxr_string">"Version of dependency ["</span> + dependency + <span class="jxr_string">"] has changed ("</span> + previousVersion + <span class="jxr_string">" -> "</span>
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> + dependency.getVersion() + <span class="jxr_string">"). If it was included in the build as an overlay, "</span>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> + <span class="jxr_string">"consider "</span> + <span class="jxr_string">"cleaning the target directory of the project (mvn clean)"</span>,
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> <span class="jxr_string">"Version of dependency ["</span> + dependency + <span class="jxr_string">"] has changed ("</span> + previousVersion + <span class="jxr_string">" -> "</span>
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> + dependency.getVersion() + <span class="jxr_string">")."</span>, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> }
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> updatedScope( Dependency dependency, String previousScope )
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> {
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_comment">// CHECKSTYLE_OFF: LineLength</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">if</strong> ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() )
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> || Artifact.SCOPE_TEST.equals( dependency.getScope() )
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> && ( !Artifact.SCOPE_PROVIDED.equals( previousScope ) && !Artifact.SCOPE_TEST.equals( previousScope ) ) )
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_comment">// CHECKSTYLE_ON: LineLength</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> {
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_comment">// It's now provided or test so it should be removed</em>
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> handleDependencyScope( context, dependency, <span class="jxr_string">"Scope of dependency ["</span> + dependency + <span class="jxr_string">"] has changed ("</span>
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> + previousScope + <span class="jxr_string">" -> "</span> + dependency.getScope()
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> + <span class="jxr_string">"). If it was included in the build as an overlay, "</span>
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> + <span class="jxr_string">"consider cleaning the target directory of the project (mvn clean)"</span>, <span class="jxr_string">"Scope of dependency ["</span>
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> + dependency + <span class="jxr_string">"] has changed ("</span> + previousScope + <span class="jxr_string">" -> "</span> + dependency.getScope() + <span class="jxr_string">")."</span>, <strong class="jxr_keyword">true</strong> );
+<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> }
-<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> updatedUnknown( Dependency dependency, Dependency previousDep )
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> {
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> handleDependency( context, dependency, <span class="jxr_string">"Dependency ["</span> + dependency + <span class="jxr_string">"] has changed (was "</span> + previousDep
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> + <span class="jxr_string">") but it was not bundled anyway."</span>, <span class="jxr_string">"Dependency ["</span> + dependency + <span class="jxr_string">"] has changed (was "</span> + previousDep
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> + <span class="jxr_string">"). If it was included in the build as an overlay, "</span> + <span class="jxr_string">"consider "</span>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> + <span class="jxr_string">"cleaning the target directory of the project (mvn clean)"</span>, <span class="jxr_string">"Dependency ["</span> + dependency
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> + <span class="jxr_string">"] has changed (was "</span> + previousDep + <span class="jxr_string">")."</span>, <strong class="jxr_keyword">true</strong> );
-<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> }
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> updatedOptionalFlag( Dependency dependency, <strong class="jxr_keyword">boolean</strong> previousOptional )
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> {
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">if</strong> ( !previousOptional && dependency.isOptional() )
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> {
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_comment">// It wasn't optional but now it is anymore</em>
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> handleDependency( context, dependency, <span class="jxr_string">"Dependency ["</span> + dependency
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> + <span class="jxr_string">"] is now optional but it was not bundled anyway."</span>, <span class="jxr_string">"Dependency ["</span> + dependency
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> + <span class="jxr_string">"] is now optional. If it was included in the build as an overlay, "</span>
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> + <span class="jxr_string">"consider cleaning the target directory of the project (mvn clean)"</span>, <span class="jxr_string">"Dependency ["</span> + dependency
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> + <span class="jxr_string">"] is now optional"</span>, <strong class="jxr_keyword">true</strong> );
+<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> }
<a class="jxr_linenumber" name="L222" href="#L222">222</a>
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> }
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> updatedUnknown( Dependency dependency, Dependency previousDep )
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> {
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> handleDependency( context, dependency, <span class="jxr_string">"Dependency ["</span> + dependency + <span class="jxr_string">"] has changed (was "</span> + previousDep
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> + <span class="jxr_string">") but it was not bundled anyway."</span>, <span class="jxr_string">"Dependency ["</span> + dependency + <span class="jxr_string">"] has changed (was "</span> + previousDep
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> + <span class="jxr_string">"). If it was included in the build as an overlay, "</span> + <span class="jxr_string">"consider "</span>
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> + <span class="jxr_string">"cleaning the target directory of the project (mvn clean)"</span>, <span class="jxr_string">"Dependency ["</span> + dependency
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> + <span class="jxr_string">"] has changed (was "</span> + previousDep + <span class="jxr_string">")."</span>, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> }
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> }
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> }
</pre>
<hr/>
-<div id="footer">Copyright © 2002–2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
</body>
</html>
\ No newline at end of file
Modified: websites/production/maven/content/plugins-archives/maven-war-plugin-LATEST/xref/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.html
==============================================================================
--- websites/production/maven/content/plugins-archives/maven-war-plugin-LATEST/xref/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.html (original)
+++ websites/production/maven/content/plugins-archives/maven-war-plugin-LATEST/xref/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.html Thu Jan 8 20:15:45 2015
@@ -46,121 +46,128 @@
<a class="jxr_linenumber" name="L38" href="#L38">38</a> {
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugin/war/Overlay.html">Overlay</a> overlay;
<a class="jxr_linenumber" name="L40" href="#L40">40</a>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/maven/plugin/war/packaging/OverlayPackagingTask.html">OverlayPackagingTask</a>( Overlay overlay, Overlay currentProjectOverlay )
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> {
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">if</strong> ( overlay == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> {
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> NullPointerException( <span class="jxr_string">"overlay could not be null."</span> );
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> }
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">if</strong> ( overlay.equals( currentProjectOverlay ) )
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> * @param overlay {@link #overlay}</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment"> * @param currentProjectOverlay current overlay.</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/maven/plugin/war/packaging/OverlayPackagingTask.html">OverlayPackagingTask</a>( Overlay overlay, Overlay currentProjectOverlay )
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> {
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">if</strong> ( overlay == <strong class="jxr_keyword">null</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">throw</strong> <strong class="jxr_keyword">new</strong> IllegalStateException( <span class="jxr_string">"Could not handle the current project with this task."</span> );
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> NullPointerException( <span class="jxr_string">"overlay could not be null."</span> );
<a class="jxr_linenumber" name="L50" href="#L50">50</a> }
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">this</strong>.overlay = overlay;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> }
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> performPackaging( WarPackagingContext context )
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> {
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> context.getLog().debug( <span class="jxr_string">"OverlayPackagingTask performPackaging overlay.getTargetPath() "</span>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> + overlay.getTargetPath() );
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">if</strong> ( overlay.shouldSkip() )
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> {
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> context.getLog().info( <span class="jxr_string">"Skipping overlay ["</span> + overlay + <span class="jxr_string">"]"</span> );
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> }
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> context.getLog().info( <span class="jxr_string">"Processing overlay ["</span> + overlay + <span class="jxr_string">"]"</span> );
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em class="jxr_comment">// Step1: Extract if necessary</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong class="jxr_keyword">final</strong> File tmpDir = unpackOverlay( context, overlay );
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em class="jxr_comment">// Step2: setup</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugin/war/util/PathSet.html">PathSet</a> includes = getFilesToIncludes( tmpDir, overlay.getIncludes(), overlay.getExcludes() );
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> <em class="jxr_comment">// Copy</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> == overlay.getTargetPath() )
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> {
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> copyFiles( overlay.getId(), context, tmpDir, includes, overlay.isFiltered() );
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> }
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> {
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> <em class="jxr_comment">// overlay.getTargetPath() must ended with /</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> <em class="jxr_comment">// if not we add it</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> String targetPath = overlay.getTargetPath();
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">if</strong> ( !targetPath.endsWith( <span class="jxr_string">"/"</span> ) )
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> {
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> targetPath = targetPath + <span class="jxr_string">"/"</span>;
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> }
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> copyFiles( overlay.getId(), context, tmpDir, includes, targetPath, overlay.isFiltered() );
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> }
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> }
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> {
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Failed to copy file for overlay ["</span> + overlay + <span class="jxr_string">"]"</span>, e );
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> }
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> }
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> }
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> <em class="jxr_javadoccomment"> * Unpacks the specified overlay.</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment"> * <p/></em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment"> * Makes sure to skip the unpack process if the overlay has already been unpacked.</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment"> * @param context the packaging context</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment"> * @param overlay the overlay</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment"> * @return the directory containing the unpacked overlay</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException if an error occurred while unpacking the overlay</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">protected</strong> File unpackOverlay( WarPackagingContext context, Overlay overlay )
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> {
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">final</strong> File tmpDir = getOverlayTempDirectory( context, overlay );
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_comment">// TODO: not sure it's good, we should reuse the markers of the dependency plugin</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">if</strong> ( FileUtils.sizeOfDirectory( tmpDir ) == 0
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> || overlay.getArtifact().getFile().lastModified() > tmpDir.lastModified() )
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> doUnpack( context, overlay.getArtifact().getFile(), tmpDir );
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> }
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> {
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> context.getLog().debug( <span class="jxr_string">"Overlay ["</span> + overlay + <span class="jxr_string">"] was already unpacked"</span> );
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> }
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">return</strong> tmpDir;
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> }
-<a class="jxr_linenumber" name="L126" href="#L126">126</a>
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment"> * Returns the directory to use to unpack the specified overlay.</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment"> * @param context the packaging context</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment"> * @param overlay the overlay</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment"> * @return the temp directory for the overlay</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">protected</strong> File getOverlayTempDirectory( WarPackagingContext context, Overlay overlay )
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">final</strong> File groupIdDir = <strong class="jxr_keyword">new</strong> File( context.getOverlaysWorkDirectory(), overlay.getGroupId() );
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <strong class="jxr_keyword">if</strong> ( !groupIdDir.exists() )
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> {
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> groupIdDir.mkdir();
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> }
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> String directoryName = overlay.getArtifactId();
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">if</strong> ( overlay.getClassifier() != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> {
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> directoryName = directoryName + <span class="jxr_string">"-"</span> + overlay.getClassifier();
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> }
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">final</strong> File result = <strong class="jxr_keyword">new</strong> File( groupIdDir, directoryName );
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">if</strong> ( !result.exists() )
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> result.mkdirs();
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> }
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> }
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> }
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">if</strong> ( overlay.equals( currentProjectOverlay ) )
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> {
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalStateException( <span class="jxr_string">"Could not handle the current project with this task."</span> );
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">this</strong>.overlay = overlay;
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> }
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em class="jxr_javadoccomment"> * {@inheritDoc}</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> performPackaging( WarPackagingContext context )
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> {
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> context.getLog().debug( <span class="jxr_string">"OverlayPackagingTask performPackaging overlay.getTargetPath() "</span>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> + overlay.getTargetPath() );
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">if</strong> ( overlay.shouldSkip() )
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> {
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> context.getLog().info( <span class="jxr_string">"Skipping overlay ["</span> + overlay + <span class="jxr_string">"]"</span> );
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> }
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> {
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> {
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> context.getLog().info( <span class="jxr_string">"Processing overlay ["</span> + overlay + <span class="jxr_string">"]"</span> );
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> <em class="jxr_comment">// Step1: Extract if necessary</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">final</strong> File tmpDir = unpackOverlay( context, overlay );
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> <em class="jxr_comment">// Step2: setup</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/maven/plugin/war/util/PathSet.html">PathSet</a> includes = getFilesToIncludes( tmpDir, overlay.getIncludes(), overlay.getExcludes() );
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <em class="jxr_comment">// Copy</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">null</strong> == overlay.getTargetPath() )
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> {
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> copyFiles( overlay.getId(), context, tmpDir, includes, overlay.isFiltered() );
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> }
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> {
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> <em class="jxr_comment">// overlay.getTargetPath() must ended with /</em>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> <em class="jxr_comment">// if not we add it</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> String targetPath = overlay.getTargetPath();
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">if</strong> ( !targetPath.endsWith( <span class="jxr_string">"/"</span> ) )
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> {
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> targetPath = targetPath + <span class="jxr_string">"/"</span>;
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> }
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> copyFiles( overlay.getId(), context, tmpDir, includes, targetPath, overlay.isFiltered() );
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> }
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> }
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> {
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Failed to copy file for overlay ["</span> + overlay + <span class="jxr_string">"]"</span>, e );
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> }
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> }
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> }
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment"> * Unpacks the specified overlay.</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment"> * <p/></em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment"> * Makes sure to skip the unpack process if the overlay has already been unpacked.</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment"> * @param context the packaging context</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment"> * @param overlay the overlay</em>
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment"> * @return the directory containing the unpacked overlay</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException if an error occurred while unpacking the overlay</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">protected</strong> File unpackOverlay( WarPackagingContext context, Overlay overlay )
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">final</strong> File tmpDir = getOverlayTempDirectory( context, overlay );
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_comment">// TODO: not sure it's good, we should reuse the markers of the dependency plugin</em>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">if</strong> ( FileUtils.sizeOfDirectory( tmpDir ) == 0
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> || overlay.getArtifact().getFile().lastModified() > tmpDir.lastModified() )
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> {
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> doUnpack( context, overlay.getArtifact().getFile(), tmpDir );
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> }
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> {
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> context.getLog().debug( <span class="jxr_string">"Overlay ["</span> + overlay + <span class="jxr_string">"] was already unpacked"</span> );
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> }
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">return</strong> tmpDir;
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> }
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment"> * Returns the directory to use to unpack the specified overlay.</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> * @param context the packaging context</em>
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * @param overlay the overlay</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> * @return the temp directory for the overlay</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">protected</strong> File getOverlayTempDirectory( WarPackagingContext context, Overlay overlay )
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> {
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">final</strong> File groupIdDir = <strong class="jxr_keyword">new</strong> File( context.getOverlaysWorkDirectory(), overlay.getGroupId() );
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">if</strong> ( !groupIdDir.exists() )
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> {
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> groupIdDir.mkdir();
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> }
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> String directoryName = overlay.getArtifactId();
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">if</strong> ( overlay.getClassifier() != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> {
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> directoryName = directoryName + <span class="jxr_string">"-"</span> + overlay.getClassifier();
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> }
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">final</strong> File result = <strong class="jxr_keyword">new</strong> File( groupIdDir, directoryName );
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">if</strong> ( !result.exists() )
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> result.mkdirs();
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> }
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> }
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> }
</pre>
<hr/>
-<div id="footer">Copyright © 2002–2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
</body>
</html>
\ No newline at end of file