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 hb...@apache.org on 2020/06/06 06:56:07 UTC
svn commit: r1878532 [30/45] - in
/maven/website/components/plugins-archives/maven-war-plugin-LATEST: ./
apidocs/ apidocs/org/apache/maven/plugins/war/
apidocs/org/apache/maven/plugins/war/class-use/
apidocs/org/apache/maven/plugins/war/overlay/ apidoc...
Modified: maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/WarOverlaysTest.html
==============================================================================
--- maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/WarOverlaysTest.html (original)
+++ maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/WarOverlaysTest.html Sat Jun 6 06:56:04 2020
@@ -106,7 +106,7 @@
<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">final</strong> ArtifactStub overlay = buildWarOverlayStub( <span class="jxr_string">"overlay-one"</span> );
<a class="jxr_linenumber" name="L99" href="#L99">99</a>
<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">final</strong> File webAppDirectory = setUpMojo( testId, <strong class="jxr_keyword">new</strong> ArtifactStub[] { overlay } );
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<File>();
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">try</strong>
<a class="jxr_linenumber" name="L103" href="#L103">103</a> {
<a class="jxr_linenumber" name="L104" href="#L104">104</a> mojo.execute();
@@ -140,7 +140,7 @@
<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">final</strong> ArtifactStub overlay2 = buildWarOverlayStub( <span class="jxr_string">"overlay-two"</span> );
<a class="jxr_linenumber" name="L133" href="#L133">133</a>
<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">final</strong> File webAppDirectory = setUpMojo( testId, <strong class="jxr_keyword">new</strong> ArtifactStub[] { overlay, overlay2 } );
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<File>();
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">try</strong>
<a class="jxr_linenumber" name="L137" href="#L137">137</a> {
<a class="jxr_linenumber" name="L138" href="#L138">138</a> mojo.execute();
@@ -215,7 +215,7 @@
<a class="jxr_linenumber" name="L207" href="#L207">207</a> <span class="jxr_string">"org/sample/company/test.jsp"</span>, <span class="jxr_string">"jsp/b.jsp"</span> } );
<a class="jxr_linenumber" name="L208" href="#L208">208</a>
<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_comment">// Add the tags</em>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<Overlay>();
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<>();
<a class="jxr_linenumber" name="L211" href="#L211">211</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay1 ) );
<a class="jxr_linenumber" name="L212" href="#L212">212</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay2 ) );
<a class="jxr_linenumber" name="L213" href="#L213">213</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay3 ) );
@@ -248,7 +248,7 @@
<a class="jxr_linenumber" name="L240" href="#L240">240</a> <span class="jxr_string">"org/sample/company/test.jsp"</span>, <span class="jxr_string">"jsp/b.jsp"</span> } );
<a class="jxr_linenumber" name="L241" href="#L241">241</a>
<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_comment">// Add the tags</em>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<Overlay>();
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> <strong class="jxr_keyword">final</strong> List<Overlay> overlays = <strong class="jxr_keyword">new</strong> ArrayList<>();
<a class="jxr_linenumber" name="L244" href="#L244">244</a>
<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_comment">// Add the default project explicitely</em>
<a class="jxr_linenumber" name="L246" href="#L246">246</a> overlays.add( mojo.getCurrentProjectOverlay() );
@@ -273,7 +273,7 @@
<a class="jxr_linenumber" name="L265" href="#L265">265</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> assertScenariOne( String testId, File webAppDirectory )
<a class="jxr_linenumber" name="L266" href="#L266">266</a> <strong class="jxr_keyword">throws</strong> Exception
<a class="jxr_linenumber" name="L267" href="#L267">267</a> {
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<File>();
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
<a class="jxr_linenumber" name="L269" href="#L269">269</a> <strong class="jxr_keyword">try</strong>
<a class="jxr_linenumber" name="L270" href="#L270">270</a> {
<a class="jxr_linenumber" name="L271" href="#L271">271</a> mojo.execute();
@@ -345,7 +345,7 @@
<a class="jxr_linenumber" name="L337" href="#L337">337</a> mojo.addOverlay( mojo.getCurrentProjectOverlay() );
<a class="jxr_linenumber" name="L338" href="#L338">338</a> mojo.addOverlay( over4 );
<a class="jxr_linenumber" name="L339" href="#L339">339</a>
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<File>();
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
<a class="jxr_linenumber" name="L341" href="#L341">341</a> <strong class="jxr_keyword">try</strong>
<a class="jxr_linenumber" name="L342" href="#L342">342</a> {
<a class="jxr_linenumber" name="L343" href="#L343">343</a> mojo.execute();
@@ -415,7 +415,7 @@
<a class="jxr_linenumber" name="L407" href="#L407">407</a> mojo.addOverlay( mojo.getCurrentProjectOverlay() );
<a class="jxr_linenumber" name="L408" href="#L408">408</a> mojo.addOverlay( over4 );
<a class="jxr_linenumber" name="L409" href="#L409">409</a>
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<File>();
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
<a class="jxr_linenumber" name="L411" href="#L411">411</a> <strong class="jxr_keyword">try</strong>
<a class="jxr_linenumber" name="L412" href="#L412">412</a> {
<a class="jxr_linenumber" name="L413" href="#L413">413</a> mojo.execute();
@@ -451,166 +451,58 @@
<a class="jxr_linenumber" name="L443" href="#L443">443</a>
<a class="jxr_linenumber" name="L444" href="#L444">444</a> }
<a class="jxr_linenumber" name="L445" href="#L445">445</a>
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCacheWithUpdatedOverlay()
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> {
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em class="jxr_comment">// setup test data</em>
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> <strong class="jxr_keyword">final</strong> String testId = <span class="jxr_string">"cache-updated-overlay"</span>;
-<a class="jxr_linenumber" name="L451" href="#L451">451</a>
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> <em class="jxr_comment">// Add an overlay</em>
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> <strong class="jxr_keyword">final</strong> ArtifactStub overlay = buildWarOverlayStub( <span class="jxr_string">"overlay-one"</span> );
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> <strong class="jxr_keyword">final</strong> ArtifactStub overlay2 = buildWarOverlayStub( <span class="jxr_string">"overlay-two"</span> );
-<a class="jxr_linenumber" name="L455" href="#L455">455</a>
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> <strong class="jxr_keyword">final</strong> File webAppDirectory = setUpMojo( testId, <strong class="jxr_keyword">new</strong> ArtifactStub[] { overlay, overlay2 } );
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<File>();
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> {
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> <em class="jxr_comment">// Use the cache</em>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> setVariableValueToObject( mojo, <span class="jxr_string">"useCache"</span>, Boolean.TRUE );
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> setVariableValueToObject( mojo, <span class="jxr_string">"cacheFile"</span>, <strong class="jxr_keyword">new</strong> File( mojo.getWorkDirectory(), <span class="jxr_string">"cache.xml"</span> ) );
-<a class="jxr_linenumber" name="L463" href="#L463">463</a>
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> <strong class="jxr_keyword">final</strong> LinkedList<Overlay> overlays = <strong class="jxr_keyword">new</strong> LinkedList<Overlay>();
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay ) );
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay2 ) );
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> mojo.setOverlays( overlays );
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <em class="jxr_comment">// Helpers</em>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a>
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em class="jxr_javadoccomment"> * Asserts that the content of an overlayed file is correct.</em>
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em class="jxr_javadoccomment"> * </em>
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em class="jxr_javadoccomment"> * Note that the <tt>filePath</tt> is relative to both the webapp directory and the overlayed directory, defined by</em>
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> <em class="jxr_javadoccomment"> * the <tt>overlayId</tt>.</em>
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> <em class="jxr_javadoccomment"> * @param webAppDirectory the webapp directory</em>
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> <em class="jxr_javadoccomment"> * @param overlayId the id of the overlay</em>
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> <em class="jxr_javadoccomment"> * @param filePath the relative path</em>
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> <em class="jxr_javadoccomment"> * @throws IOException if an error occurred while reading the files</em>
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L459" href="#L459">459</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> assertOverlayedFile( File webAppDirectory, String overlayId, String filePath )
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> {
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> <strong class="jxr_keyword">final</strong> File webAppFile = <strong class="jxr_keyword">new</strong> File( webAppDirectory, filePath );
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> <strong class="jxr_keyword">final</strong> File overlayFile = getOverlayFile( overlayId, filePath );
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> assertEquals( <span class="jxr_string">"Wrong content for overlayed file "</span> + filePath, FileUtils.fileRead( overlayFile ),
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> FileUtils.fileRead( webAppFile ) );
+<a class="jxr_linenumber" name="L466" href="#L466">466</a>
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> }
<a class="jxr_linenumber" name="L468" href="#L468">468</a>
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> mojo.execute();
-<a class="jxr_linenumber" name="L470" href="#L470">470</a>
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> <em class="jxr_comment">// Now change the overlay order and make sure the right file is overwritten</em>
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> <strong class="jxr_keyword">final</strong> LinkedList<Overlay> updatedOverlays = <strong class="jxr_keyword">new</strong> LinkedList<Overlay>();
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> updatedOverlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay2 ) );
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> updatedOverlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay ) );
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> mojo.setOverlays( updatedOverlays );
-<a class="jxr_linenumber" name="L476" href="#L476">476</a>
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> mojo.execute();
-<a class="jxr_linenumber" name="L478" href="#L478">478</a>
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> assertedFiles.addAll( assertDefaultContent( webAppDirectory ) );
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> assertedFiles.addAll( assertWebXml( webAppDirectory ) );
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> assertedFiles.addAll( assertCustomContent( webAppDirectory, <strong class="jxr_keyword">new</strong> String[] { <span class="jxr_string">"index.jsp"</span>, <span class="jxr_string">"login.jsp"</span>,
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> <span class="jxr_string">"admin.jsp"</span> }, <span class="jxr_string">"overlay file not found"</span> ) );
-<a class="jxr_linenumber" name="L483" href="#L483">483</a>
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> <em class="jxr_comment">// index and login come from overlay2 now</em>
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> assertOverlayedFile( webAppDirectory, <span class="jxr_string">"overlay-two"</span>, <span class="jxr_string">"index.jsp"</span> );
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> assertOverlayedFile( webAppDirectory, <span class="jxr_string">"overlay-one"</span>, <span class="jxr_string">"login.jsp"</span> );
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> assertOverlayedFile( webAppDirectory, <span class="jxr_string">"overlay-two"</span>, <span class="jxr_string">"admin.jsp"</span> );
-<a class="jxr_linenumber" name="L488" href="#L488">488</a>
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> <em class="jxr_comment">// Ok now check that there is no more files/directories</em>
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> <strong class="jxr_keyword">final</strong> FileFilter filter = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.html">FileFilterImpl</a>( webAppDirectory, <strong class="jxr_keyword">new</strong> String[] { MANIFEST_PATH } );
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> assertWebAppContent( webAppDirectory, assertedFiles, filter );
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> }
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> {
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> cleanDirectory( webAppDirectory );
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> }
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> }
-<a class="jxr_linenumber" name="L498" href="#L498">498</a>
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCacheWithRemovedOverlay()
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> {
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_comment">// setup test data</em>
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> <strong class="jxr_keyword">final</strong> String testId = <span class="jxr_string">"cache-removed-overlay"</span>;
-<a class="jxr_linenumber" name="L504" href="#L504">504</a>
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> <em class="jxr_comment">// Add an overlay</em>
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> <strong class="jxr_keyword">final</strong> ArtifactStub overlay = buildWarOverlayStub( <span class="jxr_string">"overlay-one"</span> );
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> <strong class="jxr_keyword">final</strong> ArtifactStub overlay2 = buildWarOverlayStub( <span class="jxr_string">"overlay-two"</span> );
-<a class="jxr_linenumber" name="L508" href="#L508">508</a>
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> <strong class="jxr_keyword">final</strong> File webAppDirectory = setUpMojo( testId, <strong class="jxr_keyword">new</strong> ArtifactStub[] { overlay, overlay2 } );
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> <strong class="jxr_keyword">final</strong> List<File> assertedFiles = <strong class="jxr_keyword">new</strong> ArrayList<File>();
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> {
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> <em class="jxr_comment">// Use the cache</em>
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> setVariableValueToObject( mojo, <span class="jxr_string">"useCache"</span>, Boolean.TRUE );
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> setVariableValueToObject( mojo, <span class="jxr_string">"cacheFile"</span>, <strong class="jxr_keyword">new</strong> File( mojo.getWorkDirectory(), <span class="jxr_string">"cache.xml"</span> ) );
-<a class="jxr_linenumber" name="L516" href="#L516">516</a>
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> <strong class="jxr_keyword">final</strong> LinkedList<Overlay> overlays = <strong class="jxr_keyword">new</strong> LinkedList<Overlay>();
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay ) );
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> overlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay2 ) );
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> mojo.setOverlays( overlays );
-<a class="jxr_linenumber" name="L521" href="#L521">521</a>
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> mojo.execute();
-<a class="jxr_linenumber" name="L523" href="#L523">523</a>
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> <em class="jxr_comment">// Now remove overlay one the right file is overwritten</em>
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> <strong class="jxr_keyword">final</strong> LinkedList<Overlay> updatedOverlays = <strong class="jxr_keyword">new</strong> LinkedList<Overlay>();
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> updatedOverlays.add( <strong class="jxr_keyword">new</strong> DefaultOverlay( overlay2 ) );
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> mojo.setOverlays( updatedOverlays );
-<a class="jxr_linenumber" name="L528" href="#L528">528</a>
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> <em class="jxr_comment">// Remove overlay one as a dep</em>
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> mojo.getProject().getArtifacts().remove( overlay );
-<a class="jxr_linenumber" name="L531" href="#L531">531</a>
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> mojo.execute();
-<a class="jxr_linenumber" name="L533" href="#L533">533</a>
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> assertedFiles.addAll( assertDefaultContent( webAppDirectory ) );
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> assertedFiles.addAll( assertWebXml( webAppDirectory ) );
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> assertedFiles.addAll( assertCustomContent( webAppDirectory, <strong class="jxr_keyword">new</strong> String[] { <span class="jxr_string">"index.jsp"</span>, <span class="jxr_string">"login.jsp"</span>,
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> <span class="jxr_string">"admin.jsp"</span> }, <span class="jxr_string">"overlay file not found"</span> ) );
-<a class="jxr_linenumber" name="L538" href="#L538">538</a>
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> <em class="jxr_comment">// index and login come from overlay2 now</em>
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> assertOverlayedFile( webAppDirectory, <span class="jxr_string">"overlay-two"</span>, <span class="jxr_string">"index.jsp"</span> );
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> assertOverlayedFile( webAppDirectory, <span class="jxr_string">"overlay-one"</span>, <span class="jxr_string">"login.jsp"</span> );
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> assertOverlayedFile( webAppDirectory, <span class="jxr_string">"overlay-two"</span>, <span class="jxr_string">"admin.jsp"</span> );
-<a class="jxr_linenumber" name="L543" href="#L543">543</a>
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> <em class="jxr_comment">// Ok now check that there is no more files/directories</em>
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> <strong class="jxr_keyword">final</strong> FileFilter filter = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.html">FileFilterImpl</a>( webAppDirectory, <strong class="jxr_keyword">new</strong> String[] { MANIFEST_PATH } );
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> assertWebAppContent( webAppDirectory, assertedFiles, filter );
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> }
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> {
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> cleanDirectory( webAppDirectory );
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> }
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> }
-<a class="jxr_linenumber" name="L553" href="#L553">553</a>
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> <em class="jxr_comment">// Helpers</em>
-<a class="jxr_linenumber" name="L555" href="#L555">555</a>
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L557" href="#L557">557</a> <em class="jxr_javadoccomment"> * Asserts that the content of an overlayed file is correct.</em>
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> <em class="jxr_javadoccomment"> * </em>
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> <em class="jxr_javadoccomment"> * Note that the <tt>filePath</tt> is relative to both the webapp directory and the overlayed directory, defined by</em>
-<a class="jxr_linenumber" name="L560" href="#L560">560</a> <em class="jxr_javadoccomment"> * the <tt>overlayId</tt>.</em>
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> <em class="jxr_javadoccomment"> * @param webAppDirectory the webapp directory</em>
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> <em class="jxr_javadoccomment"> * @param overlayId the id of the overlay</em>
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> <em class="jxr_javadoccomment"> * @param filePath the relative path</em>
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> <em class="jxr_javadoccomment"> * @throws IOException if an error occurred while reading the files</em>
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> assertOverlayedFile( File webAppDirectory, String overlayId, String filePath )
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L569" href="#L569">569</a> {
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> <strong class="jxr_keyword">final</strong> File webAppFile = <strong class="jxr_keyword">new</strong> File( webAppDirectory, filePath );
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> <strong class="jxr_keyword">final</strong> File overlayFile = getOverlayFile( overlayId, filePath );
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> assertEquals( <span class="jxr_string">"Wrong content for overlayed file "</span> + filePath, FileUtils.fileRead( overlayFile ),
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> FileUtils.fileRead( webAppFile ) );
-<a class="jxr_linenumber" name="L574" href="#L574">574</a>
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> }
-<a class="jxr_linenumber" name="L576" href="#L576">576</a>
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> <em class="jxr_javadoccomment"> * Asserts that the content of an overlayed file is correct.</em>
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> <em class="jxr_javadoccomment"> * </em>
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> <em class="jxr_javadoccomment"> * Note that the <tt>filePath</tt> is relative to both the webapp directory and the overlayed directory, defined by</em>
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> <em class="jxr_javadoccomment"> * the <tt>overlayId</tt>.</em>
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> <em class="jxr_javadoccomment"> * @param testId te id of the test</em>
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> <em class="jxr_javadoccomment"> * @param webAppDirectory the webapp directory</em>
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> <em class="jxr_javadoccomment"> * @param filePath the relative path</em>
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> <em class="jxr_javadoccomment"> * @throws IOException if an error occurred while reading the files</em>
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> assertDefaultFileContent( String testId, File webAppDirectory, String filePath )
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> {
-<a class="jxr_linenumber" name="L591" href="#L591">591</a> <strong class="jxr_keyword">final</strong> File webAppFile = <strong class="jxr_keyword">new</strong> File( webAppDirectory, filePath );
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> <strong class="jxr_keyword">final</strong> File sourceFile = <strong class="jxr_keyword">new</strong> File( getWebAppSource( testId ), filePath );
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> <strong class="jxr_keyword">final</strong> String expectedContent = sourceFile.toString();
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> assertEquals( <span class="jxr_string">"Wrong content for file "</span> + filePath, expectedContent, FileUtils.fileRead( webAppFile ) );
-<a class="jxr_linenumber" name="L595" href="#L595">595</a>
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> }
-<a class="jxr_linenumber" name="L597" href="#L597">597</a>
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> <strong class="jxr_keyword">protected</strong> ArtifactStub generateSimpleWarArtifactStub( String id )
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> {
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> <strong class="jxr_keyword">return</strong> buildWarOverlayStub( id );
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> }
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> }
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> <em class="jxr_javadoccomment"> * Asserts that the content of an overlayed file is correct.</em>
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> <em class="jxr_javadoccomment"> * </em>
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> <em class="jxr_javadoccomment"> * Note that the <tt>filePath</tt> is relative to both the webapp directory and the overlayed directory, defined by</em>
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> <em class="jxr_javadoccomment"> * the <tt>overlayId</tt>.</em>
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> <em class="jxr_javadoccomment"> * @param testId te id of the test</em>
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> <em class="jxr_javadoccomment"> * @param webAppDirectory the webapp directory</em>
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> <em class="jxr_javadoccomment"> * @param filePath the relative path</em>
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> <em class="jxr_javadoccomment"> * @throws IOException if an error occurred while reading the files</em>
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> assertDefaultFileContent( String testId, File webAppDirectory, String filePath )
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> {
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> <strong class="jxr_keyword">final</strong> File webAppFile = <strong class="jxr_keyword">new</strong> File( webAppDirectory, filePath );
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> <strong class="jxr_keyword">final</strong> File sourceFile = <strong class="jxr_keyword">new</strong> File( getWebAppSource( testId ), filePath );
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> <strong class="jxr_keyword">final</strong> String expectedContent = sourceFile.toString();
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> assertEquals( <span class="jxr_string">"Wrong content for file "</span> + filePath, expectedContent, FileUtils.fileRead( webAppFile ) );
+<a class="jxr_linenumber" name="L487" href="#L487">487</a>
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> }
+<a class="jxr_linenumber" name="L489" href="#L489">489</a>
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> <strong class="jxr_keyword">protected</strong> ArtifactStub generateSimpleWarArtifactStub( String id )
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> {
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> <strong class="jxr_keyword">return</strong> buildWarOverlayStub( id );
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> }
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> }
</pre>
<hr/>
-<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+<div id="footer">Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
</body>
</html>
\ No newline at end of file
Modified: maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/WarZipTest.html
==============================================================================
--- maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/WarZipTest.html (original)
+++ maven/website/components/plugins-archives/maven-war-plugin-LATEST/xref-test/org/apache/maven/plugins/war/WarZipTest.html Sat Jun 6 06:56:04 2020
@@ -42,157 +42,156 @@
<a class="jxr_linenumber" name="L34" href="#L34">34</a>
<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> * @author Olivier Lamy</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> * @version $Id$</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * @since 7 Oct 07</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/plugins/war/WarZipTest.html">WarZipTest</a>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/maven/plugins/war/AbstractWarMojoTest.html">AbstractWarMojoTest</a>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> {
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> WarMojo mojo;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> File pomFile = <strong class="jxr_keyword">new</strong> File( getBasedir(), <span class="jxr_string">"src/test/resources/unit/warziptest/war-with-zip.xml"</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">protected</strong> File getTestDirectory()
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> {
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> File( getBasedir(), <span class="jxr_string">"target/test-classes/unit/warziptest"</span> );
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> }
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUp()
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> {
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">super</strong>.setUp();
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> mojo = (WarMojo) lookupMojo( <span class="jxr_string">"war"</span>, pomFile );
-<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> <strong class="jxr_keyword">private</strong> Artifact buildZipArtifact()
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> {
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> ArtifactHandler artifactHandler = (ArtifactHandler) lookup( ArtifactHandler.ROLE, <span class="jxr_string">"jar"</span> );
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> File zipFile = <strong class="jxr_keyword">new</strong> File( getTestDirectory(), <span class="jxr_string">"foobar.zip"</span> );
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/plugins/war/stub/ZipArtifactStub.html">ZipArtifactStub</a>( <span class="jxr_string">"src/test/resources/unit/warziptest"</span>, artifactHandler, zipFile );
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> }
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">private</strong> File configureMojo( String testId )
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> {
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <a href="../../../../../org/apache/maven/plugins/war/stub/MavenZipProject.html">MavenZipProject</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/plugins/war/stub/MavenZipProject.html">MavenZipProject</a>();
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> String outputDir = getTestDirectory().getAbsolutePath() + File.separatorChar + testId + <span class="jxr_string">"-output"</span>;
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em class="jxr_comment">// clean up</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> File outputDirFile = <strong class="jxr_keyword">new</strong> File( outputDir );
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">if</strong> ( outputDirFile.exists() )
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> {
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> FileUtils.deleteDirectory( outputDirFile );
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> File webAppDirectory = <strong class="jxr_keyword">new</strong> File( getTestDirectory(), testId );
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> <a href="../../../../../org/apache/maven/plugins/war/stub/WarArtifactStub.html">WarArtifactStub</a> warArtifact = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/plugins/war/stub/WarArtifactStub.html">WarArtifactStub</a>( getBasedir() );
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> String warName = <span class="jxr_string">"simple"</span>;
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> File webAppSource = createWebAppSource( testId );
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> File classesDir = createClassesDir( testId, <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> File xmlSource = createXMLConfigDir( testId, <strong class="jxr_keyword">new</strong> String[] { <span class="jxr_string">"web.xml"</span> } );
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> project.setArtifact( warArtifact );
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">this</strong>.configureMojo( mojo, <strong class="jxr_keyword">new</strong> LinkedList<String>(), classesDir, webAppSource, webAppDirectory, project );
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> setVariableValueToObject( mojo, <span class="jxr_string">"outputDirectory"</span>, outputDir );
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> setVariableValueToObject( mojo, <span class="jxr_string">"warName"</span>, warName );
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> setVariableValueToObject( mojo, <span class="jxr_string">"workDirectory"</span>, <strong class="jxr_keyword">new</strong> File( getTestDirectory(), <span class="jxr_string">"work"</span> ) );
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> mojo.setWebXml( <strong class="jxr_keyword">new</strong> File( xmlSource, <span class="jxr_string">"web.xml"</span> ) );
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> project.getArtifacts().add( buildZipArtifact() );
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">return</strong> webAppDirectory;
-<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">public</strong> <strong class="jxr_keyword">void</strong> testOneZipWithNoSkip()
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> {
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> File webAppDirectory = configureMojo( <span class="jxr_string">"one-zip"</span> );
-<a class="jxr_linenumber" name="L101" href="#L101">101</a>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> Overlay overlay = <strong class="jxr_keyword">new</strong> DefaultOverlay( buildZipArtifact() );
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_comment">// overlay.setSkip( false );</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> overlay.setType( <span class="jxr_string">"zip"</span> );
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> mojo.addOverlay( overlay );
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> mojo.execute();
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> File foo = <strong class="jxr_keyword">new</strong> File( webAppDirectory, <span class="jxr_string">"foo.txt"</span> );
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> assertTrue( <span class="jxr_string">"foo.txt not exists"</span>, foo.exists() );
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> assertTrue( <span class="jxr_string">"foo.txt not a file"</span>, foo.isFile() );
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> File barDirectory = <strong class="jxr_keyword">new</strong> File( webAppDirectory, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> assertTrue( <span class="jxr_string">"bar directory not exists"</span>, barDirectory.exists() );
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> assertTrue( <span class="jxr_string">"bar not a directory"</span>, barDirectory.isDirectory() );
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> File bar = <strong class="jxr_keyword">new</strong> File( barDirectory, <span class="jxr_string">"bar.txt"</span> );
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> assertTrue( <span class="jxr_string">"bar/bar.txt not exists"</span>, bar.exists() );
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> assertTrue( <span class="jxr_string">"bar/bar.txt not a file"</span>, bar.isFile() );
-<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">void</strong> testOneZipWithTargetPathOverlay()
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> {
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> File webAppDirectory = configureMojo( <span class="jxr_string">"one-zip-overlay-targetPath"</span> );
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> Overlay overlay = <strong class="jxr_keyword">new</strong> DefaultOverlay( buildZipArtifact() );
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> overlay.setSkip( false );
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> overlay.setType( <span class="jxr_string">"zip"</span> );
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> overlay.setTargetPath( <span class="jxr_string">"overridePath"</span> );
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> mojo.addOverlay( overlay );
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> mojo.execute();
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> File foo = <strong class="jxr_keyword">new</strong> File( webAppDirectory.getPath() + File.separatorChar + <span class="jxr_string">"overridePath"</span>, <span class="jxr_string">"foo.txt"</span> );
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> assertTrue( <span class="jxr_string">"foo.txt not exists"</span>, foo.exists() );
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> assertTrue( <span class="jxr_string">"foo.txt not a file"</span>, foo.isFile() );
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> File barDirectory = <strong class="jxr_keyword">new</strong> File( webAppDirectory.getPath() + File.separatorChar + <span class="jxr_string">"overridePath"</span>, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> assertTrue( <span class="jxr_string">"bar directory not exists"</span>, barDirectory.exists() );
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> assertTrue( <span class="jxr_string">"bar not a directory"</span>, barDirectory.isDirectory() );
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> File bar = <strong class="jxr_keyword">new</strong> File( barDirectory, <span class="jxr_string">"bar.txt"</span> );
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> assertTrue( <span class="jxr_string">"bar/bar.txt not exists"</span>, bar.exists() );
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> assertTrue( <span class="jxr_string">"bar/bar.txt not a file"</span>, bar.isFile() );
-<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">public</strong> <strong class="jxr_keyword">void</strong> testOneZipDefaultSkip()
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> {
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> File webAppDirectory = configureMojo( <span class="jxr_string">"one-zip-overlay-skip"</span> );
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> mojo.execute();
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> assertZipContentNotHere( webAppDirectory );
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> }
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOneZipWithForceSkip()
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> {
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> File webAppDirectory = configureMojo( <span class="jxr_string">"one-zip-overlay-skip"</span> );
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> Overlay overlay = <strong class="jxr_keyword">new</strong> DefaultOverlay( buildZipArtifact() );
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> overlay.setSkip( <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> overlay.setType( <span class="jxr_string">"zip"</span> );
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> mojo.addOverlay( overlay );
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> mojo.execute();
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> assertZipContentNotHere( webAppDirectory );
-<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>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> assertZipContentNotHere( File webAppDirectory )
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> {
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> File foo = <strong class="jxr_keyword">new</strong> File( webAppDirectory.getPath() + File.separatorChar + <span class="jxr_string">"overridePath"</span>, <span class="jxr_string">"foo.txt"</span> );
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> assertFalse( <span class="jxr_string">"foo.txt exists"</span>, foo.exists() );
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> assertFalse( <span class="jxr_string">"foo.txt a file"</span>, foo.isFile() );
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> File barDirectory = <strong class="jxr_keyword">new</strong> File( webAppDirectory.getPath() + File.separatorChar + <span class="jxr_string">"overridePath"</span>, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> assertFalse( <span class="jxr_string">"bar directory exists"</span>, barDirectory.exists() );
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> assertFalse( <span class="jxr_string">"bar is a directory"</span>, barDirectory.isDirectory() );
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> File bar = <strong class="jxr_keyword">new</strong> File( barDirectory, <span class="jxr_string">"bar.txt"</span> );
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> assertFalse( <span class="jxr_string">"bar/bar.txt exists"</span>, bar.exists() );
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> assertFalse( <span class="jxr_string">"bar/bar.txt is a file"</span>, bar.isFile() );
-<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="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> * @since 7 Oct 07</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/plugins/war/WarZipTest.html">WarZipTest</a>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/maven/plugins/war/AbstractWarMojoTest.html">AbstractWarMojoTest</a>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> {
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> WarMojo mojo;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> File pomFile = <strong class="jxr_keyword">new</strong> File( getBasedir(), <span class="jxr_string">"src/test/resources/unit/warziptest/war-with-zip.xml"</span> );
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">protected</strong> File getTestDirectory()
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> {
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> File( getBasedir(), <span class="jxr_string">"target/test-classes/unit/warziptest"</span> );
+<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUp()
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">super</strong>.setUp();
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> mojo = (WarMojo) lookupMojo( <span class="jxr_string">"war"</span>, pomFile );
+<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> <strong class="jxr_keyword">private</strong> Artifact buildZipArtifact()
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> {
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> ArtifactHandler artifactHandler = (ArtifactHandler) lookup( ArtifactHandler.ROLE, <span class="jxr_string">"jar"</span> );
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> File zipFile = <strong class="jxr_keyword">new</strong> File( getTestDirectory(), <span class="jxr_string">"foobar.zip"</span> );
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/plugins/war/stub/ZipArtifactStub.html">ZipArtifactStub</a>( <span class="jxr_string">"src/test/resources/unit/warziptest"</span>, artifactHandler, zipFile );
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">private</strong> File configureMojo( String testId )
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> {
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <a href="../../../../../org/apache/maven/plugins/war/stub/MavenZipProject.html">MavenZipProject</a> project = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/plugins/war/stub/MavenZipProject.html">MavenZipProject</a>();
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> String outputDir = getTestDirectory().getAbsolutePath() + File.separatorChar + testId + <span class="jxr_string">"-output"</span>;
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em class="jxr_comment">// clean up</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> File outputDirFile = <strong class="jxr_keyword">new</strong> File( outputDir );
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">if</strong> ( outputDirFile.exists() )
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> {
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> FileUtils.deleteDirectory( outputDirFile );
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> File webAppDirectory = <strong class="jxr_keyword">new</strong> File( getTestDirectory(), testId );
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> <a href="../../../../../org/apache/maven/plugins/war/stub/WarArtifactStub.html">WarArtifactStub</a> warArtifact = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/plugins/war/stub/WarArtifactStub.html">WarArtifactStub</a>( getBasedir() );
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> String warName = <span class="jxr_string">"simple"</span>;
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> File webAppSource = createWebAppSource( testId );
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> File classesDir = createClassesDir( testId, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> File xmlSource = createXMLConfigDir( testId, <strong class="jxr_keyword">new</strong> String[] { <span class="jxr_string">"web.xml"</span> } );
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> project.setArtifact( warArtifact );
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">this</strong>.configureMojo( mojo, <strong class="jxr_keyword">new</strong> LinkedList<String>(), classesDir, webAppSource, webAppDirectory, project );
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> setVariableValueToObject( mojo, <span class="jxr_string">"outputDirectory"</span>, outputDir );
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> setVariableValueToObject( mojo, <span class="jxr_string">"warName"</span>, warName );
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> setVariableValueToObject( mojo, <span class="jxr_string">"workDirectory"</span>, <strong class="jxr_keyword">new</strong> File( getTestDirectory(), <span class="jxr_string">"work"</span> ) );
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> mojo.setWebXml( <strong class="jxr_keyword">new</strong> File( xmlSource, <span class="jxr_string">"web.xml"</span> ) );
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> project.getArtifacts().add( buildZipArtifact() );
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">return</strong> webAppDirectory;
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOneZipWithNoSkip()
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> {
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> File webAppDirectory = configureMojo( <span class="jxr_string">"one-zip"</span> );
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> Overlay overlay = <strong class="jxr_keyword">new</strong> DefaultOverlay( buildZipArtifact() );
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_comment">// overlay.setSkip( false );</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> overlay.setType( <span class="jxr_string">"zip"</span> );
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> mojo.addOverlay( overlay );
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> mojo.execute();
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> File foo = <strong class="jxr_keyword">new</strong> File( webAppDirectory, <span class="jxr_string">"foo.txt"</span> );
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> assertTrue( <span class="jxr_string">"foo.txt not exists"</span>, foo.exists() );
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> assertTrue( <span class="jxr_string">"foo.txt not a file"</span>, foo.isFile() );
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> File barDirectory = <strong class="jxr_keyword">new</strong> File( webAppDirectory, <span class="jxr_string">"bar"</span> );
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> assertTrue( <span class="jxr_string">"bar directory not exists"</span>, barDirectory.exists() );
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> assertTrue( <span class="jxr_string">"bar not a directory"</span>, barDirectory.isDirectory() );
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> File bar = <strong class="jxr_keyword">new</strong> File( barDirectory, <span class="jxr_string">"bar.txt"</span> );
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> assertTrue( <span class="jxr_string">"bar/bar.txt not exists"</span>, bar.exists() );
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> assertTrue( <span class="jxr_string">"bar/bar.txt not a file"</span>, bar.isFile() );
+<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOneZipWithTargetPathOverlay()
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> {
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> File webAppDirectory = configureMojo( <span class="jxr_string">"one-zip-overlay-targetPath"</span> );
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> Overlay overlay = <strong class="jxr_keyword">new</strong> DefaultOverlay( buildZipArtifact() );
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> overlay.setSkip( false );
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> overlay.setType( <span class="jxr_string">"zip"</span> );
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> overlay.setTargetPath( <span class="jxr_string">"overridePath"</span> );
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> mojo.addOverlay( overlay );
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> mojo.execute();
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> File foo = <strong class="jxr_keyword">new</strong> File( webAppDirectory.getPath() + File.separatorChar + <span class="jxr_string">"overridePath"</span>, <span class="jxr_string">"foo.txt"</span> );
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> assertTrue( <span class="jxr_string">"foo.txt not exists"</span>, foo.exists() );
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> assertTrue( <span class="jxr_string">"foo.txt not a file"</span>, foo.isFile() );
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> File barDirectory = <strong class="jxr_keyword">new</strong> File( webAppDirectory.getPath() + File.separatorChar + <span class="jxr_string">"overridePath"</span>, <span class="jxr_string">"bar"</span> );
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> assertTrue( <span class="jxr_string">"bar directory not exists"</span>, barDirectory.exists() );
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> assertTrue( <span class="jxr_string">"bar not a directory"</span>, barDirectory.isDirectory() );
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> File bar = <strong class="jxr_keyword">new</strong> File( barDirectory, <span class="jxr_string">"bar.txt"</span> );
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> assertTrue( <span class="jxr_string">"bar/bar.txt not exists"</span>, bar.exists() );
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> assertTrue( <span class="jxr_string">"bar/bar.txt not a file"</span>, bar.isFile() );
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> }
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOneZipDefaultSkip()
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> {
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> File webAppDirectory = configureMojo( <span class="jxr_string">"one-zip-overlay-skip"</span> );
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> mojo.execute();
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> assertZipContentNotHere( webAppDirectory );
+<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> testOneZipWithForceSkip()
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> File webAppDirectory = configureMojo( <span class="jxr_string">"one-zip-overlay-skip"</span> );
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> Overlay overlay = <strong class="jxr_keyword">new</strong> DefaultOverlay( buildZipArtifact() );
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> overlay.setSkip( <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> overlay.setType( <span class="jxr_string">"zip"</span> );
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> mojo.addOverlay( overlay );
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> mojo.execute();
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> assertZipContentNotHere( webAppDirectory );
+<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">protected</strong> <strong class="jxr_keyword">void</strong> assertZipContentNotHere( File webAppDirectory )
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> {
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> File foo = <strong class="jxr_keyword">new</strong> File( webAppDirectory.getPath() + File.separatorChar + <span class="jxr_string">"overridePath"</span>, <span class="jxr_string">"foo.txt"</span> );
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> assertFalse( <span class="jxr_string">"foo.txt exists"</span>, foo.exists() );
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> assertFalse( <span class="jxr_string">"foo.txt a file"</span>, foo.isFile() );
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> File barDirectory = <strong class="jxr_keyword">new</strong> File( webAppDirectory.getPath() + File.separatorChar + <span class="jxr_string">"overridePath"</span>, <span class="jxr_string">"bar"</span> );
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> assertFalse( <span class="jxr_string">"bar directory exists"</span>, barDirectory.exists() );
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> assertFalse( <span class="jxr_string">"bar is a directory"</span>, barDirectory.isDirectory() );
+<a class="jxr_linenumber" name="L179" href="#L179">179</a>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> File bar = <strong class="jxr_keyword">new</strong> File( barDirectory, <span class="jxr_string">"bar.txt"</span> );
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> assertFalse( <span class="jxr_string">"bar/bar.txt exists"</span>, bar.exists() );
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> assertFalse( <span class="jxr_string">"bar/bar.txt is a file"</span>, bar.isFile() );
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> }
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> }
</pre>
<hr/>
-<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+<div id="footer">Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
</body>
</html>
\ No newline at end of file