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 kr...@apache.org on 2014/12/13 09:56:36 UTC
svn commit: r932559 [30/43] - in
/websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST:
./ apidocs/ apidocs/org/apache/maven/plugin/assembly/
apidocs/org/apache/maven/plugin/assembly/archive/
apidocs/org/apache/maven/plugin/a...
Modified: websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.html
==============================================================================
--- websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.html (original)
+++ websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.html Sat Dec 13 08:56:32 2014
@@ -66,132 +66,129 @@
<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> <strong class="jxr_keyword">void</strong> finalizeArchiveCreation( <strong class="jxr_keyword">final</strong> Archiver archiver )
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">throws</strong> ArchiverException
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em class="jxr_comment">// this will prompt the isSelected() call, below, for all resources added to the archive.</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_comment">// FIXME: This needs to be corrected in the AbstractArchiver, where</em>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_comment">// runArchiveFinalizers() is called before regular resources are added...</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_comment">// which is done because the manifest needs to be added first, and the</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_comment">// manifest-creation component is a finalizer in the assembly plugin...</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> ResourceIterator it = archiver.getResources(); it.hasNext(); )
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> {
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> it.next();
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> }
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> addToArchive( archiver );
-<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">void</strong> addToArchive( <strong class="jxr_keyword">final</strong> Archiver archiver )
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">throws</strong> ArchiverException
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> {
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Map.Entry<String, List<String>> entry : catalog.entrySet() )
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> {
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">final</strong> String name = entry.getKey();
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">final</strong> String fname = <strong class="jxr_keyword">new</strong> File( name ).getName();
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> PrintWriter writer = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> File f;
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> {
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> f = File.createTempFile( <span class="jxr_string">"assembly-"</span> + fname, <span class="jxr_string">".tmp"</span> );
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> f.deleteOnExit();
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> writer = <strong class="jxr_keyword">new</strong> PrintWriter( <strong class="jxr_keyword">new</strong> OutputStreamWriter( <strong class="jxr_keyword">new</strong> FileOutputStream( f ), getEncoding() ) );
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> String line : entry.getValue() )
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> {
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> writer.println( line );
-<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> <strong class="jxr_keyword">catch</strong> ( <strong class="jxr_keyword">final</strong> IOException e )
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> {
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ArchiverException(
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> <span class="jxr_string">"Error adding aggregated content for: "</span> + fname + <span class="jxr_string">" to finalize archive creation. Reason: "</span>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> }
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> {
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> IOUtil.close( writer );
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> }
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> excludeOverride = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> archiver.addFile( f, name );
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> excludeOverride = false;
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> }
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> }
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> finalizeArchiveExtraction( <strong class="jxr_keyword">final</strong> UnArchiver unArchiver )
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">throws</strong> ArchiverException
-<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>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">public</strong> List<String> getVirtualFiles()
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> {
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ArrayList<String>( catalog.keySet() );
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> }
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isSelected( <strong class="jxr_keyword">final</strong> @Nonnull FileInfo fileInfo )
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> {
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">if</strong> ( excludeOverride )
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> {
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> }
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> String name = AssemblyFileUtils.normalizeFileInfo( fileInfo );
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">if</strong> ( fileInfo.isFile() && fileMatches( fileInfo ) )
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> name = getOutputPathPrefix( fileInfo ) + <strong class="jxr_keyword">new</strong> File( name ).getName();
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> List<String> lines = catalog.get( name );
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong class="jxr_keyword">if</strong> ( lines == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> {
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> lines = <strong class="jxr_keyword">new</strong> ArrayList<String>();
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> catalog.put( name, lines );
-<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> readLines( fileInfo, lines );
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> {
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em class="jxr_comment">// this will prompt the isSelected() call, below, for all resources added to the archive.</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em class="jxr_comment">// FIXME: This needs to be corrected in the AbstractArchiver, where</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_comment">// runArchiveFinalizers() is called before regular resources are added...</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_comment">// which is done because the manifest needs to be added first, and the</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_comment">// manifest-creation component is a finalizer in the assembly plugin...</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> ResourceIterator it = archiver.getResources(); it.hasNext(); )
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> {
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> it.next();
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> }
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> addToArchive( archiver );
+<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">void</strong> addToArchive( <strong class="jxr_keyword">final</strong> Archiver archiver )
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> {
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Map.Entry<String, List<String>> entry : catalog.entrySet() )
+<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> String name = entry.getKey();
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">final</strong> String fname = <strong class="jxr_keyword">new</strong> File( name ).getName();
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> PrintWriter writer = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> File f;
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> {
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> f = File.createTempFile( <span class="jxr_string">"assembly-"</span> + fname, <span class="jxr_string">".tmp"</span> );
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> f.deleteOnExit();
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> writer = <strong class="jxr_keyword">new</strong> PrintWriter( <strong class="jxr_keyword">new</strong> OutputStreamWriter( <strong class="jxr_keyword">new</strong> FileOutputStream( f ), getEncoding() ) );
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> String line : entry.getValue() )
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> writer.println( line );
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> }
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">catch</strong> ( <strong class="jxr_keyword">final</strong> IOException e )
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> {
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ArchiverException(
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> <span class="jxr_string">"Error adding aggregated content for: "</span> + fname + <span class="jxr_string">" to finalize archive creation. Reason: "</span>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> + e.getMessage(), 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">finally</strong>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> {
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> IOUtil.close( writer );
+<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> excludeOverride = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> archiver.addFile( f, name );
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> excludeOverride = false;
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> }
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> }
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> finalizeArchiveExtraction( <strong class="jxr_keyword">final</strong> UnArchiver unArchiver )
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> {
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> }
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">public</strong> List<String> getVirtualFiles()
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> {
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ArrayList<String>( catalog.keySet() );
+<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="L121" href="#L121">121</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isSelected( @Nonnull <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> {
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">if</strong> ( excludeOverride )
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> {
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<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> String name = AssemblyFileUtils.normalizeFileInfo( fileInfo );
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">if</strong> ( fileInfo.isFile() && fileMatches( fileInfo ) )
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> {
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> name = getOutputPathPrefix( fileInfo ) + <strong class="jxr_keyword">new</strong> File( name ).getName();
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> List<String> lines = catalog.get( name );
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">if</strong> ( lines == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> {
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> lines = <strong class="jxr_keyword">new</strong> ArrayList<String>();
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> catalog.put( name, lines );
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> }
+<a class="jxr_linenumber" name="L141" href="#L141">141</a>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> readLines( fileInfo, lines );
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> }
<a class="jxr_linenumber" name="L146" href="#L146">146</a>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> }
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<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">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> }
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">void</strong> readLines( <strong class="jxr_keyword">final</strong> FileInfo fileInfo, <strong class="jxr_keyword">final</strong> List<String> lines )
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> {
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> BufferedReader reader = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> {
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> reader = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> InputStreamReader( fileInfo.getContents(), getEncoding() ) );
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> String line;
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">while</strong> ( ( line = reader.readLine() ) != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> {
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">if</strong> ( !lines.contains( line ) )
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> {
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> lines.add( line );
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> }
-<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">finally</strong>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> IOUtil.close( reader );
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> }
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> }
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">final</strong> Map<String, List<String>> getCatalog()
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> {
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">return</strong> catalog;
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> }
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">void</strong> setCatalog( <strong class="jxr_keyword">final</strong> Map<String, List<String>> catalog )
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> {
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">this</strong>.catalog = catalog;
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> }
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> }
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">void</strong> readLines( <strong class="jxr_keyword">final</strong> FileInfo fileInfo, <strong class="jxr_keyword">final</strong> List<String> lines )
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> {
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> BufferedReader reader = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> reader = <strong class="jxr_keyword">new</strong> BufferedReader( <strong class="jxr_keyword">new</strong> InputStreamReader( fileInfo.getContents(), getEncoding() ) );
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> String line;
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">while</strong> ( ( line = reader.readLine() ) != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> {
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">if</strong> ( !lines.contains( line ) )
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> {
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> lines.add( line );
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> }
+<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">finally</strong>
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> {
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> IOUtil.close( reader );
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> }
+<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> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">final</strong> Map<String, List<String>> getCatalog()
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> {
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong class="jxr_keyword">return</strong> catalog;
+<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">protected</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">void</strong> setCatalog( <strong class="jxr_keyword">final</strong> Map<String, List<String>> catalog )
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> {
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong class="jxr_keyword">this</strong>.catalog = catalog;
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> }
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2002–2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.html
==============================================================================
--- websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.html (original)
+++ websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.html Sat Dec 13 08:56:32 2014
@@ -27,26 +27,26 @@
<a class="jxr_linenumber" name="L19" href="#L19">19</a> <em class="jxr_comment"> * under the License.</em>
<a class="jxr_linenumber" name="L20" href="#L20">20</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="L21" href="#L21">21</a>
-<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.archiver.Archiver;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.archiver.ArchiverException;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.archiver.ResourceIterator;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.archiver.UnArchiver;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Component;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.components.io.fileselectors.FileInfo;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.IOUtil;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.Xpp3Dom;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.Xpp3DomWriter;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-<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> javax.annotation.Nonnull;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> java.io.BufferedReader;
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> java.io.FileOutputStream;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> java.io.InputStream;
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> java.io.InputStreamReader;
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> java.io.OutputStreamWriter;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.ReaderFactory;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.WriterFactory;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.archiver.Archiver;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.archiver.ArchiverException;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.archiver.ResourceIterator;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.archiver.UnArchiver;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Component;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.components.io.fileselectors.FileInfo;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.IOUtil;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.Xpp3Dom;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.Xpp3DomBuilder;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.Xpp3DomWriter;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> javax.annotation.Nonnull;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> java.io.BufferedReader;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> java.io.File;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> java.io.FileOutputStream;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> java.io.InputStream;
<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> java.io.Reader;
<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> java.io.Writer;
<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> java.util.Collections;
@@ -58,7 +58,7 @@
<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * Components XML file filter.</em>
<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"> * @author <a href="<a href="mailto:brett@apache.org" target="alexandria_uri">mailto:brett@apache.org</a>">Brett Porter</a></em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment"> * @version $Id: ComponentsXmlArchiverFileFilter.java 1639422 2014-11-13 18:08:07Z krosenvold $</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment"> * @version $Id: ComponentsXmlArchiverFileFilter.java 1642461 2014-11-29 18:26:36Z krosenvold $</em>
<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L55" href="#L55">55</a> @Component( role = ContainerDescriptorHandler.<strong class="jxr_keyword">class</strong>, hint = <span class="jxr_string">"plexus"</span>, instantiationStrategy = <span class="jxr_string">"per-lookup"</span> )
<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.html">ComponentsXmlArchiverFileFilter</a>
@@ -112,153 +112,133 @@
<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>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_comment">// public void addComponentsXml( File componentsXml )</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_comment">// throws IOException, XmlPullParserException</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_comment">// FileReader fileReader = null;</em>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_comment">// try</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_comment">// fileReader = new FileReader( componentsXml );</em>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_comment">// addComponentsXml( fileReader );</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_comment">// }</em>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_comment">// finally</em>
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_comment">// IOUtil.close( fileReader );</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_comment">// }</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_comment">// }</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addToArchive( <strong class="jxr_keyword">final</strong> Archiver archiver )
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">throws</strong> IOException, ArchiverException
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> {
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">if</strong> ( components != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> {
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">final</strong> File f = File.createTempFile( <span class="jxr_string">"maven-assembly-plugin"</span>, <span class="jxr_string">"tmp"</span> );
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> f.deleteOnExit();
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_comment">// TODO use WriterFactory.newXmlWriter() when plexus-utils is upgraded to 1.4.5+</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">final</strong> Writer fileWriter = <strong class="jxr_keyword">new</strong> OutputStreamWriter( <strong class="jxr_keyword">new</strong> FileOutputStream( f ), <span class="jxr_string">"UTF-8"</span> );
-<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> Xpp3Dom dom = <strong class="jxr_keyword">new</strong> Xpp3Dom( <span class="jxr_string">"component-set"</span> );
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">final</strong> Xpp3Dom componentDom = <strong class="jxr_keyword">new</strong> Xpp3Dom( <span class="jxr_string">"components"</span> );
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> dom.addChild( componentDom );
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Xpp3Dom component : components.values() )
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> {
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> componentDom.addChild( component );
-<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> Xpp3DomWriter.write( fileWriter, dom );
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> }
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> {
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> IOUtil.close( fileWriter );
-<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> excludeOverride = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> archiver.addFile( f, COMPONENTS_XML_PATH );
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> excludeOverride = false;
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> }
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> }
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> finalizeArchiveCreation( <strong class="jxr_keyword">final</strong> Archiver archiver )
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">throws</strong> ArchiverException
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> {
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> <em class="jxr_comment">// this will prompt the isSelected() call, below, for all resources added to the archive.</em>
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> <em class="jxr_comment">// FIXME: This needs to be corrected in the AbstractArchiver, where</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_comment">// runArchiveFinalizers() is called before regular resources are added...</em>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_comment">// which is done because the manifest needs to be added first, and the</em>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_comment">// manifest-creation component is a finalizer in the assembly plugin...</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> ResourceIterator it = archiver.getResources(); it.hasNext(); )
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> {
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> it.next();
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> }
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> {
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> addToArchive( archiver );
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> }
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">catch</strong> ( <strong class="jxr_keyword">final</strong> IOException e )
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> {
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ArchiverException( <span class="jxr_string">"Error finalizing component-set for archive. Reason: "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> }
-<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> List<String> getVirtualFiles()
-<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> ( ( components != <strong class="jxr_keyword">null</strong> ) && !components.isEmpty() )
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> {
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">return</strong> Collections.singletonList( COMPONENTS_XML_PATH );
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> }
-<a class="jxr_linenumber" name="L188" href="#L188">188</a>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> }
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isSelected( <strong class="jxr_keyword">final</strong> @Nonnull FileInfo fileInfo )
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> {
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">if</strong> ( fileInfo.isFile() )
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> {
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <strong class="jxr_keyword">if</strong> ( excludeOverride )
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> {
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> }
-<a class="jxr_linenumber" name="L201" href="#L201">201</a>
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> String entry = fileInfo.getName().replace( '\\', '/' );
-<a class="jxr_linenumber" name="L203" href="#L203">203</a>
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">if</strong> ( entry.startsWith( <span class="jxr_string">"/"</span> ) )
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> {
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> entry = entry.substring( 1 );
-<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">if</strong> ( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH.equals( entry ) )
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> {
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> InputStream stream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> InputStreamReader reader = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L213" href="#L213">213</a>
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> {
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> stream = fileInfo.getContents();
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> <em class="jxr_comment">// TODO use ReaderFactory.newXmlReader() when plexus-utils is upgraded to 1.4.5+</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> reader = <strong class="jxr_keyword">new</strong> InputStreamReader( stream, <span class="jxr_string">"UTF-8"</span> );
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> addComponentsXml( <strong class="jxr_keyword">new</strong> BufferedReader( reader, 8192 ) );
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> }
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">catch</strong> ( <strong class="jxr_keyword">final</strong> XmlPullParserException e )
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> {
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> <strong class="jxr_keyword">final</strong> IOException error =
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">new</strong> IOException( <span class="jxr_string">"Error finalizing component-set for archive. Reason: "</span> + e.getMessage() );
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> error.initCause( e );
-<a class="jxr_linenumber" name="L226" href="#L226">226</a>
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> <strong class="jxr_keyword">throw</strong> error;
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> }
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> {
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> IOUtil.close( stream );
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> IOUtil.close( reader );
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> }
-<a class="jxr_linenumber" name="L234" href="#L234">234</a>
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> }
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> {
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> }
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> }
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> {
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> }
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> }
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> finalizeArchiveExtraction( <strong class="jxr_keyword">final</strong> UnArchiver unarchiver )
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">throws</strong> ArchiverException
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> {
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> }
-<a class="jxr_linenumber" name="L252" href="#L252">252</a>
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> }
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addToArchive( <strong class="jxr_keyword">final</strong> Archiver archiver )
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> {
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">if</strong> ( components != <strong class="jxr_keyword">null</strong> )
+<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 f = File.createTempFile( <span class="jxr_string">"maven-assembly-plugin"</span>, <span class="jxr_string">"tmp"</span> );
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> f.deleteOnExit();
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">final</strong> Writer fileWriter = WriterFactory.newXmlWriter( <strong class="jxr_keyword">new</strong> FileOutputStream( f ) );
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> {
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">final</strong> Xpp3Dom dom = <strong class="jxr_keyword">new</strong> Xpp3Dom( <span class="jxr_string">"component-set"</span> );
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">final</strong> Xpp3Dom componentDom = <strong class="jxr_keyword">new</strong> Xpp3Dom( <span class="jxr_string">"components"</span> );
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> dom.addChild( componentDom );
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Xpp3Dom component : components.values() )
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> {
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> componentDom.addChild( component );
+<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> Xpp3DomWriter.write( fileWriter, dom );
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> }
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> {
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> IOUtil.close( fileWriter );
+<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> excludeOverride = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> archiver.addFile( f, COMPONENTS_XML_PATH );
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> excludeOverride = false;
+<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>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> finalizeArchiveCreation( <strong class="jxr_keyword">final</strong> Archiver archiver )
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> {
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_comment">// this will prompt the isSelected() call, below, for all resources added to the archive.</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_comment">// FIXME: This needs to be corrected in the AbstractArchiver, where</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_comment">// runArchiveFinalizers() is called before regular resources are added...</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_comment">// which is done because the manifest needs to be added first, and the</em>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_comment">// manifest-creation component is a finalizer in the assembly plugin...</em>
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> ResourceIterator it = archiver.getResources(); it.hasNext(); )
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> {
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> it.next();
+<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="L154" href="#L154">154</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> addToArchive( archiver );
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> }
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">catch</strong> ( <strong class="jxr_keyword">final</strong> IOException e )
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> {
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ArchiverException( <span class="jxr_string">"Error finalizing component-set for archive. Reason: "</span> + e.getMessage(), e );
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> }
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> }
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">public</strong> List<String> getVirtualFiles()
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> {
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">if</strong> ( ( components != <strong class="jxr_keyword">null</strong> ) && !components.isEmpty() )
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> {
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> <strong class="jxr_keyword">return</strong> Collections.singletonList( COMPONENTS_XML_PATH );
+<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">return</strong> <strong class="jxr_keyword">null</strong>;
+<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">boolean</strong> isSelected( @Nonnull <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> {
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">if</strong> ( fileInfo.isFile() )
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> {
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">if</strong> ( excludeOverride )
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> {
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> }
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> String entry = fileInfo.getName().replace( '\\', '/' );
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">if</strong> ( entry.startsWith( <span class="jxr_string">"/"</span> ) )
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> {
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> entry = entry.substring( 1 );
+<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">if</strong> ( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH.equals( entry ) )
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> {
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> InputStream stream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> Reader reader = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L195" href="#L195">195</a>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> {
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> stream = fileInfo.getContents();
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> reader = ReaderFactory.newXmlReader( stream );
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> addComponentsXml( <strong class="jxr_keyword">new</strong> BufferedReader( reader ) );
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> }
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">catch</strong> ( <strong class="jxr_keyword">final</strong> XmlPullParserException e )
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> {
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">final</strong> IOException error =
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> <strong class="jxr_keyword">new</strong> IOException( <span class="jxr_string">"Error finalizing component-set for archive. Reason: "</span> + e.getMessage() );
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> error.initCause( e );
+<a class="jxr_linenumber" name="L207" href="#L207">207</a>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <strong class="jxr_keyword">throw</strong> error;
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> }
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> {
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> IOUtil.close( stream );
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> IOUtil.close( reader );
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> }
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> }
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> {
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<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> <strong class="jxr_keyword">else</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">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> }
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> }
+<a class="jxr_linenumber" name="L228" href="#L228">228</a>
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> finalizeArchiveExtraction( <strong class="jxr_keyword">final</strong> UnArchiver unarchiver )
+<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> }
</pre>
<hr/>
<div id="footer">Copyright © 2002–2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.html
==============================================================================
--- websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.html (original)
+++ websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.html Sat Dec 13 08:56:32 2014
@@ -30,38 +30,41 @@
<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Component;
<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.components.io.fileselectors.FileInfo;
<a class="jxr_linenumber" name="L24" href="#L24">24</a>
-<a class="jxr_linenumber" name="L25" href="#L25">25</a> @Component( role = ContainerDescriptorHandler.<strong class="jxr_keyword">class</strong>, hint = <span class="jxr_string">"metaInf-services"</span>, instantiationStrategy = <span class="jxr_string">"per-lookup"</span> )
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.html">MetaInfServicesHandler</a>
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.html">AbstractLineAggregatingHandler</a>
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> {
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SERVICES_PATH_PREFIX = <span class="jxr_string">"META-INF/services/"</span>;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> @Override
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">protected</strong> String getOutputPathPrefix( <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> {
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">return</strong> SERVICES_PATH_PREFIX;
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> }
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> @Override
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> fileMatches( <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> {
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">final</strong> String path = fileInfo.getName();
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> String leftover = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">if</strong> ( path.startsWith( SERVICES_PATH_PREFIX ) )
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> {
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> leftover = path.substring( SERVICES_PATH_PREFIX.length() );
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> }
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( path.startsWith( <span class="jxr_string">"/META-INF/services/"</span> ) )
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> {
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> leftover = path.substring( SERVICES_PATH_PREFIX.length() - 1 );
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> }
-<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> leftover != <strong class="jxr_keyword">null</strong> && leftover.length() > 0;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
+<a class="jxr_linenumber" name="L25" href="#L25">25</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <em class="jxr_javadoccomment"> * </em>
+<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> @Component( role = ContainerDescriptorHandler.<strong class="jxr_keyword">class</strong>, hint = <span class="jxr_string">"metaInf-services"</span>, instantiationStrategy = <span class="jxr_string">"per-lookup"</span> )
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.html">MetaInfServicesHandler</a>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.html">AbstractLineAggregatingHandler</a>
+<a class="jxr_linenumber" name="L31" href="#L31">31</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">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SERVICES_PATH_PREFIX = <span class="jxr_string">"META-INF/services/"</span>;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> @Override
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">protected</strong> String getOutputPathPrefix( <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> {
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">return</strong> SERVICES_PATH_PREFIX;
+<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> @Override
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> fileMatches( <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> {
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">final</strong> String path = fileInfo.getName();
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> String leftover = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">if</strong> ( path.startsWith( SERVICES_PATH_PREFIX ) )
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> {
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> leftover = path.substring( SERVICES_PATH_PREFIX.length() );
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> }
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( path.startsWith( <span class="jxr_string">"/META-INF/services/"</span> ) )
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> {
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> leftover = path.substring( SERVICES_PATH_PREFIX.length() - 1 );
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
<a class="jxr_linenumber" name="L55" href="#L55">55</a>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> }
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">return</strong> leftover != <strong class="jxr_keyword">null</strong> && leftover.length() > 0;
+<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> }
</pre>
<hr/>
<div id="footer">Copyright © 2002–2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.html
==============================================================================
--- websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.html (original)
+++ websites/production/maven/content/plugins-archives/maven-assembly-plugin-LATEST/xref/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.html Sat Dec 13 08:56:32 2014
@@ -30,38 +30,41 @@
<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Component;
<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.components.io.fileselectors.FileInfo;
<a class="jxr_linenumber" name="L24" href="#L24">24</a>
-<a class="jxr_linenumber" name="L25" href="#L25">25</a> @Component( role = ContainerDescriptorHandler.<strong class="jxr_keyword">class</strong>, hint = <span class="jxr_string">"metaInf-spring"</span>, instantiationStrategy = <span class="jxr_string">"per-lookup"</span> )
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.html">MetaInfSpringHandler</a>
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.html">AbstractLineAggregatingHandler</a>
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> {
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SPRING_PATH_PREFIX = <span class="jxr_string">"META-INF/"</span>;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> @Override
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">protected</strong> String getOutputPathPrefix( <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> {
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">return</strong> SPRING_PATH_PREFIX;
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> }
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> @Override
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> fileMatches( <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> {
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">final</strong> String path = fileInfo.getName();
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> String leftover = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">if</strong> ( path.startsWith( <span class="jxr_string">"/META-INF/spring."</span> ) )
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> {
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> leftover = path.substring( <span class="jxr_string">"/META-INF/spring."</span>.length() );
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> }
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( path.startsWith( <span class="jxr_string">"META-INF/spring."</span> ) )
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> {
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> leftover = path.substring( <span class="jxr_string">"META-INF/spring."</span>.length() - 1 );
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> }
-<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> leftover != <strong class="jxr_keyword">null</strong> && leftover.length() > 0;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
+<a class="jxr_linenumber" name="L25" href="#L25">25</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <em class="jxr_javadoccomment"> * </em>
+<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> @Component( role = ContainerDescriptorHandler.<strong class="jxr_keyword">class</strong>, hint = <span class="jxr_string">"metaInf-spring"</span>, instantiationStrategy = <span class="jxr_string">"per-lookup"</span> )
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.html">MetaInfSpringHandler</a>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.html">AbstractLineAggregatingHandler</a>
+<a class="jxr_linenumber" name="L31" href="#L31">31</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">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SPRING_PATH_PREFIX = <span class="jxr_string">"META-INF/"</span>;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> @Override
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">protected</strong> String getOutputPathPrefix( <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> {
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">return</strong> SPRING_PATH_PREFIX;
+<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> @Override
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> fileMatches( <strong class="jxr_keyword">final</strong> FileInfo fileInfo )
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> {
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">final</strong> String path = fileInfo.getName();
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> String leftover = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">if</strong> ( path.startsWith( <span class="jxr_string">"/META-INF/spring."</span> ) )
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> {
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> leftover = path.substring( <span class="jxr_string">"/META-INF/spring."</span>.length() );
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> }
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( path.startsWith( <span class="jxr_string">"META-INF/spring."</span> ) )
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> {
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> leftover = path.substring( <span class="jxr_string">"META-INF/spring."</span>.length() - 1 );
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
<a class="jxr_linenumber" name="L55" href="#L55">55</a>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> }
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">return</strong> leftover != <strong class="jxr_keyword">null</strong> && leftover.length() > 0;
+<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> }
</pre>
<hr/>
<div id="footer">Copyright © 2002–2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>